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