Mercurial > hg > mercurial-crew-with-dirclash
annotate hgext/mq.py @ 2749:d13e4ffaa79d
[darcs2hg] Windows compatibilty patct
Originally submitted by Daiju Kito
1. single quote didn't work in several cases
2. os.unlink tries to delete tmpfile when it's called. It won't wait like unix.
| author | Sébastien Pierre <sebastien@xprima.com> |
|---|---|
| date | Tue, 01 Aug 2006 09:51:36 -0400 |
| parents | 752b9475a700 |
| children | 8c814c1ab31e 84218111e80f |
| 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:
2712
diff
changeset
|
40 commands.norepo += " qclone qversion" |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
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: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
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: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
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: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
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: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
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: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
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 | |
| 385 def delete(self, repo, patch): | |
| 2696 | 386 patch = self.lookup(patch, strict=True) |
| 1808 | 387 info = self.isapplied(patch) |
| 388 if info: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
389 raise util.Abort(_("cannot delete applied patch %s") % patch) |
| 1808 | 390 if patch not in self.series: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
391 raise util.Abort(_("patch %s not in series file") % patch) |
| 1808 | 392 i = self.find_series(patch) |
| 393 del self.full_series[i] | |
| 394 self.read_series(self.full_series) | |
| 395 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
|
396 |
| 1808 | 397 def check_toppatch(self, repo): |
| 398 if len(self.applied) > 0: | |
| 399 (top, patch) = self.applied[-1].split(':') | |
| 400 top = revlog.bin(top) | |
| 401 pp = repo.dirstate.parents() | |
| 402 if top not in pp: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
403 raise util.Abort(_("queue top not at same revision as working directory")) |
| 1808 | 404 return top |
| 405 return None | |
| 406 def check_localchanges(self, repo): | |
| 407 (c, a, r, d, u) = repo.changes(None, None) | |
| 408 if c or a or d or r: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
409 raise util.Abort(_("local changes found, refresh first")) |
| 1808 | 410 def new(self, repo, patch, msg=None, force=None): |
|
2710
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
411 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
|
412 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
|
413 commitfiles = [] |
|
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
414 (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
|
415 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
|
416 if not force: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
417 raise util.Abort(_("local changes found, refresh first")) |
|
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
418 commitfiles = c + a + r |
| 1808 | 419 self.check_toppatch(repo) |
| 420 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
|
421 insert = self.full_series_end() |
| 1808 | 422 if msg: |
|
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
423 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
|
424 wlock=wlock) |
| 1808 | 425 else: |
|
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
426 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
|
427 "New patch: %s" % patch, force=True, wlock=wlock) |
| 1808 | 428 if n == None: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
429 raise util.Abort(_("repo commit failed")) |
| 1808 | 430 self.full_series[insert:insert] = [patch] |
| 431 self.applied.append(revlog.hex(n) + ":" + patch) | |
| 432 self.read_series(self.full_series) | |
| 433 self.series_dirty = 1 | |
| 434 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
|
435 p = self.opener(patch, "w") |
| 1808 | 436 if msg: |
| 437 msg = msg + "\n" | |
| 438 p.write(msg) | |
| 439 p.close() | |
| 440 wlock = None | |
| 441 r = self.qrepo() | |
| 442 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
|
443 if commitfiles: |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
444 self.refresh(repo, msg=None, short=True) |
| 1808 | 445 |
| 446 def strip(self, repo, rev, update=True, backup="all", wlock=None): | |
| 447 def limitheads(chlog, stop): | |
| 448 """return the list of all nodes that have no children""" | |
| 449 p = {} | |
| 450 h = [] | |
| 451 stoprev = 0 | |
| 452 if stop in chlog.nodemap: | |
| 453 stoprev = chlog.rev(stop) | |
| 454 | |
| 455 for r in range(chlog.count() - 1, -1, -1): | |
| 456 n = chlog.node(r) | |
| 457 if n not in p: | |
| 458 h.append(n) | |
| 459 if n == stop: | |
| 460 break | |
| 461 if r < stoprev: | |
| 462 break | |
| 463 for pn in chlog.parents(n): | |
| 464 p[pn] = 1 | |
| 465 return h | |
| 466 | |
| 467 def bundle(cg): | |
| 468 backupdir = repo.join("strip-backup") | |
| 469 if not os.path.isdir(backupdir): | |
| 470 os.mkdir(backupdir) | |
| 471 name = os.path.join(backupdir, "%s" % revlog.short(rev)) | |
| 472 name = savename(name) | |
| 473 self.ui.warn("saving bundle to %s\n" % name) | |
| 474 # TODO, exclusive open | |
| 475 f = open(name, "wb") | |
| 476 try: | |
| 477 f.write("HG10") | |
| 478 z = bz2.BZ2Compressor(9) | |
| 479 while 1: | |
| 480 chunk = cg.read(4096) | |
| 481 if not chunk: | |
| 482 break | |
| 483 f.write(z.compress(chunk)) | |
| 484 f.write(z.flush()) | |
| 485 except: | |
| 486 os.unlink(name) | |
| 487 raise | |
| 488 f.close() | |
| 489 return name | |
| 490 | |
| 491 def stripall(rev, revnum): | |
| 492 cl = repo.changelog | |
| 493 c = cl.read(rev) | |
| 494 mm = repo.manifest.read(c[0]) | |
| 495 seen = {} | |
| 496 | |
| 497 for x in xrange(revnum, cl.count()): | |
| 498 c = cl.read(cl.node(x)) | |
| 499 for f in c[3]: | |
| 500 if f in seen: | |
| 501 continue | |
| 502 seen[f] = 1 | |
| 503 if f in mm: | |
| 504 filerev = mm[f] | |
| 505 else: | |
| 506 filerev = 0 | |
| 507 seen[f] = filerev | |
| 508 # we go in two steps here so the strip loop happens in a | |
| 509 # sensible order. When stripping many files, this helps keep | |
| 510 # our disk access patterns under control. | |
| 511 list = seen.keys() | |
| 512 list.sort() | |
| 513 for f in list: | |
| 514 ff = repo.file(f) | |
| 515 filerev = seen[f] | |
| 516 if filerev != 0: | |
| 517 if filerev in ff.nodemap: | |
| 518 filerev = ff.rev(filerev) | |
| 519 else: | |
| 520 filerev = 0 | |
| 521 ff.strip(filerev, revnum) | |
| 522 | |
| 523 if not wlock: | |
| 524 wlock = repo.wlock() | |
| 525 lock = repo.lock() | |
| 526 chlog = repo.changelog | |
| 527 # TODO delete the undo files, and handle undo of merge sets | |
| 528 pp = chlog.parents(rev) | |
| 529 revnum = chlog.rev(rev) | |
| 530 | |
| 531 if update: | |
|
2699
f8bcaf5696d5
mq: strip should not blow away local changes
Chris Mason <mason@suse.com>
parents:
2698
diff
changeset
|
532 (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
|
533 if c or a or d or r: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
534 raise util.Abort(_("local changes found")) |
| 1808 | 535 urev = self.qparents(repo, rev) |
| 536 repo.update(urev, allow=False, force=True, wlock=wlock) | |
| 537 repo.dirstate.write() | |
| 538 | |
| 539 # save is a list of all the branches we are truncating away | |
| 540 # that we actually want to keep. changegroup will be used | |
| 541 # to preserve them and add them back after the truncate | |
| 542 saveheads = [] | |
| 543 savebases = {} | |
| 544 | |
| 545 tip = chlog.tip() | |
| 546 heads = limitheads(chlog, rev) | |
| 547 seen = {} | |
| 548 | |
| 549 # search through all the heads, finding those where the revision | |
| 550 # we want to strip away is an ancestor. Also look for merges | |
| 551 # that might be turned into new heads by the strip. | |
| 552 while heads: | |
| 553 h = heads.pop() | |
| 554 n = h | |
| 555 while True: | |
| 556 seen[n] = 1 | |
| 557 pp = chlog.parents(n) | |
| 558 if pp[1] != revlog.nullid and chlog.rev(pp[1]) > revnum: | |
| 559 if pp[1] not in seen: | |
| 560 heads.append(pp[1]) | |
| 561 if pp[0] == revlog.nullid: | |
| 562 break | |
| 563 if chlog.rev(pp[0]) < revnum: | |
| 564 break | |
| 565 n = pp[0] | |
| 566 if n == rev: | |
| 567 break | |
| 568 r = chlog.reachable(h, rev) | |
| 569 if rev not in r: | |
| 570 saveheads.append(h) | |
| 571 for x in r: | |
| 572 if chlog.rev(x) > revnum: | |
| 573 savebases[x] = 1 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
574 |
| 1808 | 575 # create a changegroup for all the branches we need to keep |
| 576 if backup is "all": | |
| 577 backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip') | |
| 578 bundle(backupch) | |
| 579 if saveheads: | |
| 580 backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip') | |
| 581 chgrpfile = bundle(backupch) | |
| 582 | |
| 583 stripall(rev, revnum) | |
| 584 | |
| 585 change = chlog.read(rev) | |
| 586 repo.manifest.strip(repo.manifest.rev(change[0]), revnum) | |
| 587 chlog.strip(revnum, revnum) | |
| 588 if saveheads: | |
| 589 self.ui.status("adding branch\n") | |
| 590 commands.unbundle(self.ui, repo, chgrpfile, update=False) | |
| 591 if backup is not "strip": | |
| 592 os.unlink(chgrpfile) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
593 |
| 1808 | 594 def isapplied(self, patch): |
| 595 """returns (index, rev, patch)""" | |
| 596 for i in xrange(len(self.applied)): | |
| 597 p = self.applied[i] | |
| 598 a = p.split(':') | |
| 599 if a[1] == patch: | |
| 600 return (i, a[0], a[1]) | |
| 601 return None | |
| 602 | |
| 2696 | 603 # if the exact patch name does not exist, we try a few |
| 604 # variations. If strict is passed, we try only #1 | |
| 605 # | |
| 606 # 1) a number to indicate an offset in the series file | |
| 607 # 2) a unique substring of the patch name was given | |
| 608 # 3) patchname[-+]num to indicate an offset in the series file | |
| 609 def lookup(self, patch, strict=False): | |
| 610 def partial_name(s): | |
| 611 count = 0 | |
| 612 if s in self.series: | |
| 613 return s | |
| 614 for x in self.series: | |
| 615 if s in x: | |
| 616 count += 1 | |
| 617 last = x | |
| 618 if count > 1: | |
| 619 return None | |
| 620 if count: | |
| 621 return last | |
| 622 if len(self.series) > 0 and len(self.applied) > 0: | |
| 623 if s == 'qtip': | |
| 624 return self.series[self.series_end()-1] | |
| 625 if s == 'qbase': | |
| 626 return self.series[0] | |
| 627 return None | |
| 1808 | 628 if patch == None: |
| 629 return None | |
| 2696 | 630 |
| 631 # we don't want to return a partial match until we make | |
| 632 # sure the file name passed in does not exist (checked below) | |
| 633 res = partial_name(patch) | |
| 634 if res and res == patch: | |
| 635 return res | |
| 636 | |
| 1808 | 637 if not os.path.isfile(os.path.join(self.path, patch)): |
| 638 try: | |
| 639 sno = int(patch) | |
| 640 except(ValueError, OverflowError): | |
| 2696 | 641 pass |
| 642 else: | |
| 643 if sno < len(self.series): | |
| 644 patch = self.series[sno] | |
| 645 return patch | |
| 646 if not strict: | |
| 647 # return any partial match made above | |
| 648 if res: | |
| 649 return res | |
| 650 minus = patch.rsplit('-', 1) | |
| 651 if len(minus) > 1: | |
| 652 res = partial_name(minus[0]) | |
| 653 if res: | |
| 654 i = self.series.index(res) | |
| 655 try: | |
| 656 off = int(minus[1] or 1) | |
| 657 except(ValueError, OverflowError): | |
| 658 pass | |
| 659 else: | |
| 660 if i - off >= 0: | |
| 661 return self.series[i - off] | |
| 662 plus = patch.rsplit('+', 1) | |
| 663 if len(plus) > 1: | |
| 664 res = partial_name(plus[0]) | |
| 665 if res: | |
| 666 i = self.series.index(res) | |
| 667 try: | |
| 668 off = int(plus[1] or 1) | |
| 669 except(ValueError, OverflowError): | |
| 670 pass | |
| 671 else: | |
| 672 if i + off < len(self.series): | |
| 673 return self.series[i + off] | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
674 raise util.Abort(_("patch %s not in series") % patch) |
| 1808 | 675 |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
676 def push(self, repo, patch=None, force=False, list=False, |
| 1808 | 677 mergeq=None, wlock=None): |
| 678 if not wlock: | |
| 679 wlock = repo.wlock() | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
680 patch = self.lookup(patch) |
| 1808 | 681 if patch and self.isapplied(patch): |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
682 self.ui.warn(_("patch %s is already applied\n") % patch) |
| 1808 | 683 sys.exit(1) |
| 684 if self.series_end() == len(self.series): | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
685 self.ui.warn(_("patch series fully applied\n")) |
| 1808 | 686 sys.exit(1) |
| 687 if not force: | |
| 688 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
|
689 |
| 1808 | 690 self.applied_dirty = 1; |
| 691 start = self.series_end() | |
| 692 if start > 0: | |
| 693 self.check_toppatch(repo) | |
| 694 if not patch: | |
| 695 patch = self.series[start] | |
| 696 end = start + 1 | |
| 697 else: | |
| 698 end = self.series.index(patch, start) + 1 | |
| 699 s = self.series[start:end] | |
| 700 if mergeq: | |
| 701 ret = self.mergepatch(repo, mergeq, s, wlock) | |
| 702 else: | |
| 703 ret = self.apply(repo, s, list, wlock=wlock) | |
| 704 top = self.applied[-1].split(':')[1] | |
| 705 if ret[0]: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
706 self.ui.write("Errors during apply, please fix and refresh %s\n" % |
| 1808 | 707 top) |
| 708 else: | |
| 709 self.ui.write("Now at: %s\n" % top) | |
| 710 return ret[0] | |
| 711 | |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
712 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
|
713 wlock=None): |
| 1808 | 714 def getfile(f, rev): |
| 715 t = repo.file(f).read(rev) | |
| 716 try: | |
| 717 repo.wfile(f, "w").write(t) | |
| 718 except IOError: | |
|
2086
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
719 try: |
|
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
720 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
|
721 except OSError, err: |
|
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
722 if err.errno != errno.EEXIST: raise |
| 1808 | 723 repo.wfile(f, "w").write(t) |
| 724 | |
| 725 if not wlock: | |
| 726 wlock = repo.wlock() | |
| 727 if patch: | |
| 728 # index, rev, patch | |
| 729 info = self.isapplied(patch) | |
| 730 if not info: | |
| 731 patch = self.lookup(patch) | |
| 732 info = self.isapplied(patch) | |
| 733 if not info: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
734 raise util.Abort(_("patch %s is not applied") % patch) |
| 1808 | 735 if len(self.applied) == 0: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
736 self.ui.warn(_("no patches applied\n")) |
| 1808 | 737 sys.exit(1) |
| 738 | |
| 739 if not update: | |
| 740 parents = repo.dirstate.parents() | |
| 741 rr = [ revlog.bin(x.split(':')[0]) for x in self.applied ] | |
| 742 for p in parents: | |
| 743 if p in rr: | |
| 744 self.ui.warn("qpop: forcing dirstate update\n") | |
| 745 update = True | |
| 746 | |
| 747 if not force and update: | |
| 748 self.check_localchanges(repo) | |
| 749 | |
| 750 self.applied_dirty = 1; | |
| 751 end = len(self.applied) | |
| 752 if not patch: | |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
753 if all: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
754 popi = 0 |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
755 else: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
756 popi = len(self.applied) - 1 |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
757 else: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
758 popi = info[0] + 1 |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
759 if popi >= end: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
760 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
|
761 return |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
762 info = [ popi ] + self.applied[popi].split(':') |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
763 |
| 1808 | 764 start = info[0] |
| 765 rev = revlog.bin(info[1]) | |
| 766 | |
| 767 # we know there are no local changes, so we can make a simplified | |
| 768 # form of hg.update. | |
| 769 if update: | |
| 770 top = self.check_toppatch(repo) | |
| 771 qp = self.qparents(repo, rev) | |
| 772 changes = repo.changelog.read(qp) | |
| 773 mf1 = repo.manifest.readflags(changes[0]) | |
| 774 mmap = repo.manifest.read(changes[0]) | |
| 775 (c, a, r, d, u) = repo.changes(qp, top) | |
| 776 if d: | |
| 777 raise util.Abort("deletions found between repo revs") | |
| 778 for f in c: | |
| 779 getfile(f, mmap[f]) | |
| 780 for f in r: | |
| 781 getfile(f, mmap[f]) | |
| 782 util.set_exec(repo.wjoin(f), mf1[f]) | |
| 783 repo.dirstate.update(c + r, 'n') | |
| 784 for f in a: | |
| 785 try: os.unlink(repo.wjoin(f)) | |
| 786 except: raise | |
| 787 try: os.removedirs(os.path.dirname(repo.wjoin(f))) | |
| 788 except: pass | |
| 789 if a: | |
| 790 repo.dirstate.forget(a) | |
| 791 repo.dirstate.setparents(qp, revlog.nullid) | |
| 792 self.strip(repo, rev, update=False, backup='strip', wlock=wlock) | |
| 793 del self.applied[start:end] | |
| 794 if len(self.applied): | |
| 795 self.ui.write("Now at: %s\n" % self.applied[-1].split(':')[1]) | |
| 796 else: | |
| 797 self.ui.write("Patch queue now empty\n") | |
| 798 | |
| 799 def diff(self, repo, files): | |
| 800 top = self.check_toppatch(repo) | |
| 801 if not top: | |
| 802 self.ui.write("No patches applied\n") | |
| 803 return | |
| 804 qp = self.qparents(repo, top) | |
| 805 commands.dodiff(sys.stdout, self.ui, repo, qp, None, files) | |
| 806 | |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
807 def refresh(self, repo, msg=None, short=False): |
| 1808 | 808 if len(self.applied) == 0: |
| 809 self.ui.write("No patches applied\n") | |
| 810 return | |
| 811 wlock = repo.wlock() | |
| 812 self.check_toppatch(repo) | |
| 813 qp = self.qparents(repo) | |
| 814 (top, patch) = self.applied[-1].split(':') | |
| 815 top = revlog.bin(top) | |
| 816 cparents = repo.changelog.parents(top) | |
| 817 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
|
818 message, comments, user, date, patchfound = self.readheaders(patch) |
| 1808 | 819 |
|
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
|
820 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
|
821 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
|
822 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
|
823 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
|
824 # 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
|
825 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
|
826 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
|
827 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
|
828 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
|
829 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
|
830 comments.append(msg) |
| 1808 | 831 if comments: |
| 832 comments = "\n".join(comments) + '\n\n' | |
| 833 patchf.write(comments) | |
| 834 | |
| 835 tip = repo.changelog.tip() | |
| 836 if top == tip: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
837 # if the top of our patch queue is also the tip, there is an |
| 1808 | 838 # optimization here. We update the dirstate in place and strip |
| 839 # off the tip commit. Then just commit the current directory | |
| 840 # tree. We can also send repo.commit the list of files | |
| 841 # changed to speed up the diff | |
| 842 # | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
843 # in short mode, we only diff the files included in the |
| 1808 | 844 # patch already |
| 845 # | |
| 846 # this should really read: | |
| 847 #(cc, dd, aa, aa2, uu) = repo.changes(tip, patchparent) | |
| 848 # but we do it backwards to take advantage of manifest/chlog | |
| 849 # 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
|
850 # |
| 1808 | 851 (cc, aa, dd, aa2, uu) = repo.changes(patchparent, tip) |
| 852 if short: | |
| 853 filelist = cc + aa + dd | |
| 854 else: | |
| 855 filelist = None | |
| 856 (c, a, r, d, u) = repo.changes(None, None, filelist) | |
| 857 | |
| 858 # we might end up with files that were added between tip and | |
| 859 # the dirstate parent, but then changed in the local dirstate. | |
| 860 # in this case, we want them to only show up in the added section | |
| 861 for x in c: | |
| 862 if x not in aa: | |
| 863 cc.append(x) | |
| 864 # we might end up with files added by the local dirstate that | |
| 865 # were deleted by the patch. In this case, they should only | |
| 866 # show up in the changed section. | |
| 867 for x in a: | |
| 868 if x in dd: | |
| 869 del dd[dd.index(x)] | |
| 870 cc.append(x) | |
| 871 else: | |
| 872 aa.append(x) | |
| 873 # make sure any files deleted in the local dirstate | |
| 874 # are not in the add or change column of the patch | |
| 875 forget = [] | |
| 876 for x in d + r: | |
| 877 if x in aa: | |
| 878 del aa[aa.index(x)] | |
| 879 forget.append(x) | |
| 880 continue | |
| 881 elif x in cc: | |
| 882 del cc[cc.index(x)] | |
| 883 dd.append(x) | |
| 884 | |
| 885 c = list(util.unique(cc)) | |
| 886 r = list(util.unique(dd)) | |
| 887 a = list(util.unique(aa)) | |
| 888 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
|
889 commands.dodiff(patchf, self.ui, repo, patchparent, None, |
| 1808 | 890 filelist, changes=(c, a, r, [], u)) |
| 891 patchf.close() | |
| 892 | |
| 893 changes = repo.changelog.read(tip) | |
| 894 repo.dirstate.setparents(*cparents) | |
| 895 repo.dirstate.update(a, 'a') | |
| 896 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
|
897 repo.dirstate.update(c, 'n') |
| 1808 | 898 repo.dirstate.forget(forget) |
| 899 | |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
900 if not msg: |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
901 if not message: |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
902 message = "patch queue: %s\n" % patch |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
903 else: |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
904 message = "\n".join(message) |
| 1808 | 905 else: |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
906 message = msg |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
907 |
| 1808 | 908 self.strip(repo, top, update=False, backup='strip', wlock=wlock) |
| 909 n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock) | |
| 910 self.applied[-1] = revlog.hex(n) + ':' + patch | |
| 911 self.applied_dirty = 1 | |
| 912 else: | |
| 913 commands.dodiff(patchf, self.ui, repo, patchparent, None) | |
| 914 patchf.close() | |
| 915 self.pop(repo, force=True, wlock=wlock) | |
| 916 self.push(repo, force=True, wlock=wlock) | |
| 917 | |
| 918 def init(self, repo, create=False): | |
| 919 if os.path.isdir(self.path): | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
920 raise util.Abort(_("patch queue directory already exists")) |
| 1808 | 921 os.mkdir(self.path) |
| 922 if create: | |
| 923 return self.qrepo(create=True) | |
| 924 | |
| 925 def unapplied(self, repo, patch=None): | |
| 926 if patch and patch not in self.series: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
927 raise util.Abort(_("patch %s is not in series file") % patch) |
| 1808 | 928 if not patch: |
| 929 start = self.series_end() | |
| 930 else: | |
| 931 start = self.series.index(patch) + 1 | |
| 932 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
|
933 if self.ui.verbose: |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
934 self.ui.write("%d " % self.series.index(p)) |
| 1808 | 935 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
|
936 |
| 1808 | 937 def qseries(self, repo, missing=None): |
| 938 start = self.series_end() | |
| 939 if not missing: | |
| 940 for p in self.series[:start]: | |
| 941 if self.ui.verbose: | |
| 942 self.ui.write("%d A " % self.series.index(p)) | |
| 943 self.ui.write("%s\n" % p) | |
| 944 for p in self.series[start:]: | |
| 945 if self.ui.verbose: | |
| 946 self.ui.write("%d U " % self.series.index(p)) | |
| 947 self.ui.write("%s\n" % p) | |
| 948 else: | |
| 949 list = [] | |
| 950 for root, dirs, files in os.walk(self.path): | |
| 951 d = root[len(self.path) + 1:] | |
| 952 for f in files: | |
| 953 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
|
954 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
|
955 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
|
956 and not fl.startswith('.')): |
| 1808 | 957 list.append(fl) |
| 958 list.sort() | |
| 959 if list: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
960 for x in list: |
| 1808 | 961 if self.ui.verbose: |
| 962 self.ui.write("D ") | |
| 963 self.ui.write("%s\n" % x) | |
| 964 | |
| 965 def issaveline(self, l): | |
| 966 name = l.split(':')[1] | |
| 967 if name == '.hg.patches.save.line': | |
| 968 return True | |
| 969 | |
| 970 def qrepo(self, create=False): | |
| 971 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
|
972 return hg.repository(self.ui, path=self.path, create=create) |
| 1808 | 973 |
| 974 def restore(self, repo, rev, delete=None, qupdate=None): | |
| 975 c = repo.changelog.read(rev) | |
| 976 desc = c[4].strip() | |
| 977 lines = desc.splitlines() | |
| 978 i = 0 | |
| 979 datastart = None | |
| 980 series = [] | |
| 981 applied = [] | |
| 982 qpp = None | |
| 983 for i in xrange(0, len(lines)): | |
| 984 if lines[i] == 'Patch Data:': | |
| 985 datastart = i + 1 | |
| 986 elif lines[i].startswith('Dirstate:'): | |
| 987 l = lines[i].rstrip() | |
| 988 l = l[10:].split(' ') | |
| 989 qpp = [ hg.bin(x) for x in l ] | |
| 990 elif datastart != None: | |
| 991 l = lines[i].rstrip() | |
| 992 index = l.index(':') | |
| 993 id = l[:index] | |
| 994 file = l[index + 1:] | |
| 995 if id: | |
| 996 applied.append(l) | |
| 997 series.append(file) | |
| 998 if datastart == None: | |
| 999 self.ui.warn("No saved patch data found\n") | |
| 1000 return 1 | |
| 1001 self.ui.warn("restoring status: %s\n" % lines[0]) | |
| 1002 self.full_series = series | |
| 1003 self.applied = applied | |
| 1004 self.read_series(self.full_series) | |
| 1005 self.series_dirty = 1 | |
| 1006 self.applied_dirty = 1 | |
| 1007 heads = repo.changelog.heads() | |
| 1008 if delete: | |
| 1009 if rev not in heads: | |
| 1010 self.ui.warn("save entry has children, leaving it alone\n") | |
| 1011 else: | |
| 1012 self.ui.warn("removing save entry %s\n" % hg.short(rev)) | |
| 1013 pp = repo.dirstate.parents() | |
| 1014 if rev in pp: | |
| 1015 update = True | |
| 1016 else: | |
| 1017 update = False | |
| 1018 self.strip(repo, rev, update=update, backup='strip') | |
| 1019 if qpp: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1020 self.ui.warn("saved queue repository parents: %s %s\n" % |
| 1808 | 1021 (hg.short(qpp[0]), hg.short(qpp[1]))) |
| 1022 if qupdate: | |
| 1023 print "queue directory updating" | |
| 1024 r = self.qrepo() | |
| 1025 if not r: | |
| 1026 self.ui.warn("Unable to load queue repository\n") | |
| 1027 return 1 | |
| 1028 r.update(qpp[0], allow=False, force=True) | |
| 1029 | |
| 1030 def save(self, repo, msg=None): | |
| 1031 if len(self.applied) == 0: | |
| 1032 self.ui.warn("save: no patches applied, exiting\n") | |
| 1033 return 1 | |
| 1034 if self.issaveline(self.applied[-1]): | |
| 1035 self.ui.warn("status is already saved\n") | |
| 1036 return 1 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1037 |
| 1808 | 1038 ar = [ ':' + x for x in self.full_series ] |
| 1039 if not msg: | |
| 1040 msg = "hg patches saved state" | |
| 1041 else: | |
| 1042 msg = "hg patches: " + msg.rstrip('\r\n') | |
| 1043 r = self.qrepo() | |
| 1044 if r: | |
| 1045 pp = r.dirstate.parents() | |
| 1046 msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1])) | |
| 1047 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
|
1048 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
|
1049 + '\n' or "") |
| 1808 | 1050 n = repo.commit(None, text, user=None, force=1) |
| 1051 if not n: | |
| 1052 self.ui.warn("repo commit failed\n") | |
| 1053 return 1 | |
| 1054 self.applied.append(revlog.hex(n) + ":" + '.hg.patches.save.line') | |
| 1055 self.applied_dirty = 1 | |
| 1056 | |
|
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1057 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
|
1058 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
|
1059 (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
|
1060 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
|
1061 if end == None: |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1062 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
|
1063 return end + 1 |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1064 return 0 |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1065 |
| 1808 | 1066 def series_end(self): |
| 1067 end = 0 | |
| 1068 if len(self.applied) > 0: | |
| 1069 (top, p) = self.applied[-1].split(':') | |
| 1070 try: | |
| 1071 end = self.series.index(p) | |
| 1072 except ValueError: | |
| 1073 return 0 | |
| 1074 return end + 1 | |
| 1075 return end | |
| 1076 | |
| 1077 def qapplied(self, repo, patch=None): | |
| 1078 if patch and patch not in self.series: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1079 raise util.Abort(_("patch %s is not in series file") % patch) |
| 1808 | 1080 if not patch: |
| 1081 end = len(self.applied) | |
| 1082 else: | |
| 1083 end = self.series.index(patch) + 1 | |
| 1084 for x in xrange(end): | |
| 1085 p = self.appliedname(x) | |
| 1086 self.ui.write("%s\n" % p) | |
| 1087 | |
| 1088 def appliedname(self, index): | |
| 1089 p = self.applied[index] | |
|
2677
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1090 pname = p.split(':')[1] |
| 1808 | 1091 if not self.ui.verbose: |
|
2677
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1092 p = pname |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1093 else: |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1094 p = str(self.series.index(pname)) + " " + p |
| 1808 | 1095 return p |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1096 |
| 1808 | 1097 def top(self, repo): |
| 1098 if len(self.applied): | |
| 1099 p = self.appliedname(-1) | |
| 1100 self.ui.write(p + '\n') | |
| 1101 else: | |
| 1102 self.ui.write("No patches applied\n") | |
| 1103 | |
| 1104 def next(self, repo): | |
| 1105 end = self.series_end() | |
| 1106 if end == len(self.series): | |
| 1107 self.ui.write("All patches applied\n") | |
| 1108 else: | |
|
2677
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1109 p = self.series[end] |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1110 if self.ui.verbose: |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1111 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
|
1112 self.ui.write(p + '\n') |
| 1808 | 1113 |
| 1114 def prev(self, repo): | |
| 1115 if len(self.applied) > 1: | |
| 1116 p = self.appliedname(-2) | |
| 1117 self.ui.write(p + '\n') | |
| 1118 elif len(self.applied) == 1: | |
| 1119 self.ui.write("Only one patch applied\n") | |
| 1120 else: | |
| 1121 self.ui.write("No patches applied\n") | |
| 1122 | |
| 1123 def qimport(self, repo, files, patch=None, existing=None, force=None): | |
| 1124 if len(files) > 1 and patch: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1125 raise util.Abort(_('option "-n" not valid when importing multiple ' |
|
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1126 'files')) |
| 1808 | 1127 i = 0 |
|
2488
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1128 added = [] |
| 1808 | 1129 for filename in files: |
| 1130 if existing: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1131 if not patch: |
| 1808 | 1132 patch = filename |
| 1133 if not os.path.isfile(os.path.join(self.path, patch)): | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1134 raise util.Abort(_("patch %s does not exist") % patch) |
| 1808 | 1135 else: |
| 1136 try: | |
| 1137 text = file(filename).read() | |
| 1138 except IOError: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1139 raise util.Abort(_("unable to read %s") % patch) |
| 1808 | 1140 if not patch: |
| 1141 patch = os.path.split(filename)[1] | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1142 if not force and os.path.exists(os.path.join(self.path, patch)): |
|
2710
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
1143 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
|
1144 patchf = self.opener(patch, "w") |
| 1808 | 1145 patchf.write(text) |
| 1146 if patch in self.series: | |
|
2710
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
1147 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
|
1148 % patch) |
|
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1149 index = self.full_series_end() + i |
| 1808 | 1150 self.full_series[index:index] = [patch] |
| 1151 self.read_series(self.full_series) | |
| 1152 self.ui.warn("adding %s to series file\n" % patch) | |
| 1153 i += 1 | |
|
2488
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1154 added.append(patch) |
| 1808 | 1155 patch = None |
| 1156 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
|
1157 qrepo = self.qrepo() |
|
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1158 if qrepo: |
|
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1159 qrepo.add(added) |
| 1808 | 1160 |
| 1161 def delete(ui, repo, patch, **opts): | |
| 1162 """remove a patch from the series file""" | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1163 q = repo.mq |
| 1808 | 1164 q.delete(repo, patch) |
| 1165 q.save_dirty() | |
| 1166 return 0 | |
| 1167 | |
| 1168 def applied(ui, repo, patch=None, **opts): | |
| 1169 """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
|
1170 repo.mq.qapplied(repo, patch) |
| 1808 | 1171 return 0 |
| 1172 | |
| 1173 def unapplied(ui, repo, patch=None, **opts): | |
| 1174 """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
|
1175 repo.mq.unapplied(repo, patch) |
| 1808 | 1176 return 0 |
| 1177 | |
| 1178 def qimport(ui, repo, *filename, **opts): | |
| 1179 """import a patch""" | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1180 q = repo.mq |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1181 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
|
1182 existing=opts['existing'], force=opts['force']) |
| 1808 | 1183 q.save_dirty() |
| 1184 return 0 | |
| 1185 | |
| 1186 def init(ui, repo, **opts): | |
| 1187 """init a new queue repository""" | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1188 q = repo.mq |
| 1808 | 1189 r = q.init(repo, create=opts['create_repo']) |
| 1190 q.save_dirty() | |
| 1191 if r: | |
| 1192 fp = r.wopener('.hgignore', 'w') | |
| 1193 print >> fp, 'syntax: glob' | |
| 1194 print >> fp, 'status' | |
| 1195 fp.close() | |
| 1196 r.wopener('series', 'w').close() | |
| 1197 r.add(['.hgignore', 'series']) | |
| 1198 return 0 | |
| 1199 | |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1200 def clone(ui, source, dest=None, **opts): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1201 '''clone main and patch repository at same time |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1202 |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1203 If source is local, destination will have no patches applied. If |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1204 source is remote, this command can not check if patches are |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1205 applied in source, so cannot guarantee that patches are not |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1206 applied in destination. If you clone remote repository, be sure |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1207 before that it has no patches applied. |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1208 |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1209 Source patch repository is looked for in <src>/.hg/patches by |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1210 default. Use -p <url> to change. |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1211 ''' |
|
2738
ad4155e757da
Kill ui.setconfig_remoteopts
Matt Mackall <mpm@selenic.com>
parents:
2728
diff
changeset
|
1212 commands.setremoteconfig(**opts) |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1213 if dest is None: |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1214 dest = hg.defaultdest(source) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1215 sr = hg.repository(ui, ui.expandpath(source)) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1216 qbase, destrev = None, None |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1217 if sr.local(): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1218 reposetup(ui, sr) |
|
2725
9ffee4f07323
mq: update to handle repomap not longer used
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2724
diff
changeset
|
1219 if sr.mq.applied: |
|
9ffee4f07323
mq: update to handle repomap not longer used
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2724
diff
changeset
|
1220 qbase = revlog.bin(sr.mq.applied[0].split(':')[0]) |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1221 if not hg.islocal(dest): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1222 destrev = sr.parents(qbase)[0] |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1223 ui.note(_('cloning main repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1224 sr, dr = hg.clone(ui, sr, dest, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1225 pull=opts['pull'], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1226 rev=destrev, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1227 update=False, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1228 stream=opts['uncompressed']) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1229 ui.note(_('cloning patch repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1230 spr, dpr = hg.clone(ui, opts['patches'] or (sr.url() + '/.hg/patches'), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1231 dr.url() + '/.hg/patches', |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1232 pull=opts['pull'], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1233 update=not opts['noupdate'], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1234 stream=opts['uncompressed']) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1235 if dr.local(): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1236 if qbase: |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1237 ui.note(_('stripping applied patches from destination repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1238 reposetup(ui, dr) |
|
2725
9ffee4f07323
mq: update to handle repomap not longer used
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2724
diff
changeset
|
1239 dr.mq.strip(dr, qbase, update=False, backup=None) |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1240 if not opts['noupdate']: |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1241 ui.note(_('updating destination repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1242 dr.update(dr.changelog.tip()) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1243 |
| 1808 | 1244 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
|
1245 """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
|
1246 q = repo.mq |
| 1808 | 1247 r = q.qrepo() |
| 1248 if not r: raise util.Abort('no queue repository') | |
| 1249 commands.commit(r.ui, r, *pats, **opts) | |
| 1250 | |
| 1251 def series(ui, repo, **opts): | |
| 1252 """print the entire series file""" | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1253 repo.mq.qseries(repo, missing=opts['missing']) |
| 1808 | 1254 return 0 |
| 1255 | |
| 1256 def top(ui, repo, **opts): | |
| 1257 """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
|
1258 repo.mq.top(repo) |
| 1808 | 1259 return 0 |
| 1260 | |
| 1261 def next(ui, repo, **opts): | |
| 1262 """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
|
1263 repo.mq.next(repo) |
| 1808 | 1264 return 0 |
| 1265 | |
| 1266 def prev(ui, repo, **opts): | |
| 1267 """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
|
1268 repo.mq.prev(repo) |
| 1808 | 1269 return 0 |
| 1270 | |
| 1271 def new(ui, repo, patch, **opts): | |
| 1272 """create a new patch""" | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1273 q = repo.mq |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1274 message=commands.logmessage(**opts) |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1275 q.new(repo, patch, msg=message, force=opts['force']) |
| 1808 | 1276 q.save_dirty() |
| 1277 return 0 | |
| 1278 | |
| 1279 def refresh(ui, repo, **opts): | |
| 1280 """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
|
1281 q = repo.mq |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1282 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
|
1283 if opts['edit']: |
|
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1284 if message: |
|
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1285 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
|
1286 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
|
1287 (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
|
1288 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
|
1289 q.refresh(repo, msg=message, short=opts['short']) |
| 1808 | 1290 q.save_dirty() |
| 1291 return 0 | |
| 1292 | |
| 1293 def diff(ui, repo, *files, **opts): | |
| 1294 """diff of the current patch""" | |
|
2097
4d2c2597876f
Fix hg qdiff <file>
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2086
diff
changeset
|
1295 # 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
|
1296 repo.mq.diff(repo, list(files)) |
| 1808 | 1297 return 0 |
| 1298 | |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1299 def fold(ui, repo, *files): |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1300 """fold the named patches into the current patch |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1301 Patches must not yet be applied.""" |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1302 q = repo.mq |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1303 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1304 if not files: |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1305 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
|
1306 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
|
1307 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
|
1308 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1309 parent = q.lookup('qtip') |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1310 patches = [] |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1311 messages = [] |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1312 for f in files: |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1313 patch = q.lookup(f) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1314 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
|
1315 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
|
1316 if q.isapplied(patch): |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1317 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
|
1318 patches.append(patch) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1319 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1320 for patch in patches: |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1321 messages.append(q.readheaders(patch)[0]) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1322 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
|
1323 (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
|
1324 if not patchsuccess: |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1325 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
|
1326 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1327 message = q.readheaders(parent)[0] |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1328 for msg in messages: |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1329 message.append('* * *') |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1330 message.extend(msg) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1331 message = '\n'.join(message) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1332 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1333 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
|
1334 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1335 for patch in patches: |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1336 q.delete(repo, patch) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1337 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1338 q.save_dirty() |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1339 |
|
2747
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1340 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
|
1341 """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
|
1342 q = repo.mq |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1343 |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1344 if patch: |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1345 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
|
1346 else: |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1347 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
|
1348 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
|
1349 return |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1350 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
|
1351 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
|
1352 |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1353 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
|
1354 |
| 1808 | 1355 def lastsavename(path): |
| 1356 (dir, base) = os.path.split(path) | |
| 1357 names = os.listdir(dir) | |
| 1358 namere = re.compile("%s.([0-9]+)" % base) | |
| 1359 max = None | |
| 1360 maxname = None | |
| 1361 for f in names: | |
| 1362 m = namere.match(f) | |
| 1363 if m: | |
| 1364 index = int(m.group(1)) | |
| 1365 if max == None or index > max: | |
| 1366 max = index | |
| 1367 maxname = f | |
| 1368 if maxname: | |
| 1369 return (os.path.join(dir, maxname), max) | |
| 1370 return (None, None) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1371 |
| 1808 | 1372 def savename(path): |
| 1373 (last, index) = lastsavename(path) | |
| 1374 if last is None: | |
| 1375 index = 0 | |
| 1376 newpath = path + ".%d" % (index + 1) | |
| 1377 return newpath | |
| 1378 | |
| 1379 def push(ui, repo, patch=None, **opts): | |
| 1380 """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
|
1381 q = repo.mq |
| 1808 | 1382 mergeq = None |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1383 |
| 1808 | 1384 if opts['all']: |
| 1385 patch = q.series[-1] | |
| 1386 if opts['merge']: | |
| 1387 if opts['name']: | |
| 1388 newpath = opts['name'] | |
| 1389 else: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1390 newpath, i = lastsavename(q.path) |
| 1808 | 1391 if not newpath: |
| 1392 ui.warn("no saved queues found, please use -n\n") | |
| 1393 return 1 | |
| 1394 mergeq = queue(ui, repo.join(""), newpath) | |
| 1395 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
|
1396 ret = q.push(repo, patch, force=opts['force'], list=opts['list'], |
| 1808 | 1397 mergeq=mergeq) |
| 1398 q.save_dirty() | |
| 1399 return ret | |
| 1400 | |
| 1401 def pop(ui, repo, patch=None, **opts): | |
| 1402 """pop the current patch off the stack""" | |
| 1403 localupdate = True | |
| 1404 if opts['name']: | |
| 1405 q = queue(ui, repo.join(""), repo.join(opts['name'])) | |
| 1406 ui.warn('using patch queue: %s\n' % q.path) | |
| 1407 localupdate = False | |
| 1408 else: | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1409 q = repo.mq |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
1410 q.pop(repo, patch, force=opts['force'], update=localupdate, all=opts['all']) |
| 1808 | 1411 q.save_dirty() |
| 1412 return 0 | |
| 1413 | |
| 1414 def restore(ui, repo, rev, **opts): | |
| 1415 """restore the queue state saved by a rev""" | |
| 1416 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
|
1417 q = repo.mq |
| 1808 | 1418 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
|
1419 qupdate=opts['update']) |
| 1808 | 1420 q.save_dirty() |
| 1421 return 0 | |
| 1422 | |
| 1423 def save(ui, repo, **opts): | |
| 1424 """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
|
1425 q = repo.mq |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1426 message=commands.logmessage(**opts) |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1427 ret = q.save(repo, msg=message) |
| 1808 | 1428 if ret: |
| 1429 return ret | |
| 1430 q.save_dirty() | |
| 1431 if opts['copy']: | |
| 1432 path = q.path | |
| 1433 if opts['name']: | |
| 1434 newpath = os.path.join(q.basepath, opts['name']) | |
| 1435 if os.path.exists(newpath): | |
| 1436 if not os.path.isdir(newpath): | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1437 raise util.Abort(_('destination %s exists and is not ' |
|
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1438 'a directory') % newpath) |
| 1808 | 1439 if not opts['force']: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1440 raise util.Abort(_('destination %s exists, ' |
|
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1441 'use -f to force') % newpath) |
| 1808 | 1442 else: |
| 1443 newpath = savename(path) | |
| 1444 ui.warn("copy %s to %s\n" % (path, newpath)) | |
| 1445 util.copyfiles(path, newpath) | |
| 1446 if opts['empty']: | |
| 1447 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
|
1448 os.unlink(os.path.join(q.path, q.status_path)) |
| 1808 | 1449 except: |
| 1450 pass | |
| 1451 return 0 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1452 |
| 1808 | 1453 def strip(ui, repo, rev, **opts): |
| 1454 """strip a revision and all later revs on the same branch""" | |
| 1455 rev = repo.lookup(rev) | |
| 1456 backup = 'all' | |
| 1457 if opts['backup']: | |
| 1458 backup = 'strip' | |
| 1459 elif opts['nobackup']: | |
| 1460 backup = 'none' | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1461 repo.mq.strip(repo, rev, backup=backup) |
| 1808 | 1462 return 0 |
| 1463 | |
| 1464 def version(ui, q=None): | |
| 1465 """print the version number""" | |
| 1466 ui.write("mq version %s\n" % versionstr) | |
| 1467 return 0 | |
| 1468 | |
| 1469 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
|
1470 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
|
1471 def tags(self): |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1472 if self.tagscache: |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1473 return self.tagscache |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1474 |
|
2742
2f13f8d3fe80
mq: correct the use of super
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2738
diff
changeset
|
1475 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
|
1476 |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1477 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
|
1478 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
|
1479 return tagscache |
|
2663
96950d39171d
Mq: modify repo.lookup to resolve applied patches too.
Brendan Cully <brendan@kublai.com>
parents:
2554
diff
changeset
|
1480 |
|
2723
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1481 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
|
1482 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
|
1483 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
|
1484 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
|
1485 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
|
1486 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
|
1487 else: |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1488 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
|
1489 |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1490 return tagscache |
|
2664
9b8df8dceeed
Add qtip and qbase to mq qlookup.
Brendan Cully <brendan@kublai.com>
parents:
2663
diff
changeset
|
1491 |
|
2723
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1492 repo.__class__ = MqRepo |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1493 repo.mq = queue(ui, repo.join("")) |
| 1808 | 1494 |
| 1495 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
|
1496 "qapplied": (applied, [], 'hg qapplied [PATCH]'), |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1497 "qclone": (clone, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1498 [('', 'pull', None, _('use pull protocol to copy metadata')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1499 ('U', 'noupdate', None, _('do not update the new working directories')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1500 ('', 'uncompressed', None, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1501 _('use uncompressed transfer (fast over LAN)')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1502 ('e', 'ssh', '', _('specify ssh command to use')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1503 ('p', 'patches', '', _('location of source patch repo')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1504 ('', 'remotecmd', '', |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1505 _('specify hg command to run on the remote side'))], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1506 '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
|
1507 "qcommit|qci": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1508 (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
|
1509 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
|
1510 '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
|
1511 "^qdiff": (diff, [], 'hg qdiff [FILE]...'), |
|
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1512 "qdelete": (delete, [], 'hg qdelete PATCH'), |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1513 'qfold': (fold, [], 'hg qfold PATCH...'), |
|
2747
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1514 'qheader': (header, [], |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1515 _('hg qheader [PATCH]')), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1516 "^qimport": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1517 (qimport, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1518 [('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
|
1519 ('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
|
1520 ('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
|
1521 '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
|
1522 "^qinit": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1523 (init, |
|
2526
37785f986260
mq: Added help for qcommit, consistently talk about queue repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2488
diff
changeset
|
1524 [('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
|
1525 'hg qinit [-c]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1526 "qnew": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1527 (new, |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1528 [('m', 'message', '', _('use <text> as commit message')), |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1529 ('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
|
1530 ('f', 'force', None, 'force')], |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1531 '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
|
1532 "qnext": (next, [], 'hg qnext'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1533 "qprev": (prev, [], 'hg qprev'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1534 "^qpop": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1535 (pop, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1536 [('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
|
1537 ('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
|
1538 ('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
|
1539 '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
|
1540 "^qpush": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1541 (push, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1542 [('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
|
1543 ('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
|
1544 ('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
|
1545 ('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
|
1546 ('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
|
1547 '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
|
1548 "^qrefresh": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1549 (refresh, |
|
2746
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1550 [('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
|
1551 ('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
|
1552 ('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
|
1553 ('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
|
1554 'hg qrefresh [-e] [-m TEXT] [-l FILE] [-s]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1555 "qrestore": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1556 (restore, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1557 [('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
|
1558 ('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
|
1559 '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
|
1560 "qsave": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1561 (save, |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1562 [('m', 'message', '', _('use <text> as commit message')), |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1563 ('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
|
1564 ('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
|
1565 ('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
|
1566 ('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
|
1567 ('f', 'force', None, 'force copy')], |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1568 '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
|
1569 "qseries": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1570 (series, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1571 [('m', 'missing', None, 'print patches not in series')], |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1572 'hg qseries [-m]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1573 "^strip": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1574 (strip, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1575 [('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
|
1576 ('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
|
1577 ('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
|
1578 '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
|
1579 "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
|
1580 "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
|
1581 "qversion": (version, [], 'hg qversion') |
| 1808 | 1582 } |
| 1583 |