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