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