Mercurial > hg > mercurial-crew-with-dirclash
annotate hgext/mq.py @ 2720:c91ca61c8953
mq: add qclone command
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Fri, 28 Jul 2006 10:46:41 -0700 |
| parents | 35caf437a201 |
| children | 04d9b31faeca |
| rev | line source |
|---|---|
| 1808 | 1 # queue.py - patch queues for mercurial |
| 2 # | |
| 3 # Copyright 2005 Chris Mason <mason@suse.com> | |
| 4 # | |
| 5 # This software may be used and distributed according to the terms | |
| 6 # of the GNU General Public License, incorporated herein by reference. | |
| 7 | |
|
2554
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
8 '''patch management and development |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
9 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
10 This extension lets you work with a stack of patches in a Mercurial |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
11 repository. It manages two stacks of patches - all known patches, and |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
12 applied patches (subset of known patches). |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
13 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
14 Known patches are represented as patch files in the .hg/patches |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
15 directory. Applied patches are both patch files and changesets. |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
16 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
17 Common tasks (use "hg help command" for more details): |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
18 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
19 prepare repository to work with patches qinit |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
20 create new patch qnew |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
21 import existing patch qimport |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
22 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
23 print patch series qseries |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
24 print applied patches qapplied |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
25 print name of top applied patch qtop |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
26 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
27 add known patch to applied stack qpush |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
28 remove patch from applied stack qpop |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
29 refresh contents of top applied patch qrefresh |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
30 ''' |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
31 |
| 1808 | 32 from mercurial.demandload import * |
| 33 demandload(globals(), "os sys re struct traceback errno bz2") | |
| 34 from mercurial.i18n import gettext as _ | |
| 35 from mercurial import ui, hg, revlog, commands, util | |
| 36 | |
| 37 versionstr = "0.45" | |
| 38 | |
| 39 repomap = {} | |
| 40 | |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
41 commands.norepo += " qclone qversion" |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
42 |
| 1808 | 43 class queue: |
| 44 def __init__(self, ui, path, patchdir=None): | |
| 45 self.basepath = path | |
| 46 if patchdir: | |
| 47 self.path = patchdir | |
| 48 else: | |
| 49 self.path = os.path.join(path, "patches") | |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
50 self.opener = util.opener(self.path) |
| 1808 | 51 self.ui = ui |
| 52 self.applied = [] | |
| 53 self.full_series = [] | |
| 54 self.applied_dirty = 0 | |
| 55 self.series_dirty = 0 | |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
56 self.series_path = "series" |
|
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
57 self.status_path = "status" |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
58 |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
59 if os.path.exists(os.path.join(self.path, self.series_path)): |
|
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
60 self.full_series = self.opener(self.series_path).read().splitlines() |
| 1808 | 61 self.read_series(self.full_series) |
| 62 | |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
63 if os.path.exists(os.path.join(self.path, self.status_path)): |
|
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
64 self.applied = self.opener(self.status_path).read().splitlines() |
| 1808 | 65 |
| 66 def find_series(self, patch): | |
| 67 pre = re.compile("(\s*)([^#]+)") | |
| 68 index = 0 | |
| 69 for l in self.full_series: | |
| 70 m = pre.match(l) | |
| 71 if m: | |
| 72 s = m.group(2) | |
| 73 s = s.rstrip() | |
| 74 if s == patch: | |
| 75 return index | |
| 76 index += 1 | |
| 77 return None | |
| 78 | |
| 79 def read_series(self, list): | |
| 80 def matcher(list): | |
| 81 pre = re.compile("(\s*)([^#]+)") | |
| 82 for l in list: | |
| 83 m = pre.match(l) | |
| 84 if m: | |
| 85 s = m.group(2) | |
| 86 s = s.rstrip() | |
| 87 if len(s) > 0: | |
| 88 yield s | |
| 89 self.series = [] | |
| 90 self.series = [ x for x in matcher(list) ] | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
91 |
| 1808 | 92 def save_dirty(self): |
| 93 if self.applied_dirty: | |
| 94 if len(self.applied) > 0: | |
| 95 nl = "\n" | |
| 96 else: | |
| 97 nl = "" | |
| 98 f = self.opener(self.status_path, "w") | |
| 99 f.write("\n".join(self.applied) + nl) | |
| 100 if self.series_dirty: | |
| 101 if len(self.full_series) > 0: | |
| 102 nl = "\n" | |
| 103 else: | |
| 104 nl = "" | |
| 105 f = self.opener(self.series_path, "w") | |
| 106 f.write("\n".join(self.full_series) + nl) | |
| 107 | |
| 108 def readheaders(self, patch): | |
| 109 def eatdiff(lines): | |
| 110 while lines: | |
| 111 l = lines[-1] | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
112 if (l.startswith("diff -") or |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
113 l.startswith("Index:") or |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
114 l.startswith("===========")): |
| 1808 | 115 del lines[-1] |
| 116 else: | |
| 117 break | |
| 118 def eatempty(lines): | |
| 119 while lines: | |
| 120 l = lines[-1] | |
| 121 if re.match('\s*$', l): | |
| 122 del lines[-1] | |
| 123 else: | |
| 124 break | |
| 125 | |
| 126 pf = os.path.join(self.path, patch) | |
| 127 message = [] | |
| 128 comments = [] | |
| 129 user = None | |
|
2299
dacf718e1d48
Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents:
2270
diff
changeset
|
130 date = None |
| 1808 | 131 format = None |
| 132 subject = None | |
| 133 diffstart = 0 | |
| 134 | |
| 135 for line in file(pf): | |
| 136 line = line.rstrip() | |
| 137 if diffstart: | |
| 138 if line.startswith('+++ '): | |
| 139 diffstart = 2 | |
| 140 break | |
| 141 if line.startswith("--- "): | |
| 142 diffstart = 1 | |
| 143 continue | |
| 144 elif format == "hgpatch": | |
| 145 # parse values when importing the result of an hg export | |
| 146 if line.startswith("# User "): | |
| 147 user = line[7:] | |
|
2300
52b9b6751b2c
Use "# Date" instead of "# Timestamp" for dated export/import of patches.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2299
diff
changeset
|
148 elif line.startswith("# Date "): |
|
52b9b6751b2c
Use "# Date" instead of "# Timestamp" for dated export/import of patches.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2299
diff
changeset
|
149 date = line[7:] |
| 1808 | 150 elif not line.startswith("# ") and line: |
| 151 message.append(line) | |
| 152 format = None | |
| 153 elif line == '# HG changeset patch': | |
| 154 format = "hgpatch" | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
155 elif (format != "tagdone" and (line.startswith("Subject: ") or |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
156 line.startswith("subject: "))): |
| 1808 | 157 subject = line[9:] |
| 158 format = "tag" | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
159 elif (format != "tagdone" and (line.startswith("From: ") or |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
160 line.startswith("from: "))): |
| 1808 | 161 user = line[6:] |
| 162 format = "tag" | |
| 163 elif format == "tag" and line == "": | |
| 164 # when looking for tags (subject: from: etc) they | |
| 165 # end once you find a blank line in the source | |
| 166 format = "tagdone" | |
|
2301
7c2623aedeb4
Strip empty lines and trailing spaces around commit messages.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2300
diff
changeset
|
167 elif message or line: |
| 1808 | 168 message.append(line) |
| 169 comments.append(line) | |
| 170 | |
| 171 eatdiff(message) | |
| 172 eatdiff(comments) | |
| 173 eatempty(message) | |
| 174 eatempty(comments) | |
| 175 | |
| 176 # make sure message isn't empty | |
| 177 if format and format.startswith("tag") and subject: | |
| 178 message.insert(0, "") | |
| 179 message.insert(0, subject) | |
|
2299
dacf718e1d48
Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents:
2270
diff
changeset
|
180 return (message, comments, user, date, diffstart > 1) |
| 1808 | 181 |
| 182 def mergeone(self, repo, mergeq, head, patch, rev, wlock): | |
| 183 # first try just applying the patch | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
184 (err, n) = self.apply(repo, [ patch ], update_status=False, |
| 1808 | 185 strict=True, merge=rev, wlock=wlock) |
| 186 | |
| 187 if err == 0: | |
| 188 return (err, n) | |
| 189 | |
| 190 if n is None: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
191 raise util.Abort(_("apply failed for patch %s") % patch) |
| 1808 | 192 |
| 193 self.ui.warn("patch didn't work out, merging %s\n" % patch) | |
| 194 | |
| 195 # apply failed, strip away that rev and merge. | |
| 196 repo.update(head, allow=False, force=True, wlock=wlock) | |
| 197 self.strip(repo, n, update=False, backup='strip', wlock=wlock) | |
| 198 | |
| 199 c = repo.changelog.read(rev) | |
| 200 ret = repo.update(rev, allow=True, wlock=wlock) | |
| 201 if ret: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
202 raise util.Abort(_("update returned %d") % ret) |
| 1808 | 203 n = repo.commit(None, c[4], c[1], force=1, wlock=wlock) |
| 204 if n == None: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
205 raise util.Abort(_("repo commit failed")) |
| 1808 | 206 try: |
|
2299
dacf718e1d48
Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents:
2270
diff
changeset
|
207 message, comments, user, date, patchfound = mergeq.readheaders(patch) |
| 1808 | 208 except: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
209 raise util.Abort(_("unable to read %s") % patch) |
| 1808 | 210 |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
211 patchf = self.opener(patch, "w") |
| 1808 | 212 if comments: |
| 213 comments = "\n".join(comments) + '\n\n' | |
| 214 patchf.write(comments) | |
| 215 commands.dodiff(patchf, self.ui, repo, head, n) | |
| 216 patchf.close() | |
| 217 return (0, n) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
218 |
| 1808 | 219 def qparents(self, repo, rev=None): |
| 220 if rev is None: | |
| 221 (p1, p2) = repo.dirstate.parents() | |
| 222 if p2 == revlog.nullid: | |
| 223 return p1 | |
| 224 if len(self.applied) == 0: | |
| 225 return None | |
| 226 (top, patch) = self.applied[-1].split(':') | |
| 227 top = revlog.bin(top) | |
| 228 return top | |
| 229 pp = repo.changelog.parents(rev) | |
| 230 if pp[1] != revlog.nullid: | |
| 231 arevs = [ x.split(':')[0] for x in self.applied ] | |
| 232 p0 = revlog.hex(pp[0]) | |
| 233 p1 = revlog.hex(pp[1]) | |
| 234 if p0 in arevs: | |
| 235 return pp[0] | |
| 236 if p1 in arevs: | |
| 237 return pp[1] | |
| 238 return pp[0] | |
| 239 | |
| 240 def mergepatch(self, repo, mergeq, series, wlock): | |
| 241 if len(self.applied) == 0: | |
| 242 # each of the patches merged in will have two parents. This | |
| 243 # can confuse the qrefresh, qdiff, and strip code because it | |
| 244 # needs to know which parent is actually in the patch queue. | |
| 245 # so, we insert a merge marker with only one parent. This way | |
| 246 # the first patch in the queue is never a merge patch | |
| 247 # | |
| 248 pname = ".hg.patches.merge.marker" | |
| 249 n = repo.commit(None, '[mq]: merge marker', user=None, force=1, | |
| 250 wlock=wlock) | |
| 251 self.applied.append(revlog.hex(n) + ":" + pname) | |
| 252 self.applied_dirty = 1 | |
| 253 | |
| 254 head = self.qparents(repo) | |
| 255 | |
| 256 for patch in series: | |
| 2696 | 257 patch = mergeq.lookup(patch, strict=True) |
| 1808 | 258 if not patch: |
| 259 self.ui.warn("patch %s does not exist\n" % patch) | |
| 260 return (1, None) | |
| 261 | |
| 262 info = mergeq.isapplied(patch) | |
| 263 if not info: | |
| 264 self.ui.warn("patch %s is not applied\n" % patch) | |
| 265 return (1, None) | |
| 266 rev = revlog.bin(info[1]) | |
| 267 (err, head) = self.mergeone(repo, mergeq, head, patch, rev, wlock) | |
| 268 if head: | |
| 269 self.applied.append(revlog.hex(head) + ":" + patch) | |
| 270 self.applied_dirty = 1 | |
| 271 if err: | |
| 272 return (err, head) | |
| 273 return (0, head) | |
| 274 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
275 def apply(self, repo, series, list=False, update_status=True, |
| 1808 | 276 strict=False, patchdir=None, merge=None, wlock=None): |
| 277 # TODO unify with commands.py | |
| 278 if not patchdir: | |
| 279 patchdir = self.path | |
| 280 err = 0 | |
| 281 if not wlock: | |
| 282 wlock = repo.wlock() | |
| 283 lock = repo.lock() | |
| 284 tr = repo.transaction() | |
| 285 n = None | |
| 286 for patch in series: | |
| 287 self.ui.warn("applying %s\n" % patch) | |
| 288 pf = os.path.join(patchdir, patch) | |
| 289 | |
| 290 try: | |
|
2299
dacf718e1d48
Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents:
2270
diff
changeset
|
291 message, comments, user, date, patchfound = self.readheaders(patch) |
| 1808 | 292 except: |
| 293 self.ui.warn("Unable to read %s\n" % pf) | |
| 294 err = 1 | |
| 295 break | |
| 296 | |
| 297 if not message: | |
| 298 message = "imported patch %s\n" % patch | |
| 299 else: | |
| 300 if list: | |
| 301 message.append("\nimported patch %s" % patch) | |
| 302 message = '\n'.join(message) | |
| 303 | |
| 304 try: | |
|
2270
afd7c4ec000f
Fix issue240: mq: qpush fails on Solaris
Danek Duvall <danek.duvall@sun.com>
parents:
2185
diff
changeset
|
305 pp = util.find_in_path('gpatch', os.environ.get('PATH', ''), 'patch') |
|
2712
35caf437a201
mq: fix queue.apply to not call os.chdir()
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
306 f = os.popen("%s -d '%s' -p1 --no-backup-if-mismatch < '%s'" % |
|
35caf437a201
mq: fix queue.apply to not call os.chdir()
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
307 (pp, repo.root, pf)) |
| 1808 | 308 except: |
| 309 self.ui.warn("patch failed, unable to continue (try -v)\n") | |
| 310 err = 1 | |
| 311 break | |
| 312 files = [] | |
| 313 fuzz = False | |
| 314 for l in f: | |
| 315 l = l.rstrip('\r\n'); | |
| 316 if self.ui.verbose: | |
| 317 self.ui.warn(l + "\n") | |
| 318 if l[:14] == 'patching file ': | |
| 319 pf = os.path.normpath(l[14:]) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
320 # when patch finds a space in the file name, it puts |
| 1808 | 321 # single quotes around the filename. strip them off |
| 322 if pf[0] == "'" and pf[-1] == "'": | |
| 323 pf = pf[1:-1] | |
| 324 if pf not in files: | |
| 325 files.append(pf) | |
| 326 printed_file = False | |
| 327 file_str = l | |
| 328 elif l.find('with fuzz') >= 0: | |
| 329 if not printed_file: | |
| 330 self.ui.warn(file_str + '\n') | |
| 331 printed_file = True | |
| 332 self.ui.warn(l + '\n') | |
| 333 fuzz = True | |
| 334 elif l.find('saving rejects to file') >= 0: | |
| 335 self.ui.warn(l + '\n') | |
| 336 elif l.find('FAILED') >= 0: | |
| 337 if not printed_file: | |
| 338 self.ui.warn(file_str + '\n') | |
| 339 printed_file = True | |
| 340 self.ui.warn(l + '\n') | |
| 341 patcherr = f.close() | |
| 342 | |
| 343 if merge and len(files) > 0: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
344 # Mark as merged and update dirstate parent info |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
345 repo.dirstate.update(repo.dirstate.filterfiles(files), 'm') |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
346 p1, p2 = repo.dirstate.parents() |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
347 repo.dirstate.setparents(p1, merge) |
| 1808 | 348 if len(files) > 0: |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
349 commands.addremove_lock(self.ui, repo, files, |
| 1808 | 350 opts={}, wlock=wlock) |
|
2299
dacf718e1d48
Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents:
2270
diff
changeset
|
351 n = repo.commit(files, message, user, date, force=1, lock=lock, |
| 1808 | 352 wlock=wlock) |
| 353 | |
| 354 if n == None: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
355 raise util.Abort(_("repo commit failed")) |
| 1808 | 356 |
| 357 if update_status: | |
| 358 self.applied.append(revlog.hex(n) + ":" + patch) | |
| 359 | |
| 360 if patcherr: | |
| 361 if not patchfound: | |
| 362 self.ui.warn("patch %s is empty\n" % patch) | |
| 363 err = 0 | |
| 364 else: | |
| 365 self.ui.warn("patch failed, rejects left in working dir\n") | |
| 366 err = 1 | |
| 367 break | |
| 368 | |
| 369 if fuzz and strict: | |
| 370 self.ui.warn("fuzz found when applying patch, stopping\n") | |
| 371 err = 1 | |
| 372 break | |
| 373 tr.close() | |
| 374 return (err, n) | |
| 375 | |
| 376 def delete(self, repo, patch): | |
| 2696 | 377 patch = self.lookup(patch, strict=True) |
| 1808 | 378 info = self.isapplied(patch) |
| 379 if info: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
380 raise util.Abort(_("cannot delete applied patch %s") % patch) |
| 1808 | 381 if patch not in self.series: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
382 raise util.Abort(_("patch %s not in series file") % patch) |
| 1808 | 383 i = self.find_series(patch) |
| 384 del self.full_series[i] | |
| 385 self.read_series(self.full_series) | |
| 386 self.series_dirty = 1 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
387 |
| 1808 | 388 def check_toppatch(self, repo): |
| 389 if len(self.applied) > 0: | |
| 390 (top, patch) = self.applied[-1].split(':') | |
| 391 top = revlog.bin(top) | |
| 392 pp = repo.dirstate.parents() | |
| 393 if top not in pp: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
394 raise util.Abort(_("queue top not at same revision as working directory")) |
| 1808 | 395 return top |
| 396 return None | |
| 397 def check_localchanges(self, repo): | |
| 398 (c, a, r, d, u) = repo.changes(None, None) | |
| 399 if c or a or d or r: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
400 raise util.Abort(_("local changes found, refresh first")) |
| 1808 | 401 def new(self, repo, patch, msg=None, force=None): |
|
2710
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
402 if os.path.exists(os.path.join(self.path, patch)): |
|
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
403 raise util.Abort(_('patch "%s" already exists') % patch) |
|
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
404 commitfiles = [] |
|
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
405 (c, a, r, d, u) = repo.changes(None, None) |
|
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
406 if c or a or d or r: |
|
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
407 if not force: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
408 raise util.Abort(_("local changes found, refresh first")) |
|
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
409 commitfiles = c + a + r |
| 1808 | 410 self.check_toppatch(repo) |
| 411 wlock = repo.wlock() | |
|
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
412 insert = self.full_series_end() |
| 1808 | 413 if msg: |
|
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
414 n = repo.commit(commitfiles, "[mq]: %s" % msg, force=True, |
|
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
415 wlock=wlock) |
| 1808 | 416 else: |
|
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
417 n = repo.commit(commitfiles, |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
418 "New patch: %s" % patch, force=True, wlock=wlock) |
| 1808 | 419 if n == None: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
420 raise util.Abort(_("repo commit failed")) |
| 1808 | 421 self.full_series[insert:insert] = [patch] |
| 422 self.applied.append(revlog.hex(n) + ":" + patch) | |
| 423 self.read_series(self.full_series) | |
| 424 self.series_dirty = 1 | |
| 425 self.applied_dirty = 1 | |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
426 p = self.opener(patch, "w") |
| 1808 | 427 if msg: |
| 428 msg = msg + "\n" | |
| 429 p.write(msg) | |
| 430 p.close() | |
| 431 wlock = None | |
| 432 r = self.qrepo() | |
| 433 if r: r.add([patch]) | |
|
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
434 if commitfiles: |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
435 self.refresh(repo, msg=None, short=True) |
| 1808 | 436 |
| 437 def strip(self, repo, rev, update=True, backup="all", wlock=None): | |
| 438 def limitheads(chlog, stop): | |
| 439 """return the list of all nodes that have no children""" | |
| 440 p = {} | |
| 441 h = [] | |
| 442 stoprev = 0 | |
| 443 if stop in chlog.nodemap: | |
| 444 stoprev = chlog.rev(stop) | |
| 445 | |
| 446 for r in range(chlog.count() - 1, -1, -1): | |
| 447 n = chlog.node(r) | |
| 448 if n not in p: | |
| 449 h.append(n) | |
| 450 if n == stop: | |
| 451 break | |
| 452 if r < stoprev: | |
| 453 break | |
| 454 for pn in chlog.parents(n): | |
| 455 p[pn] = 1 | |
| 456 return h | |
| 457 | |
| 458 def bundle(cg): | |
| 459 backupdir = repo.join("strip-backup") | |
| 460 if not os.path.isdir(backupdir): | |
| 461 os.mkdir(backupdir) | |
| 462 name = os.path.join(backupdir, "%s" % revlog.short(rev)) | |
| 463 name = savename(name) | |
| 464 self.ui.warn("saving bundle to %s\n" % name) | |
| 465 # TODO, exclusive open | |
| 466 f = open(name, "wb") | |
| 467 try: | |
| 468 f.write("HG10") | |
| 469 z = bz2.BZ2Compressor(9) | |
| 470 while 1: | |
| 471 chunk = cg.read(4096) | |
| 472 if not chunk: | |
| 473 break | |
| 474 f.write(z.compress(chunk)) | |
| 475 f.write(z.flush()) | |
| 476 except: | |
| 477 os.unlink(name) | |
| 478 raise | |
| 479 f.close() | |
| 480 return name | |
| 481 | |
| 482 def stripall(rev, revnum): | |
| 483 cl = repo.changelog | |
| 484 c = cl.read(rev) | |
| 485 mm = repo.manifest.read(c[0]) | |
| 486 seen = {} | |
| 487 | |
| 488 for x in xrange(revnum, cl.count()): | |
| 489 c = cl.read(cl.node(x)) | |
| 490 for f in c[3]: | |
| 491 if f in seen: | |
| 492 continue | |
| 493 seen[f] = 1 | |
| 494 if f in mm: | |
| 495 filerev = mm[f] | |
| 496 else: | |
| 497 filerev = 0 | |
| 498 seen[f] = filerev | |
| 499 # we go in two steps here so the strip loop happens in a | |
| 500 # sensible order. When stripping many files, this helps keep | |
| 501 # our disk access patterns under control. | |
| 502 list = seen.keys() | |
| 503 list.sort() | |
| 504 for f in list: | |
| 505 ff = repo.file(f) | |
| 506 filerev = seen[f] | |
| 507 if filerev != 0: | |
| 508 if filerev in ff.nodemap: | |
| 509 filerev = ff.rev(filerev) | |
| 510 else: | |
| 511 filerev = 0 | |
| 512 ff.strip(filerev, revnum) | |
| 513 | |
| 514 if not wlock: | |
| 515 wlock = repo.wlock() | |
| 516 lock = repo.lock() | |
| 517 chlog = repo.changelog | |
| 518 # TODO delete the undo files, and handle undo of merge sets | |
| 519 pp = chlog.parents(rev) | |
| 520 revnum = chlog.rev(rev) | |
| 521 | |
| 522 if update: | |
|
2699
f8bcaf5696d5
mq: strip should not blow away local changes
Chris Mason <mason@suse.com>
parents:
2698
diff
changeset
|
523 (c, a, r, d, u) = repo.changes(None, None) |
|
f8bcaf5696d5
mq: strip should not blow away local changes
Chris Mason <mason@suse.com>
parents:
2698
diff
changeset
|
524 if c or a or d or r: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
525 raise util.Abort(_("local changes found")) |
| 1808 | 526 urev = self.qparents(repo, rev) |
| 527 repo.update(urev, allow=False, force=True, wlock=wlock) | |
| 528 repo.dirstate.write() | |
| 529 | |
| 530 # save is a list of all the branches we are truncating away | |
| 531 # that we actually want to keep. changegroup will be used | |
| 532 # to preserve them and add them back after the truncate | |
| 533 saveheads = [] | |
| 534 savebases = {} | |
| 535 | |
| 536 tip = chlog.tip() | |
| 537 heads = limitheads(chlog, rev) | |
| 538 seen = {} | |
| 539 | |
| 540 # search through all the heads, finding those where the revision | |
| 541 # we want to strip away is an ancestor. Also look for merges | |
| 542 # that might be turned into new heads by the strip. | |
| 543 while heads: | |
| 544 h = heads.pop() | |
| 545 n = h | |
| 546 while True: | |
| 547 seen[n] = 1 | |
| 548 pp = chlog.parents(n) | |
| 549 if pp[1] != revlog.nullid and chlog.rev(pp[1]) > revnum: | |
| 550 if pp[1] not in seen: | |
| 551 heads.append(pp[1]) | |
| 552 if pp[0] == revlog.nullid: | |
| 553 break | |
| 554 if chlog.rev(pp[0]) < revnum: | |
| 555 break | |
| 556 n = pp[0] | |
| 557 if n == rev: | |
| 558 break | |
| 559 r = chlog.reachable(h, rev) | |
| 560 if rev not in r: | |
| 561 saveheads.append(h) | |
| 562 for x in r: | |
| 563 if chlog.rev(x) > revnum: | |
| 564 savebases[x] = 1 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
565 |
| 1808 | 566 # create a changegroup for all the branches we need to keep |
| 567 if backup is "all": | |
| 568 backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip') | |
| 569 bundle(backupch) | |
| 570 if saveheads: | |
| 571 backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip') | |
| 572 chgrpfile = bundle(backupch) | |
| 573 | |
| 574 stripall(rev, revnum) | |
| 575 | |
| 576 change = chlog.read(rev) | |
| 577 repo.manifest.strip(repo.manifest.rev(change[0]), revnum) | |
| 578 chlog.strip(revnum, revnum) | |
| 579 if saveheads: | |
| 580 self.ui.status("adding branch\n") | |
| 581 commands.unbundle(self.ui, repo, chgrpfile, update=False) | |
| 582 if backup is not "strip": | |
| 583 os.unlink(chgrpfile) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
584 |
| 1808 | 585 def isapplied(self, patch): |
| 586 """returns (index, rev, patch)""" | |
| 587 for i in xrange(len(self.applied)): | |
| 588 p = self.applied[i] | |
| 589 a = p.split(':') | |
| 590 if a[1] == patch: | |
| 591 return (i, a[0], a[1]) | |
| 592 return None | |
| 593 | |
| 2696 | 594 # if the exact patch name does not exist, we try a few |
| 595 # variations. If strict is passed, we try only #1 | |
| 596 # | |
| 597 # 1) a number to indicate an offset in the series file | |
| 598 # 2) a unique substring of the patch name was given | |
| 599 # 3) patchname[-+]num to indicate an offset in the series file | |
| 600 def lookup(self, patch, strict=False): | |
| 601 def partial_name(s): | |
| 602 count = 0 | |
| 603 if s in self.series: | |
| 604 return s | |
| 605 for x in self.series: | |
| 606 if s in x: | |
| 607 count += 1 | |
| 608 last = x | |
| 609 if count > 1: | |
| 610 return None | |
| 611 if count: | |
| 612 return last | |
| 613 if len(self.series) > 0 and len(self.applied) > 0: | |
| 614 if s == 'qtip': | |
| 615 return self.series[self.series_end()-1] | |
| 616 if s == 'qbase': | |
| 617 return self.series[0] | |
| 618 return None | |
| 1808 | 619 if patch == None: |
| 620 return None | |
| 2696 | 621 |
| 622 # we don't want to return a partial match until we make | |
| 623 # sure the file name passed in does not exist (checked below) | |
| 624 res = partial_name(patch) | |
| 625 if res and res == patch: | |
| 626 return res | |
| 627 | |
| 1808 | 628 if not os.path.isfile(os.path.join(self.path, patch)): |
| 629 try: | |
| 630 sno = int(patch) | |
| 631 except(ValueError, OverflowError): | |
| 2696 | 632 pass |
| 633 else: | |
| 634 if sno < len(self.series): | |
| 635 patch = self.series[sno] | |
| 636 return patch | |
| 637 if not strict: | |
| 638 # return any partial match made above | |
| 639 if res: | |
| 640 return res | |
| 641 minus = patch.rsplit('-', 1) | |
| 642 if len(minus) > 1: | |
| 643 res = partial_name(minus[0]) | |
| 644 if res: | |
| 645 i = self.series.index(res) | |
| 646 try: | |
| 647 off = int(minus[1] or 1) | |
| 648 except(ValueError, OverflowError): | |
| 649 pass | |
| 650 else: | |
| 651 if i - off >= 0: | |
| 652 return self.series[i - off] | |
| 653 plus = patch.rsplit('+', 1) | |
| 654 if len(plus) > 1: | |
| 655 res = partial_name(plus[0]) | |
| 656 if res: | |
| 657 i = self.series.index(res) | |
| 658 try: | |
| 659 off = int(plus[1] or 1) | |
| 660 except(ValueError, OverflowError): | |
| 661 pass | |
| 662 else: | |
| 663 if i + off < len(self.series): | |
| 664 return self.series[i + off] | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
665 raise util.Abort(_("patch %s not in series") % patch) |
| 1808 | 666 |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
667 def push(self, repo, patch=None, force=False, list=False, |
| 1808 | 668 mergeq=None, wlock=None): |
| 669 if not wlock: | |
| 670 wlock = repo.wlock() | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
671 patch = self.lookup(patch) |
| 1808 | 672 if patch and self.isapplied(patch): |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
673 self.ui.warn(_("patch %s is already applied\n") % patch) |
| 1808 | 674 sys.exit(1) |
| 675 if self.series_end() == len(self.series): | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
676 self.ui.warn(_("patch series fully applied\n")) |
| 1808 | 677 sys.exit(1) |
| 678 if not force: | |
| 679 self.check_localchanges(repo) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
680 |
| 1808 | 681 self.applied_dirty = 1; |
| 682 start = self.series_end() | |
| 683 if start > 0: | |
| 684 self.check_toppatch(repo) | |
| 685 if not patch: | |
| 686 patch = self.series[start] | |
| 687 end = start + 1 | |
| 688 else: | |
| 689 end = self.series.index(patch, start) + 1 | |
| 690 s = self.series[start:end] | |
| 691 if mergeq: | |
| 692 ret = self.mergepatch(repo, mergeq, s, wlock) | |
| 693 else: | |
| 694 ret = self.apply(repo, s, list, wlock=wlock) | |
| 695 top = self.applied[-1].split(':')[1] | |
| 696 if ret[0]: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
697 self.ui.write("Errors during apply, please fix and refresh %s\n" % |
| 1808 | 698 top) |
| 699 else: | |
| 700 self.ui.write("Now at: %s\n" % top) | |
| 701 return ret[0] | |
| 702 | |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
703 def pop(self, repo, patch=None, force=False, update=True, all=False, |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
704 wlock=None): |
| 1808 | 705 def getfile(f, rev): |
| 706 t = repo.file(f).read(rev) | |
| 707 try: | |
| 708 repo.wfile(f, "w").write(t) | |
| 709 except IOError: | |
|
2086
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
710 try: |
|
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
711 os.makedirs(os.path.dirname(repo.wjoin(f))) |
|
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
712 except OSError, err: |
|
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
713 if err.errno != errno.EEXIST: raise |
| 1808 | 714 repo.wfile(f, "w").write(t) |
| 715 | |
| 716 if not wlock: | |
| 717 wlock = repo.wlock() | |
| 718 if patch: | |
| 719 # index, rev, patch | |
| 720 info = self.isapplied(patch) | |
| 721 if not info: | |
| 722 patch = self.lookup(patch) | |
| 723 info = self.isapplied(patch) | |
| 724 if not info: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
725 raise util.Abort(_("patch %s is not applied") % patch) |
| 1808 | 726 if len(self.applied) == 0: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
727 self.ui.warn(_("no patches applied\n")) |
| 1808 | 728 sys.exit(1) |
| 729 | |
| 730 if not update: | |
| 731 parents = repo.dirstate.parents() | |
| 732 rr = [ revlog.bin(x.split(':')[0]) for x in self.applied ] | |
| 733 for p in parents: | |
| 734 if p in rr: | |
| 735 self.ui.warn("qpop: forcing dirstate update\n") | |
| 736 update = True | |
| 737 | |
| 738 if not force and update: | |
| 739 self.check_localchanges(repo) | |
| 740 | |
| 741 self.applied_dirty = 1; | |
| 742 end = len(self.applied) | |
| 743 if not patch: | |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
744 if all: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
745 popi = 0 |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
746 else: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
747 popi = len(self.applied) - 1 |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
748 else: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
749 popi = info[0] + 1 |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
750 if popi >= end: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
751 self.ui.warn("qpop: %s is already at the top\n" % patch) |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
752 return |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
753 info = [ popi ] + self.applied[popi].split(':') |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
754 |
| 1808 | 755 start = info[0] |
| 756 rev = revlog.bin(info[1]) | |
| 757 | |
| 758 # we know there are no local changes, so we can make a simplified | |
| 759 # form of hg.update. | |
| 760 if update: | |
| 761 top = self.check_toppatch(repo) | |
| 762 qp = self.qparents(repo, rev) | |
| 763 changes = repo.changelog.read(qp) | |
| 764 mf1 = repo.manifest.readflags(changes[0]) | |
| 765 mmap = repo.manifest.read(changes[0]) | |
| 766 (c, a, r, d, u) = repo.changes(qp, top) | |
| 767 if d: | |
| 768 raise util.Abort("deletions found between repo revs") | |
| 769 for f in c: | |
| 770 getfile(f, mmap[f]) | |
| 771 for f in r: | |
| 772 getfile(f, mmap[f]) | |
| 773 util.set_exec(repo.wjoin(f), mf1[f]) | |
| 774 repo.dirstate.update(c + r, 'n') | |
| 775 for f in a: | |
| 776 try: os.unlink(repo.wjoin(f)) | |
| 777 except: raise | |
| 778 try: os.removedirs(os.path.dirname(repo.wjoin(f))) | |
| 779 except: pass | |
| 780 if a: | |
| 781 repo.dirstate.forget(a) | |
| 782 repo.dirstate.setparents(qp, revlog.nullid) | |
| 783 self.strip(repo, rev, update=False, backup='strip', wlock=wlock) | |
| 784 del self.applied[start:end] | |
| 785 if len(self.applied): | |
| 786 self.ui.write("Now at: %s\n" % self.applied[-1].split(':')[1]) | |
| 787 else: | |
| 788 self.ui.write("Patch queue now empty\n") | |
| 789 | |
| 790 def diff(self, repo, files): | |
| 791 top = self.check_toppatch(repo) | |
| 792 if not top: | |
| 793 self.ui.write("No patches applied\n") | |
| 794 return | |
| 795 qp = self.qparents(repo, top) | |
| 796 commands.dodiff(sys.stdout, self.ui, repo, qp, None, files) | |
| 797 | |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
798 def refresh(self, repo, msg=None, short=False): |
| 1808 | 799 if len(self.applied) == 0: |
| 800 self.ui.write("No patches applied\n") | |
| 801 return | |
| 802 wlock = repo.wlock() | |
| 803 self.check_toppatch(repo) | |
| 804 qp = self.qparents(repo) | |
| 805 (top, patch) = self.applied[-1].split(':') | |
| 806 top = revlog.bin(top) | |
| 807 cparents = repo.changelog.parents(top) | |
| 808 patchparent = self.qparents(repo, top) | |
|
2299
dacf718e1d48
Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents:
2270
diff
changeset
|
809 message, comments, user, date, patchfound = self.readheaders(patch) |
| 1808 | 810 |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
811 patchf = self.opener(patch, "w") |
| 1808 | 812 if comments: |
| 813 comments = "\n".join(comments) + '\n\n' | |
| 814 patchf.write(comments) | |
| 815 | |
| 816 tip = repo.changelog.tip() | |
| 817 if top == tip: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
818 # if the top of our patch queue is also the tip, there is an |
| 1808 | 819 # optimization here. We update the dirstate in place and strip |
| 820 # off the tip commit. Then just commit the current directory | |
| 821 # tree. We can also send repo.commit the list of files | |
| 822 # changed to speed up the diff | |
| 823 # | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
824 # in short mode, we only diff the files included in the |
| 1808 | 825 # patch already |
| 826 # | |
| 827 # this should really read: | |
| 828 #(cc, dd, aa, aa2, uu) = repo.changes(tip, patchparent) | |
| 829 # but we do it backwards to take advantage of manifest/chlog | |
| 830 # caching against the next repo.changes call | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
831 # |
| 1808 | 832 (cc, aa, dd, aa2, uu) = repo.changes(patchparent, tip) |
| 833 if short: | |
| 834 filelist = cc + aa + dd | |
| 835 else: | |
| 836 filelist = None | |
| 837 (c, a, r, d, u) = repo.changes(None, None, filelist) | |
| 838 | |
| 839 # we might end up with files that were added between tip and | |
| 840 # the dirstate parent, but then changed in the local dirstate. | |
| 841 # in this case, we want them to only show up in the added section | |
| 842 for x in c: | |
| 843 if x not in aa: | |
| 844 cc.append(x) | |
| 845 # we might end up with files added by the local dirstate that | |
| 846 # were deleted by the patch. In this case, they should only | |
| 847 # show up in the changed section. | |
| 848 for x in a: | |
| 849 if x in dd: | |
| 850 del dd[dd.index(x)] | |
| 851 cc.append(x) | |
| 852 else: | |
| 853 aa.append(x) | |
| 854 # make sure any files deleted in the local dirstate | |
| 855 # are not in the add or change column of the patch | |
| 856 forget = [] | |
| 857 for x in d + r: | |
| 858 if x in aa: | |
| 859 del aa[aa.index(x)] | |
| 860 forget.append(x) | |
| 861 continue | |
| 862 elif x in cc: | |
| 863 del cc[cc.index(x)] | |
| 864 dd.append(x) | |
| 865 | |
| 866 c = list(util.unique(cc)) | |
| 867 r = list(util.unique(dd)) | |
| 868 a = list(util.unique(aa)) | |
| 869 filelist = list(util.unique(c + r + a )) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
870 commands.dodiff(patchf, self.ui, repo, patchparent, None, |
| 1808 | 871 filelist, changes=(c, a, r, [], u)) |
| 872 patchf.close() | |
| 873 | |
| 874 changes = repo.changelog.read(tip) | |
| 875 repo.dirstate.setparents(*cparents) | |
| 876 repo.dirstate.update(a, 'a') | |
| 877 repo.dirstate.update(r, 'r') | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
878 repo.dirstate.update(c, 'n') |
| 1808 | 879 repo.dirstate.forget(forget) |
| 880 | |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
881 if not msg: |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
882 if not message: |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
883 message = "patch queue: %s\n" % patch |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
884 else: |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
885 message = "\n".join(message) |
| 1808 | 886 else: |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
887 message = msg |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
888 |
| 1808 | 889 self.strip(repo, top, update=False, backup='strip', wlock=wlock) |
| 890 n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock) | |
| 891 self.applied[-1] = revlog.hex(n) + ':' + patch | |
| 892 self.applied_dirty = 1 | |
| 893 else: | |
| 894 commands.dodiff(patchf, self.ui, repo, patchparent, None) | |
| 895 patchf.close() | |
| 896 self.pop(repo, force=True, wlock=wlock) | |
| 897 self.push(repo, force=True, wlock=wlock) | |
| 898 | |
| 899 def init(self, repo, create=False): | |
| 900 if os.path.isdir(self.path): | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
901 raise util.Abort(_("patch queue directory already exists")) |
| 1808 | 902 os.mkdir(self.path) |
| 903 if create: | |
| 904 return self.qrepo(create=True) | |
| 905 | |
| 906 def unapplied(self, repo, patch=None): | |
| 907 if patch and patch not in self.series: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
908 raise util.Abort(_("patch %s is not in series file") % patch) |
| 1808 | 909 if not patch: |
| 910 start = self.series_end() | |
| 911 else: | |
| 912 start = self.series.index(patch) + 1 | |
| 913 for p in self.series[start:]: | |
|
2677
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
914 if self.ui.verbose: |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
915 self.ui.write("%d " % self.series.index(p)) |
| 1808 | 916 self.ui.write("%s\n" % p) |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
917 |
| 1808 | 918 def qseries(self, repo, missing=None): |
| 919 start = self.series_end() | |
| 920 if not missing: | |
| 921 for p in self.series[:start]: | |
| 922 if self.ui.verbose: | |
| 923 self.ui.write("%d A " % self.series.index(p)) | |
| 924 self.ui.write("%s\n" % p) | |
| 925 for p in self.series[start:]: | |
| 926 if self.ui.verbose: | |
| 927 self.ui.write("%d U " % self.series.index(p)) | |
| 928 self.ui.write("%s\n" % p) | |
| 929 else: | |
| 930 list = [] | |
| 931 for root, dirs, files in os.walk(self.path): | |
| 932 d = root[len(self.path) + 1:] | |
| 933 for f in files: | |
| 934 fl = os.path.join(d, f) | |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
935 if (fl not in self.series and |
|
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
936 fl not in (self.status_path, self.series_path) |
|
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
937 and not fl.startswith('.')): |
| 1808 | 938 list.append(fl) |
| 939 list.sort() | |
| 940 if list: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
941 for x in list: |
| 1808 | 942 if self.ui.verbose: |
| 943 self.ui.write("D ") | |
| 944 self.ui.write("%s\n" % x) | |
| 945 | |
| 946 def issaveline(self, l): | |
| 947 name = l.split(':')[1] | |
| 948 if name == '.hg.patches.save.line': | |
| 949 return True | |
| 950 | |
| 951 def qrepo(self, create=False): | |
| 952 if create or os.path.isdir(os.path.join(self.path, ".hg")): | |
|
1839
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1810
diff
changeset
|
953 return hg.repository(self.ui, path=self.path, create=create) |
| 1808 | 954 |
| 955 def restore(self, repo, rev, delete=None, qupdate=None): | |
| 956 c = repo.changelog.read(rev) | |
| 957 desc = c[4].strip() | |
| 958 lines = desc.splitlines() | |
| 959 i = 0 | |
| 960 datastart = None | |
| 961 series = [] | |
| 962 applied = [] | |
| 963 qpp = None | |
| 964 for i in xrange(0, len(lines)): | |
| 965 if lines[i] == 'Patch Data:': | |
| 966 datastart = i + 1 | |
| 967 elif lines[i].startswith('Dirstate:'): | |
| 968 l = lines[i].rstrip() | |
| 969 l = l[10:].split(' ') | |
| 970 qpp = [ hg.bin(x) for x in l ] | |
| 971 elif datastart != None: | |
| 972 l = lines[i].rstrip() | |
| 973 index = l.index(':') | |
| 974 id = l[:index] | |
| 975 file = l[index + 1:] | |
| 976 if id: | |
| 977 applied.append(l) | |
| 978 series.append(file) | |
| 979 if datastart == None: | |
| 980 self.ui.warn("No saved patch data found\n") | |
| 981 return 1 | |
| 982 self.ui.warn("restoring status: %s\n" % lines[0]) | |
| 983 self.full_series = series | |
| 984 self.applied = applied | |
| 985 self.read_series(self.full_series) | |
| 986 self.series_dirty = 1 | |
| 987 self.applied_dirty = 1 | |
| 988 heads = repo.changelog.heads() | |
| 989 if delete: | |
| 990 if rev not in heads: | |
| 991 self.ui.warn("save entry has children, leaving it alone\n") | |
| 992 else: | |
| 993 self.ui.warn("removing save entry %s\n" % hg.short(rev)) | |
| 994 pp = repo.dirstate.parents() | |
| 995 if rev in pp: | |
| 996 update = True | |
| 997 else: | |
| 998 update = False | |
| 999 self.strip(repo, rev, update=update, backup='strip') | |
| 1000 if qpp: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1001 self.ui.warn("saved queue repository parents: %s %s\n" % |
| 1808 | 1002 (hg.short(qpp[0]), hg.short(qpp[1]))) |
| 1003 if qupdate: | |
| 1004 print "queue directory updating" | |
| 1005 r = self.qrepo() | |
| 1006 if not r: | |
| 1007 self.ui.warn("Unable to load queue repository\n") | |
| 1008 return 1 | |
| 1009 r.update(qpp[0], allow=False, force=True) | |
| 1010 | |
| 1011 def save(self, repo, msg=None): | |
| 1012 if len(self.applied) == 0: | |
| 1013 self.ui.warn("save: no patches applied, exiting\n") | |
| 1014 return 1 | |
| 1015 if self.issaveline(self.applied[-1]): | |
| 1016 self.ui.warn("status is already saved\n") | |
| 1017 return 1 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1018 |
| 1808 | 1019 ar = [ ':' + x for x in self.full_series ] |
| 1020 if not msg: | |
| 1021 msg = "hg patches saved state" | |
| 1022 else: | |
| 1023 msg = "hg patches: " + msg.rstrip('\r\n') | |
| 1024 r = self.qrepo() | |
| 1025 if r: | |
| 1026 pp = r.dirstate.parents() | |
| 1027 msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1])) | |
| 1028 msg += "\n\nPatch Data:\n" | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1029 text = msg + "\n".join(self.applied) + '\n' + (ar and "\n".join(ar) |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1030 + '\n' or "") |
| 1808 | 1031 n = repo.commit(None, text, user=None, force=1) |
| 1032 if not n: | |
| 1033 self.ui.warn("repo commit failed\n") | |
| 1034 return 1 | |
| 1035 self.applied.append(revlog.hex(n) + ":" + '.hg.patches.save.line') | |
| 1036 self.applied_dirty = 1 | |
| 1037 | |
|
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1038 def full_series_end(self): |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1039 if len(self.applied) > 0: |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1040 (top, p) = self.applied[-1].split(':') |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1041 end = self.find_series(p) |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1042 if end == None: |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1043 return len(self.full_series) |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1044 return end + 1 |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1045 return 0 |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1046 |
| 1808 | 1047 def series_end(self): |
| 1048 end = 0 | |
| 1049 if len(self.applied) > 0: | |
| 1050 (top, p) = self.applied[-1].split(':') | |
| 1051 try: | |
| 1052 end = self.series.index(p) | |
| 1053 except ValueError: | |
| 1054 return 0 | |
| 1055 return end + 1 | |
| 1056 return end | |
| 1057 | |
| 1058 def qapplied(self, repo, patch=None): | |
| 1059 if patch and patch not in self.series: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1060 raise util.Abort(_("patch %s is not in series file") % patch) |
| 1808 | 1061 if not patch: |
| 1062 end = len(self.applied) | |
| 1063 else: | |
| 1064 end = self.series.index(patch) + 1 | |
| 1065 for x in xrange(end): | |
| 1066 p = self.appliedname(x) | |
| 1067 self.ui.write("%s\n" % p) | |
| 1068 | |
| 1069 def appliedname(self, index): | |
| 1070 p = self.applied[index] | |
|
2677
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1071 pname = p.split(':')[1] |
| 1808 | 1072 if not self.ui.verbose: |
|
2677
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1073 p = pname |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1074 else: |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1075 p = str(self.series.index(pname)) + " " + p |
| 1808 | 1076 return p |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1077 |
| 1808 | 1078 def top(self, repo): |
| 1079 if len(self.applied): | |
| 1080 p = self.appliedname(-1) | |
| 1081 self.ui.write(p + '\n') | |
| 1082 else: | |
| 1083 self.ui.write("No patches applied\n") | |
| 1084 | |
| 1085 def next(self, repo): | |
| 1086 end = self.series_end() | |
| 1087 if end == len(self.series): | |
| 1088 self.ui.write("All patches applied\n") | |
| 1089 else: | |
|
2677
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1090 p = self.series[end] |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1091 if self.ui.verbose: |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1092 self.ui.write("%d " % self.series.index(p)) |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1093 self.ui.write(p + '\n') |
| 1808 | 1094 |
| 1095 def prev(self, repo): | |
| 1096 if len(self.applied) > 1: | |
| 1097 p = self.appliedname(-2) | |
| 1098 self.ui.write(p + '\n') | |
| 1099 elif len(self.applied) == 1: | |
| 1100 self.ui.write("Only one patch applied\n") | |
| 1101 else: | |
| 1102 self.ui.write("No patches applied\n") | |
| 1103 | |
| 1104 def qimport(self, repo, files, patch=None, existing=None, force=None): | |
| 1105 if len(files) > 1 and patch: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1106 raise util.Abort(_('option "-n" not valid when importing multiple ' |
|
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1107 'files')) |
| 1808 | 1108 i = 0 |
|
2488
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1109 added = [] |
| 1808 | 1110 for filename in files: |
| 1111 if existing: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1112 if not patch: |
| 1808 | 1113 patch = filename |
| 1114 if not os.path.isfile(os.path.join(self.path, patch)): | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1115 raise util.Abort(_("patch %s does not exist") % patch) |
| 1808 | 1116 else: |
| 1117 try: | |
| 1118 text = file(filename).read() | |
| 1119 except IOError: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1120 raise util.Abort(_("unable to read %s") % patch) |
| 1808 | 1121 if not patch: |
| 1122 patch = os.path.split(filename)[1] | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1123 if not force and os.path.exists(os.path.join(self.path, patch)): |
|
2710
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
1124 raise util.Abort(_('patch "%s" already exists') % patch) |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
1125 patchf = self.opener(patch, "w") |
| 1808 | 1126 patchf.write(text) |
| 1127 if patch in self.series: | |
|
2710
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
1128 raise util.Abort(_('patch %s is already in the series file') |
|
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
1129 % patch) |
|
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1130 index = self.full_series_end() + i |
| 1808 | 1131 self.full_series[index:index] = [patch] |
| 1132 self.read_series(self.full_series) | |
| 1133 self.ui.warn("adding %s to series file\n" % patch) | |
| 1134 i += 1 | |
|
2488
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1135 added.append(patch) |
| 1808 | 1136 patch = None |
| 1137 self.series_dirty = 1 | |
|
2488
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1138 qrepo = self.qrepo() |
|
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1139 if qrepo: |
|
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1140 qrepo.add(added) |
| 1808 | 1141 |
| 1142 def delete(ui, repo, patch, **opts): | |
| 1143 """remove a patch from the series file""" | |
| 1144 q = repomap[repo] | |
| 1145 q.delete(repo, patch) | |
| 1146 q.save_dirty() | |
| 1147 return 0 | |
| 1148 | |
| 1149 def applied(ui, repo, patch=None, **opts): | |
| 1150 """print the patches already applied""" | |
| 1151 repomap[repo].qapplied(repo, patch) | |
| 1152 return 0 | |
| 1153 | |
| 1154 def unapplied(ui, repo, patch=None, **opts): | |
| 1155 """print the patches not yet applied""" | |
| 1156 repomap[repo].unapplied(repo, patch) | |
| 1157 return 0 | |
| 1158 | |
| 1159 def qimport(ui, repo, *filename, **opts): | |
| 1160 """import a patch""" | |
| 1161 q = repomap[repo] | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1162 q.qimport(repo, filename, patch=opts['name'], |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1163 existing=opts['existing'], force=opts['force']) |
| 1808 | 1164 q.save_dirty() |
| 1165 return 0 | |
| 1166 | |
| 1167 def init(ui, repo, **opts): | |
| 1168 """init a new queue repository""" | |
| 1169 q = repomap[repo] | |
| 1170 r = q.init(repo, create=opts['create_repo']) | |
| 1171 q.save_dirty() | |
| 1172 if r: | |
| 1173 fp = r.wopener('.hgignore', 'w') | |
| 1174 print >> fp, 'syntax: glob' | |
| 1175 print >> fp, 'status' | |
| 1176 fp.close() | |
| 1177 r.wopener('series', 'w').close() | |
| 1178 r.add(['.hgignore', 'series']) | |
| 1179 return 0 | |
| 1180 | |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1181 def clone(ui, source, dest=None, **opts): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1182 '''clone main and patch repository at same time |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1183 |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1184 If source is local, destination will have no patches applied. If |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1185 source is remote, this command can not check if patches are |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1186 applied in source, so cannot guarantee that patches are not |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1187 applied in destination. If you clone remote repository, be sure |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1188 before that it has no patches applied. |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1189 |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1190 Source patch repository is looked for in <src>/.hg/patches by |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1191 default. Use -p <url> to change. |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1192 ''' |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1193 ui.setconfig_remoteopts(**opts) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1194 if dest is None: |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1195 dest = hg.defaultdest(source) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1196 sr = hg.repository(ui, ui.expandpath(source)) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1197 qbase, destrev = None, None |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1198 if sr.local(): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1199 reposetup(ui, sr) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1200 sq = repomap[sr] |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1201 if sq.applied: |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1202 qbase = revlog.bin(sq.applied[0].split(':')[0]) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1203 if not hg.islocal(dest): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1204 destrev = sr.parents(qbase)[0] |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1205 ui.note(_('cloning main repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1206 sr, dr = hg.clone(ui, sr, dest, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1207 pull=opts['pull'], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1208 rev=destrev, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1209 update=False, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1210 stream=opts['uncompressed']) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1211 ui.note(_('cloning patch repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1212 spr, dpr = hg.clone(ui, opts['patches'] or (sr.url() + '/.hg/patches'), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1213 dr.url() + '/.hg/patches', |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1214 pull=opts['pull'], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1215 update=not opts['noupdate'], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1216 stream=opts['uncompressed']) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1217 if dr.local(): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1218 if qbase: |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1219 ui.note(_('stripping applied patches from destination repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1220 reposetup(ui, dr) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1221 dq = repomap[dr] |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1222 dq.strip(dr, qbase, update=False, backup=None) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1223 if not opts['noupdate']: |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1224 ui.note(_('updating destination repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1225 dr.update(dr.changelog.tip()) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1226 |
| 1808 | 1227 def commit(ui, repo, *pats, **opts): |
|
2526
37785f986260
mq: Added help for qcommit, consistently talk about queue repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2488
diff
changeset
|
1228 """commit changes in the queue repository""" |
| 1808 | 1229 q = repomap[repo] |
| 1230 r = q.qrepo() | |
| 1231 if not r: raise util.Abort('no queue repository') | |
| 1232 commands.commit(r.ui, r, *pats, **opts) | |
| 1233 | |
| 1234 def series(ui, repo, **opts): | |
| 1235 """print the entire series file""" | |
| 1236 repomap[repo].qseries(repo, missing=opts['missing']) | |
| 1237 return 0 | |
| 1238 | |
| 1239 def top(ui, repo, **opts): | |
| 1240 """print the name of the current patch""" | |
| 1241 repomap[repo].top(repo) | |
| 1242 return 0 | |
| 1243 | |
| 1244 def next(ui, repo, **opts): | |
| 1245 """print the name of the next patch""" | |
| 1246 repomap[repo].next(repo) | |
| 1247 return 0 | |
| 1248 | |
| 1249 def prev(ui, repo, **opts): | |
| 1250 """print the name of the previous patch""" | |
| 1251 repomap[repo].prev(repo) | |
| 1252 return 0 | |
| 1253 | |
| 1254 def new(ui, repo, patch, **opts): | |
| 1255 """create a new patch""" | |
| 1256 q = repomap[repo] | |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1257 message=commands.logmessage(**opts) |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1258 q.new(repo, patch, msg=message, force=opts['force']) |
| 1808 | 1259 q.save_dirty() |
| 1260 return 0 | |
| 1261 | |
| 1262 def refresh(ui, repo, **opts): | |
| 1263 """update the current patch""" | |
| 1264 q = repomap[repo] | |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1265 message=commands.logmessage(**opts) |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1266 q.refresh(repo, msg=message, short=opts['short']) |
| 1808 | 1267 q.save_dirty() |
| 1268 return 0 | |
| 1269 | |
| 1270 def diff(ui, repo, *files, **opts): | |
| 1271 """diff of the current patch""" | |
|
2097
4d2c2597876f
Fix hg qdiff <file>
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2086
diff
changeset
|
1272 # deep in the dirstate code, the walkhelper method wants a list, not a tuple |
|
4d2c2597876f
Fix hg qdiff <file>
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2086
diff
changeset
|
1273 repomap[repo].diff(repo, list(files)) |
| 1808 | 1274 return 0 |
| 1275 | |
| 1276 def lastsavename(path): | |
| 1277 (dir, base) = os.path.split(path) | |
| 1278 names = os.listdir(dir) | |
| 1279 namere = re.compile("%s.([0-9]+)" % base) | |
| 1280 max = None | |
| 1281 maxname = None | |
| 1282 for f in names: | |
| 1283 m = namere.match(f) | |
| 1284 if m: | |
| 1285 index = int(m.group(1)) | |
| 1286 if max == None or index > max: | |
| 1287 max = index | |
| 1288 maxname = f | |
| 1289 if maxname: | |
| 1290 return (os.path.join(dir, maxname), max) | |
| 1291 return (None, None) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1292 |
| 1808 | 1293 def savename(path): |
| 1294 (last, index) = lastsavename(path) | |
| 1295 if last is None: | |
| 1296 index = 0 | |
| 1297 newpath = path + ".%d" % (index + 1) | |
| 1298 return newpath | |
| 1299 | |
| 1300 def push(ui, repo, patch=None, **opts): | |
| 1301 """push the next patch onto the stack""" | |
| 1302 q = repomap[repo] | |
| 1303 mergeq = None | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1304 |
| 1808 | 1305 if opts['all']: |
| 1306 patch = q.series[-1] | |
| 1307 if opts['merge']: | |
| 1308 if opts['name']: | |
| 1309 newpath = opts['name'] | |
| 1310 else: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1311 newpath, i = lastsavename(q.path) |
| 1808 | 1312 if not newpath: |
| 1313 ui.warn("no saved queues found, please use -n\n") | |
| 1314 return 1 | |
| 1315 mergeq = queue(ui, repo.join(""), newpath) | |
| 1316 ui.warn("merging with queue at: %s\n" % mergeq.path) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1317 ret = q.push(repo, patch, force=opts['force'], list=opts['list'], |
| 1808 | 1318 mergeq=mergeq) |
| 1319 q.save_dirty() | |
| 1320 return ret | |
| 1321 | |
| 1322 def pop(ui, repo, patch=None, **opts): | |
| 1323 """pop the current patch off the stack""" | |
| 1324 localupdate = True | |
| 1325 if opts['name']: | |
| 1326 q = queue(ui, repo.join(""), repo.join(opts['name'])) | |
| 1327 ui.warn('using patch queue: %s\n' % q.path) | |
| 1328 localupdate = False | |
| 1329 else: | |
| 1330 q = repomap[repo] | |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
1331 q.pop(repo, patch, force=opts['force'], update=localupdate, all=opts['all']) |
| 1808 | 1332 q.save_dirty() |
| 1333 return 0 | |
| 1334 | |
| 1335 def restore(ui, repo, rev, **opts): | |
| 1336 """restore the queue state saved by a rev""" | |
| 1337 rev = repo.lookup(rev) | |
| 1338 q = repomap[repo] | |
| 1339 q.restore(repo, rev, delete=opts['delete'], | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1340 qupdate=opts['update']) |
| 1808 | 1341 q.save_dirty() |
| 1342 return 0 | |
| 1343 | |
| 1344 def save(ui, repo, **opts): | |
| 1345 """save current queue state""" | |
| 1346 q = repomap[repo] | |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1347 message=commands.logmessage(**opts) |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1348 ret = q.save(repo, msg=message) |
| 1808 | 1349 if ret: |
| 1350 return ret | |
| 1351 q.save_dirty() | |
| 1352 if opts['copy']: | |
| 1353 path = q.path | |
| 1354 if opts['name']: | |
| 1355 newpath = os.path.join(q.basepath, opts['name']) | |
| 1356 if os.path.exists(newpath): | |
| 1357 if not os.path.isdir(newpath): | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1358 raise util.Abort(_('destination %s exists and is not ' |
|
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1359 'a directory') % newpath) |
| 1808 | 1360 if not opts['force']: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1361 raise util.Abort(_('destination %s exists, ' |
|
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1362 'use -f to force') % newpath) |
| 1808 | 1363 else: |
| 1364 newpath = savename(path) | |
| 1365 ui.warn("copy %s to %s\n" % (path, newpath)) | |
| 1366 util.copyfiles(path, newpath) | |
| 1367 if opts['empty']: | |
| 1368 try: | |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
1369 os.unlink(os.path.join(q.path, q.status_path)) |
| 1808 | 1370 except: |
| 1371 pass | |
| 1372 return 0 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1373 |
| 1808 | 1374 def strip(ui, repo, rev, **opts): |
| 1375 """strip a revision and all later revs on the same branch""" | |
| 1376 rev = repo.lookup(rev) | |
| 1377 backup = 'all' | |
| 1378 if opts['backup']: | |
| 1379 backup = 'strip' | |
| 1380 elif opts['nobackup']: | |
| 1381 backup = 'none' | |
| 1382 repomap[repo].strip(repo, rev, backup=backup) | |
| 1383 return 0 | |
| 1384 | |
| 1385 def version(ui, q=None): | |
| 1386 """print the version number""" | |
| 1387 ui.write("mq version %s\n" % versionstr) | |
| 1388 return 0 | |
| 1389 | |
| 1390 def reposetup(ui, repo): | |
| 1391 repomap[repo] = queue(ui, repo.join("")) | |
|
2682
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1392 oldtags = repo.tags |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1393 |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1394 def qtags(): |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1395 if repo.tagscache: |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1396 return repo.tagscache |
|
2663
96950d39171d
Mq: modify repo.lookup to resolve applied patches too.
Brendan Cully <brendan@kublai.com>
parents:
2554
diff
changeset
|
1397 |
|
2682
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1398 tagscache = oldtags() |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1399 |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1400 q = repomap[repo] |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1401 if len(q.applied) == 0: |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1402 return tagscache |
|
2664
9b8df8dceeed
Add qtip and qbase to mq qlookup.
Brendan Cully <brendan@kublai.com>
parents:
2663
diff
changeset
|
1403 |
|
2682
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1404 mqtags = [patch.split(':') for patch in q.applied] |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1405 mqtags.append((mqtags[-1][0], 'qtip')) |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1406 mqtags.append((mqtags[0][0], 'qbase')) |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1407 for patch in mqtags: |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1408 if patch[1] in tagscache: |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1409 repo.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1]) |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1410 else: |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1411 tagscache[patch[1]] = revlog.bin(patch[0]) |
|
2664
9b8df8dceeed
Add qtip and qbase to mq qlookup.
Brendan Cully <brendan@kublai.com>
parents:
2663
diff
changeset
|
1412 |
|
2682
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1413 return tagscache |
|
2663
96950d39171d
Mq: modify repo.lookup to resolve applied patches too.
Brendan Cully <brendan@kublai.com>
parents:
2554
diff
changeset
|
1414 |
|
2682
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1415 repo.tags = qtags |
| 1808 | 1416 |
| 1417 cmdtable = { | |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1418 "qapplied": (applied, [], 'hg qapplied [PATCH]'), |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1419 "qclone": (clone, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1420 [('', 'pull', None, _('use pull protocol to copy metadata')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1421 ('U', 'noupdate', None, _('do not update the new working directories')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1422 ('', 'uncompressed', None, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1423 _('use uncompressed transfer (fast over LAN)')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1424 ('e', 'ssh', '', _('specify ssh command to use')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1425 ('p', 'patches', '', _('location of source patch repo')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1426 ('', 'remotecmd', '', |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1427 _('specify hg command to run on the remote side'))], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1428 'hg qclone [OPTION]... SOURCE [DEST]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1429 "qcommit|qci": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1430 (commit, |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1431 commands.table["^commit|ci"][1], |
|
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1432 'hg qcommit [OPTION]... [FILE]...'), |
|
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1433 "^qdiff": (diff, [], 'hg qdiff [FILE]...'), |
|
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1434 "qdelete": (delete, [], 'hg qdelete PATCH'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1435 "^qimport": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1436 (qimport, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1437 [('e', 'existing', None, 'import file in patch dir'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1438 ('n', 'name', '', 'patch file name'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1439 ('f', 'force', None, 'overwrite existing files')], |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1440 'hg qimport [-e] [-n NAME] [-f] FILE...'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1441 "^qinit": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1442 (init, |
|
2526
37785f986260
mq: Added help for qcommit, consistently talk about queue repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2488
diff
changeset
|
1443 [('c', 'create-repo', None, 'create queue repository')], |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1444 'hg qinit [-c]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1445 "qnew": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1446 (new, |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1447 [('m', 'message', '', _('use <text> as commit message')), |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1448 ('l', 'logfile', '', _('read the commit message from <file>')), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1449 ('f', 'force', None, 'force')], |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1450 'hg qnew [-m TEXT] [-l FILE] [-f] PATCH'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1451 "qnext": (next, [], 'hg qnext'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1452 "qprev": (prev, [], 'hg qprev'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1453 "^qpop": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1454 (pop, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1455 [('a', 'all', None, 'pop all patches'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1456 ('n', 'name', '', 'queue name to pop'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1457 ('f', 'force', None, 'forget any local changes')], |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1458 'hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1459 "^qpush": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1460 (push, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1461 [('f', 'force', None, 'apply if the patch has rejects'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1462 ('l', 'list', None, 'list patch name in commit text'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1463 ('a', 'all', None, 'apply all patches'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1464 ('m', 'merge', None, 'merge from another queue'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1465 ('n', 'name', '', 'merge queue name')], |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1466 'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1467 "^qrefresh": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1468 (refresh, |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1469 [('m', 'message', '', _('change commit message with <text>')), |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1470 ('l', 'logfile', '', _('change commit message with <file> content')), |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1471 ('s', 'short', None, 'short refresh')], |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1472 'hg qrefresh [-m TEXT] [-l FILE] [-s]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1473 "qrestore": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1474 (restore, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1475 [('d', 'delete', None, 'delete save entry'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1476 ('u', 'update', None, 'update queue working dir')], |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1477 'hg qrestore [-d] [-u] REV'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1478 "qsave": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1479 (save, |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1480 [('m', 'message', '', _('use <text> as commit message')), |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1481 ('l', 'logfile', '', _('read the commit message from <file>')), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1482 ('c', 'copy', None, 'copy patch directory'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1483 ('n', 'name', '', 'copy directory name'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1484 ('e', 'empty', None, 'clear queue status file'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1485 ('f', 'force', None, 'force copy')], |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1486 'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1487 "qseries": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1488 (series, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1489 [('m', 'missing', None, 'print patches not in series')], |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1490 'hg qseries [-m]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1491 "^strip": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1492 (strip, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1493 [('f', 'force', None, 'force multi-head removal'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1494 ('b', 'backup', None, 'bundle unrelated changesets'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1495 ('n', 'nobackup', None, 'no backups')], |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1496 'hg strip [-f] [-b] [-n] REV'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1497 "qtop": (top, [], 'hg qtop'), |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1498 "qunapplied": (unapplied, [], 'hg qunapplied [PATCH]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1499 "qversion": (version, [], 'hg qversion') |
| 1808 | 1500 } |
| 1501 |