Show More
@@ -1,2489 +1,2492 b'' | |||
|
1 | 1 | # mq.py - patch queues for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005, 2006 Chris Mason <mason@suse.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms |
|
6 | 6 | # of the GNU General Public License, incorporated herein by reference. |
|
7 | 7 | |
|
8 | 8 | '''patch management and development |
|
9 | 9 | |
|
10 | 10 | This extension lets you work with a stack of patches in a Mercurial |
|
11 | 11 | repository. It manages two stacks of patches - all known patches, and |
|
12 | 12 | applied patches (subset of known patches). |
|
13 | 13 | |
|
14 | 14 | Known patches are represented as patch files in the .hg/patches |
|
15 | 15 | directory. Applied patches are both patch files and changesets. |
|
16 | 16 | |
|
17 | 17 | Common tasks (use "hg help command" for more details): |
|
18 | 18 | |
|
19 | 19 | prepare repository to work with patches qinit |
|
20 | 20 | create new patch qnew |
|
21 | 21 | import existing patch qimport |
|
22 | 22 | |
|
23 | 23 | print patch series qseries |
|
24 | 24 | print applied patches qapplied |
|
25 | 25 | print name of top applied patch qtop |
|
26 | 26 | |
|
27 | 27 | add known patch to applied stack qpush |
|
28 | 28 | remove patch from applied stack qpop |
|
29 | 29 | refresh contents of top applied patch qrefresh |
|
30 | 30 | ''' |
|
31 | 31 | |
|
32 | 32 | from mercurial.i18n import _ |
|
33 | 33 | from mercurial.node import bin, hex, short |
|
34 | 34 | from mercurial.repo import RepoError |
|
35 | 35 | from mercurial import commands, cmdutil, hg, patch, revlog, util |
|
36 | 36 | from mercurial import repair |
|
37 | import os, sys, re, errno | |
|
37 | import os, sys, re, errno, urllib | |
|
38 | 38 | |
|
39 | 39 | commands.norepo += " qclone" |
|
40 | 40 | |
|
41 | 41 | # Patch names looks like unix-file names. |
|
42 | 42 | # They must be joinable with queue directory and result in the patch path. |
|
43 | 43 | normname = util.normpath |
|
44 | 44 | |
|
45 | 45 | class statusentry: |
|
46 | 46 | def __init__(self, rev, name=None): |
|
47 | 47 | if not name: |
|
48 | 48 | fields = rev.split(':', 1) |
|
49 | 49 | if len(fields) == 2: |
|
50 | 50 | self.rev, self.name = fields |
|
51 | 51 | else: |
|
52 | 52 | self.rev, self.name = None, None |
|
53 | 53 | else: |
|
54 | 54 | self.rev, self.name = rev, name |
|
55 | 55 | |
|
56 | 56 | def __str__(self): |
|
57 | 57 | return self.rev + ':' + self.name |
|
58 | 58 | |
|
59 | 59 | class queue: |
|
60 | 60 | def __init__(self, ui, path, patchdir=None): |
|
61 | 61 | self.basepath = path |
|
62 | 62 | self.path = patchdir or os.path.join(path, "patches") |
|
63 | 63 | self.opener = util.opener(self.path) |
|
64 | 64 | self.ui = ui |
|
65 | 65 | self.applied = [] |
|
66 | 66 | self.full_series = [] |
|
67 | 67 | self.applied_dirty = 0 |
|
68 | 68 | self.series_dirty = 0 |
|
69 | 69 | self.series_path = "series" |
|
70 | 70 | self.status_path = "status" |
|
71 | 71 | self.guards_path = "guards" |
|
72 | 72 | self.active_guards = None |
|
73 | 73 | self.guards_dirty = False |
|
74 | 74 | self._diffopts = None |
|
75 | 75 | |
|
76 | 76 | if os.path.exists(self.join(self.series_path)): |
|
77 | 77 | self.full_series = self.opener(self.series_path).read().splitlines() |
|
78 | 78 | self.parse_series() |
|
79 | 79 | |
|
80 | 80 | if os.path.exists(self.join(self.status_path)): |
|
81 | 81 | lines = self.opener(self.status_path).read().splitlines() |
|
82 | 82 | self.applied = [statusentry(l) for l in lines] |
|
83 | 83 | |
|
84 | 84 | def diffopts(self): |
|
85 | 85 | if self._diffopts is None: |
|
86 | 86 | self._diffopts = patch.diffopts(self.ui) |
|
87 | 87 | return self._diffopts |
|
88 | 88 | |
|
89 | 89 | def join(self, *p): |
|
90 | 90 | return os.path.join(self.path, *p) |
|
91 | 91 | |
|
92 | 92 | def find_series(self, patch): |
|
93 | 93 | pre = re.compile("(\s*)([^#]+)") |
|
94 | 94 | index = 0 |
|
95 | 95 | for l in self.full_series: |
|
96 | 96 | m = pre.match(l) |
|
97 | 97 | if m: |
|
98 | 98 | s = m.group(2) |
|
99 | 99 | s = s.rstrip() |
|
100 | 100 | if s == patch: |
|
101 | 101 | return index |
|
102 | 102 | index += 1 |
|
103 | 103 | return None |
|
104 | 104 | |
|
105 | 105 | guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') |
|
106 | 106 | |
|
107 | 107 | def parse_series(self): |
|
108 | 108 | self.series = [] |
|
109 | 109 | self.series_guards = [] |
|
110 | 110 | for l in self.full_series: |
|
111 | 111 | h = l.find('#') |
|
112 | 112 | if h == -1: |
|
113 | 113 | patch = l |
|
114 | 114 | comment = '' |
|
115 | 115 | elif h == 0: |
|
116 | 116 | continue |
|
117 | 117 | else: |
|
118 | 118 | patch = l[:h] |
|
119 | 119 | comment = l[h:] |
|
120 | 120 | patch = patch.strip() |
|
121 | 121 | if patch: |
|
122 | 122 | if patch in self.series: |
|
123 | 123 | raise util.Abort(_('%s appears more than once in %s') % |
|
124 | 124 | (patch, self.join(self.series_path))) |
|
125 | 125 | self.series.append(patch) |
|
126 | 126 | self.series_guards.append(self.guard_re.findall(comment)) |
|
127 | 127 | |
|
128 | 128 | def check_guard(self, guard): |
|
129 | 129 | if not guard: |
|
130 | 130 | return _('guard cannot be an empty string') |
|
131 | 131 | bad_chars = '# \t\r\n\f' |
|
132 | 132 | first = guard[0] |
|
133 | 133 | for c in '-+': |
|
134 | 134 | if first == c: |
|
135 | 135 | return (_('guard %r starts with invalid character: %r') % |
|
136 | 136 | (guard, c)) |
|
137 | 137 | for c in bad_chars: |
|
138 | 138 | if c in guard: |
|
139 | 139 | return _('invalid character in guard %r: %r') % (guard, c) |
|
140 | 140 | |
|
141 | 141 | def set_active(self, guards): |
|
142 | 142 | for guard in guards: |
|
143 | 143 | bad = self.check_guard(guard) |
|
144 | 144 | if bad: |
|
145 | 145 | raise util.Abort(bad) |
|
146 | 146 | guards = util.sort(util.unique(guards)) |
|
147 | 147 | self.ui.debug(_('active guards: %s\n') % ' '.join(guards)) |
|
148 | 148 | self.active_guards = guards |
|
149 | 149 | self.guards_dirty = True |
|
150 | 150 | |
|
151 | 151 | def active(self): |
|
152 | 152 | if self.active_guards is None: |
|
153 | 153 | self.active_guards = [] |
|
154 | 154 | try: |
|
155 | 155 | guards = self.opener(self.guards_path).read().split() |
|
156 | 156 | except IOError, err: |
|
157 | 157 | if err.errno != errno.ENOENT: raise |
|
158 | 158 | guards = [] |
|
159 | 159 | for i, guard in enumerate(guards): |
|
160 | 160 | bad = self.check_guard(guard) |
|
161 | 161 | if bad: |
|
162 | 162 | self.ui.warn('%s:%d: %s\n' % |
|
163 | 163 | (self.join(self.guards_path), i + 1, bad)) |
|
164 | 164 | else: |
|
165 | 165 | self.active_guards.append(guard) |
|
166 | 166 | return self.active_guards |
|
167 | 167 | |
|
168 | 168 | def set_guards(self, idx, guards): |
|
169 | 169 | for g in guards: |
|
170 | 170 | if len(g) < 2: |
|
171 | 171 | raise util.Abort(_('guard %r too short') % g) |
|
172 | 172 | if g[0] not in '-+': |
|
173 | 173 | raise util.Abort(_('guard %r starts with invalid char') % g) |
|
174 | 174 | bad = self.check_guard(g[1:]) |
|
175 | 175 | if bad: |
|
176 | 176 | raise util.Abort(bad) |
|
177 | 177 | drop = self.guard_re.sub('', self.full_series[idx]) |
|
178 | 178 | self.full_series[idx] = drop + ''.join([' #' + g for g in guards]) |
|
179 | 179 | self.parse_series() |
|
180 | 180 | self.series_dirty = True |
|
181 | 181 | |
|
182 | 182 | def pushable(self, idx): |
|
183 | 183 | if isinstance(idx, str): |
|
184 | 184 | idx = self.series.index(idx) |
|
185 | 185 | patchguards = self.series_guards[idx] |
|
186 | 186 | if not patchguards: |
|
187 | 187 | return True, None |
|
188 | 188 | default = False |
|
189 | 189 | guards = self.active() |
|
190 | 190 | exactneg = [g for g in patchguards if g[0] == '-' and g[1:] in guards] |
|
191 | 191 | if exactneg: |
|
192 | 192 | return False, exactneg[0] |
|
193 | 193 | pos = [g for g in patchguards if g[0] == '+'] |
|
194 | 194 | exactpos = [g for g in pos if g[1:] in guards] |
|
195 | 195 | if pos: |
|
196 | 196 | if exactpos: |
|
197 | 197 | return True, exactpos[0] |
|
198 | 198 | return False, pos |
|
199 | 199 | return True, '' |
|
200 | 200 | |
|
201 | 201 | def explain_pushable(self, idx, all_patches=False): |
|
202 | 202 | write = all_patches and self.ui.write or self.ui.warn |
|
203 | 203 | if all_patches or self.ui.verbose: |
|
204 | 204 | if isinstance(idx, str): |
|
205 | 205 | idx = self.series.index(idx) |
|
206 | 206 | pushable, why = self.pushable(idx) |
|
207 | 207 | if all_patches and pushable: |
|
208 | 208 | if why is None: |
|
209 | 209 | write(_('allowing %s - no guards in effect\n') % |
|
210 | 210 | self.series[idx]) |
|
211 | 211 | else: |
|
212 | 212 | if not why: |
|
213 | 213 | write(_('allowing %s - no matching negative guards\n') % |
|
214 | 214 | self.series[idx]) |
|
215 | 215 | else: |
|
216 | 216 | write(_('allowing %s - guarded by %r\n') % |
|
217 | 217 | (self.series[idx], why)) |
|
218 | 218 | if not pushable: |
|
219 | 219 | if why: |
|
220 | 220 | write(_('skipping %s - guarded by %r\n') % |
|
221 | 221 | (self.series[idx], why)) |
|
222 | 222 | else: |
|
223 | 223 | write(_('skipping %s - no matching guards\n') % |
|
224 | 224 | self.series[idx]) |
|
225 | 225 | |
|
226 | 226 | def save_dirty(self): |
|
227 | 227 | def write_list(items, path): |
|
228 | 228 | fp = self.opener(path, 'w') |
|
229 | 229 | for i in items: |
|
230 | 230 | fp.write("%s\n" % i) |
|
231 | 231 | fp.close() |
|
232 | 232 | if self.applied_dirty: write_list(map(str, self.applied), self.status_path) |
|
233 | 233 | if self.series_dirty: write_list(self.full_series, self.series_path) |
|
234 | 234 | if self.guards_dirty: write_list(self.active_guards, self.guards_path) |
|
235 | 235 | |
|
236 | 236 | def readheaders(self, patch): |
|
237 | 237 | def eatdiff(lines): |
|
238 | 238 | while lines: |
|
239 | 239 | l = lines[-1] |
|
240 | 240 | if (l.startswith("diff -") or |
|
241 | 241 | l.startswith("Index:") or |
|
242 | 242 | l.startswith("===========")): |
|
243 | 243 | del lines[-1] |
|
244 | 244 | else: |
|
245 | 245 | break |
|
246 | 246 | def eatempty(lines): |
|
247 | 247 | while lines: |
|
248 | 248 | l = lines[-1] |
|
249 | 249 | if re.match('\s*$', l): |
|
250 | 250 | del lines[-1] |
|
251 | 251 | else: |
|
252 | 252 | break |
|
253 | 253 | |
|
254 | 254 | pf = self.join(patch) |
|
255 | 255 | message = [] |
|
256 | 256 | comments = [] |
|
257 | 257 | user = None |
|
258 | 258 | date = None |
|
259 | 259 | format = None |
|
260 | 260 | subject = None |
|
261 | 261 | diffstart = 0 |
|
262 | 262 | |
|
263 | 263 | for line in file(pf): |
|
264 | 264 | line = line.rstrip() |
|
265 | 265 | if line.startswith('diff --git'): |
|
266 | 266 | diffstart = 2 |
|
267 | 267 | break |
|
268 | 268 | if diffstart: |
|
269 | 269 | if line.startswith('+++ '): |
|
270 | 270 | diffstart = 2 |
|
271 | 271 | break |
|
272 | 272 | if line.startswith("--- "): |
|
273 | 273 | diffstart = 1 |
|
274 | 274 | continue |
|
275 | 275 | elif format == "hgpatch": |
|
276 | 276 | # parse values when importing the result of an hg export |
|
277 | 277 | if line.startswith("# User "): |
|
278 | 278 | user = line[7:] |
|
279 | 279 | elif line.startswith("# Date "): |
|
280 | 280 | date = line[7:] |
|
281 | 281 | elif not line.startswith("# ") and line: |
|
282 | 282 | message.append(line) |
|
283 | 283 | format = None |
|
284 | 284 | elif line == '# HG changeset patch': |
|
285 | 285 | format = "hgpatch" |
|
286 | 286 | elif (format != "tagdone" and (line.startswith("Subject: ") or |
|
287 | 287 | line.startswith("subject: "))): |
|
288 | 288 | subject = line[9:] |
|
289 | 289 | format = "tag" |
|
290 | 290 | elif (format != "tagdone" and (line.startswith("From: ") or |
|
291 | 291 | line.startswith("from: "))): |
|
292 | 292 | user = line[6:] |
|
293 | 293 | format = "tag" |
|
294 | 294 | elif format == "tag" and line == "": |
|
295 | 295 | # when looking for tags (subject: from: etc) they |
|
296 | 296 | # end once you find a blank line in the source |
|
297 | 297 | format = "tagdone" |
|
298 | 298 | elif message or line: |
|
299 | 299 | message.append(line) |
|
300 | 300 | comments.append(line) |
|
301 | 301 | |
|
302 | 302 | eatdiff(message) |
|
303 | 303 | eatdiff(comments) |
|
304 | 304 | eatempty(message) |
|
305 | 305 | eatempty(comments) |
|
306 | 306 | |
|
307 | 307 | # make sure message isn't empty |
|
308 | 308 | if format and format.startswith("tag") and subject: |
|
309 | 309 | message.insert(0, "") |
|
310 | 310 | message.insert(0, subject) |
|
311 | 311 | return (message, comments, user, date, diffstart > 1) |
|
312 | 312 | |
|
313 | 313 | def removeundo(self, repo): |
|
314 | 314 | undo = repo.sjoin('undo') |
|
315 | 315 | if not os.path.exists(undo): |
|
316 | 316 | return |
|
317 | 317 | try: |
|
318 | 318 | os.unlink(undo) |
|
319 | 319 | except OSError, inst: |
|
320 | 320 | self.ui.warn(_('error removing undo: %s\n') % str(inst)) |
|
321 | 321 | |
|
322 | 322 | def printdiff(self, repo, node1, node2=None, files=None, |
|
323 | 323 | fp=None, changes=None, opts={}): |
|
324 | 324 | m = cmdutil.match(repo, files, opts) |
|
325 | 325 | patch.diff(repo, node1, node2, m, fp, changes, self.diffopts()) |
|
326 | 326 | |
|
327 | 327 | def mergeone(self, repo, mergeq, head, patch, rev): |
|
328 | 328 | # first try just applying the patch |
|
329 | 329 | (err, n) = self.apply(repo, [ patch ], update_status=False, |
|
330 | 330 | strict=True, merge=rev) |
|
331 | 331 | |
|
332 | 332 | if err == 0: |
|
333 | 333 | return (err, n) |
|
334 | 334 | |
|
335 | 335 | if n is None: |
|
336 | 336 | raise util.Abort(_("apply failed for patch %s") % patch) |
|
337 | 337 | |
|
338 | 338 | self.ui.warn(_("patch didn't work out, merging %s\n") % patch) |
|
339 | 339 | |
|
340 | 340 | # apply failed, strip away that rev and merge. |
|
341 | 341 | hg.clean(repo, head) |
|
342 | 342 | self.strip(repo, n, update=False, backup='strip') |
|
343 | 343 | |
|
344 | 344 | ctx = repo[rev] |
|
345 | 345 | ret = hg.merge(repo, rev) |
|
346 | 346 | if ret: |
|
347 | 347 | raise util.Abort(_("update returned %d") % ret) |
|
348 | 348 | n = repo.commit(None, ctx.description(), ctx.user(), force=1) |
|
349 | 349 | if n == None: |
|
350 | 350 | raise util.Abort(_("repo commit failed")) |
|
351 | 351 | try: |
|
352 | 352 | message, comments, user, date, patchfound = mergeq.readheaders(patch) |
|
353 | 353 | except: |
|
354 | 354 | raise util.Abort(_("unable to read %s") % patch) |
|
355 | 355 | |
|
356 | 356 | patchf = self.opener(patch, "w") |
|
357 | 357 | if comments: |
|
358 | 358 | comments = "\n".join(comments) + '\n\n' |
|
359 | 359 | patchf.write(comments) |
|
360 | 360 | self.printdiff(repo, head, n, fp=patchf) |
|
361 | 361 | patchf.close() |
|
362 | 362 | self.removeundo(repo) |
|
363 | 363 | return (0, n) |
|
364 | 364 | |
|
365 | 365 | def qparents(self, repo, rev=None): |
|
366 | 366 | if rev is None: |
|
367 | 367 | (p1, p2) = repo.dirstate.parents() |
|
368 | 368 | if p2 == revlog.nullid: |
|
369 | 369 | return p1 |
|
370 | 370 | if len(self.applied) == 0: |
|
371 | 371 | return None |
|
372 | 372 | return revlog.bin(self.applied[-1].rev) |
|
373 | 373 | pp = repo.changelog.parents(rev) |
|
374 | 374 | if pp[1] != revlog.nullid: |
|
375 | 375 | arevs = [ x.rev for x in self.applied ] |
|
376 | 376 | p0 = revlog.hex(pp[0]) |
|
377 | 377 | p1 = revlog.hex(pp[1]) |
|
378 | 378 | if p0 in arevs: |
|
379 | 379 | return pp[0] |
|
380 | 380 | if p1 in arevs: |
|
381 | 381 | return pp[1] |
|
382 | 382 | return pp[0] |
|
383 | 383 | |
|
384 | 384 | def mergepatch(self, repo, mergeq, series): |
|
385 | 385 | if len(self.applied) == 0: |
|
386 | 386 | # each of the patches merged in will have two parents. This |
|
387 | 387 | # can confuse the qrefresh, qdiff, and strip code because it |
|
388 | 388 | # needs to know which parent is actually in the patch queue. |
|
389 | 389 | # so, we insert a merge marker with only one parent. This way |
|
390 | 390 | # the first patch in the queue is never a merge patch |
|
391 | 391 | # |
|
392 | 392 | pname = ".hg.patches.merge.marker" |
|
393 | 393 | n = repo.commit(None, '[mq]: merge marker', user=None, force=1) |
|
394 | 394 | self.removeundo(repo) |
|
395 | 395 | self.applied.append(statusentry(revlog.hex(n), pname)) |
|
396 | 396 | self.applied_dirty = 1 |
|
397 | 397 | |
|
398 | 398 | head = self.qparents(repo) |
|
399 | 399 | |
|
400 | 400 | for patch in series: |
|
401 | 401 | patch = mergeq.lookup(patch, strict=True) |
|
402 | 402 | if not patch: |
|
403 | 403 | self.ui.warn(_("patch %s does not exist\n") % patch) |
|
404 | 404 | return (1, None) |
|
405 | 405 | pushable, reason = self.pushable(patch) |
|
406 | 406 | if not pushable: |
|
407 | 407 | self.explain_pushable(patch, all_patches=True) |
|
408 | 408 | continue |
|
409 | 409 | info = mergeq.isapplied(patch) |
|
410 | 410 | if not info: |
|
411 | 411 | self.ui.warn(_("patch %s is not applied\n") % patch) |
|
412 | 412 | return (1, None) |
|
413 | 413 | rev = revlog.bin(info[1]) |
|
414 | 414 | (err, head) = self.mergeone(repo, mergeq, head, patch, rev) |
|
415 | 415 | if head: |
|
416 | 416 | self.applied.append(statusentry(revlog.hex(head), patch)) |
|
417 | 417 | self.applied_dirty = 1 |
|
418 | 418 | if err: |
|
419 | 419 | return (err, head) |
|
420 | 420 | self.save_dirty() |
|
421 | 421 | return (0, head) |
|
422 | 422 | |
|
423 | 423 | def patch(self, repo, patchfile): |
|
424 | 424 | '''Apply patchfile to the working directory. |
|
425 | 425 | patchfile: file name of patch''' |
|
426 | 426 | files = {} |
|
427 | 427 | try: |
|
428 | 428 | fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root, |
|
429 | 429 | files=files) |
|
430 | 430 | except Exception, inst: |
|
431 | 431 | self.ui.note(str(inst) + '\n') |
|
432 | 432 | if not self.ui.verbose: |
|
433 | 433 | self.ui.warn(_("patch failed, unable to continue (try -v)\n")) |
|
434 | 434 | return (False, files, False) |
|
435 | 435 | |
|
436 | 436 | return (True, files, fuzz) |
|
437 | 437 | |
|
438 | 438 | def apply(self, repo, series, list=False, update_status=True, |
|
439 | 439 | strict=False, patchdir=None, merge=None, all_files={}): |
|
440 | 440 | wlock = lock = tr = None |
|
441 | 441 | try: |
|
442 | 442 | wlock = repo.wlock() |
|
443 | 443 | lock = repo.lock() |
|
444 | 444 | tr = repo.transaction() |
|
445 | 445 | try: |
|
446 | 446 | ret = self._apply(repo, series, list, update_status, |
|
447 | 447 | strict, patchdir, merge, all_files=all_files) |
|
448 | 448 | tr.close() |
|
449 | 449 | self.save_dirty() |
|
450 | 450 | return ret |
|
451 | 451 | except: |
|
452 | 452 | try: |
|
453 | 453 | tr.abort() |
|
454 | 454 | finally: |
|
455 | 455 | repo.invalidate() |
|
456 | 456 | repo.dirstate.invalidate() |
|
457 | 457 | raise |
|
458 | 458 | finally: |
|
459 | 459 | del tr, lock, wlock |
|
460 | 460 | self.removeundo(repo) |
|
461 | 461 | |
|
462 | 462 | def _apply(self, repo, series, list=False, update_status=True, |
|
463 | 463 | strict=False, patchdir=None, merge=None, all_files={}): |
|
464 | 464 | # TODO unify with commands.py |
|
465 | 465 | if not patchdir: |
|
466 | 466 | patchdir = self.path |
|
467 | 467 | err = 0 |
|
468 | 468 | n = None |
|
469 | 469 | for patchname in series: |
|
470 | 470 | pushable, reason = self.pushable(patchname) |
|
471 | 471 | if not pushable: |
|
472 | 472 | self.explain_pushable(patchname, all_patches=True) |
|
473 | 473 | continue |
|
474 | 474 | self.ui.warn(_("applying %s\n") % patchname) |
|
475 | 475 | pf = os.path.join(patchdir, patchname) |
|
476 | 476 | |
|
477 | 477 | try: |
|
478 | 478 | message, comments, user, date, patchfound = self.readheaders(patchname) |
|
479 | 479 | except: |
|
480 | 480 | self.ui.warn(_("Unable to read %s\n") % patchname) |
|
481 | 481 | err = 1 |
|
482 | 482 | break |
|
483 | 483 | |
|
484 | 484 | if not message: |
|
485 | 485 | message = _("imported patch %s\n") % patchname |
|
486 | 486 | else: |
|
487 | 487 | if list: |
|
488 | 488 | message.append(_("\nimported patch %s") % patchname) |
|
489 | 489 | message = '\n'.join(message) |
|
490 | 490 | |
|
491 | 491 | (patcherr, files, fuzz) = self.patch(repo, pf) |
|
492 | 492 | all_files.update(files) |
|
493 | 493 | patcherr = not patcherr |
|
494 | 494 | |
|
495 | 495 | if merge and files: |
|
496 | 496 | # Mark as removed/merged and update dirstate parent info |
|
497 | 497 | removed = [] |
|
498 | 498 | merged = [] |
|
499 | 499 | for f in files: |
|
500 | 500 | if os.path.exists(repo.wjoin(f)): |
|
501 | 501 | merged.append(f) |
|
502 | 502 | else: |
|
503 | 503 | removed.append(f) |
|
504 | 504 | for f in removed: |
|
505 | 505 | repo.dirstate.remove(f) |
|
506 | 506 | for f in merged: |
|
507 | 507 | repo.dirstate.merge(f) |
|
508 | 508 | p1, p2 = repo.dirstate.parents() |
|
509 | 509 | repo.dirstate.setparents(p1, merge) |
|
510 | 510 | |
|
511 | 511 | files = patch.updatedir(self.ui, repo, files) |
|
512 | 512 | match = cmdutil.matchfiles(repo, files or []) |
|
513 | 513 | n = repo.commit(files, message, user, date, match=match, |
|
514 | 514 | force=True) |
|
515 | 515 | |
|
516 | 516 | if n == None: |
|
517 | 517 | raise util.Abort(_("repo commit failed")) |
|
518 | 518 | |
|
519 | 519 | if update_status: |
|
520 | 520 | self.applied.append(statusentry(revlog.hex(n), patchname)) |
|
521 | 521 | |
|
522 | 522 | if patcherr: |
|
523 | 523 | if not patchfound: |
|
524 | 524 | self.ui.warn(_("patch %s is empty\n") % patchname) |
|
525 | 525 | err = 0 |
|
526 | 526 | else: |
|
527 | 527 | self.ui.warn(_("patch failed, rejects left in working dir\n")) |
|
528 | 528 | err = 1 |
|
529 | 529 | break |
|
530 | 530 | |
|
531 | 531 | if fuzz and strict: |
|
532 | 532 | self.ui.warn(_("fuzz found when applying patch, stopping\n")) |
|
533 | 533 | err = 1 |
|
534 | 534 | break |
|
535 | 535 | return (err, n) |
|
536 | 536 | |
|
537 | 537 | def _clean_series(self, patches): |
|
538 | 538 | indices = util.sort([self.find_series(p) for p in patches]) |
|
539 | 539 | for i in indices[-1::-1]: |
|
540 | 540 | del self.full_series[i] |
|
541 | 541 | self.parse_series() |
|
542 | 542 | self.series_dirty = 1 |
|
543 | 543 | |
|
544 | 544 | def finish(self, repo, revs): |
|
545 | 545 | revs.sort() |
|
546 | 546 | firstrev = repo[self.applied[0].rev].rev() |
|
547 | 547 | appliedbase = 0 |
|
548 | 548 | patches = [] |
|
549 | 549 | for rev in util.sort(revs): |
|
550 | 550 | if rev < firstrev: |
|
551 | 551 | raise util.Abort(_('revision %d is not managed') % rev) |
|
552 | 552 | base = revlog.bin(self.applied[appliedbase].rev) |
|
553 | 553 | node = repo.changelog.node(rev) |
|
554 | 554 | if node != base: |
|
555 | 555 | raise util.Abort(_('cannot delete revision %d above ' |
|
556 | 556 | 'applied patches') % rev) |
|
557 | 557 | patches.append(self.applied[appliedbase].name) |
|
558 | 558 | appliedbase += 1 |
|
559 | 559 | |
|
560 | 560 | r = self.qrepo() |
|
561 | 561 | if r: |
|
562 | 562 | r.remove(patches, True) |
|
563 | 563 | else: |
|
564 | 564 | for p in patches: |
|
565 | 565 | os.unlink(self.join(p)) |
|
566 | 566 | |
|
567 | 567 | del self.applied[:appliedbase] |
|
568 | 568 | self.applied_dirty = 1 |
|
569 | 569 | self._clean_series(patches) |
|
570 | 570 | |
|
571 | 571 | def delete(self, repo, patches, opts): |
|
572 | 572 | if not patches and not opts.get('rev'): |
|
573 | 573 | raise util.Abort(_('qdelete requires at least one revision or ' |
|
574 | 574 | 'patch name')) |
|
575 | 575 | |
|
576 | 576 | realpatches = [] |
|
577 | 577 | for patch in patches: |
|
578 | 578 | patch = self.lookup(patch, strict=True) |
|
579 | 579 | info = self.isapplied(patch) |
|
580 | 580 | if info: |
|
581 | 581 | raise util.Abort(_("cannot delete applied patch %s") % patch) |
|
582 | 582 | if patch not in self.series: |
|
583 | 583 | raise util.Abort(_("patch %s not in series file") % patch) |
|
584 | 584 | realpatches.append(patch) |
|
585 | 585 | |
|
586 | 586 | appliedbase = 0 |
|
587 | 587 | if opts.get('rev'): |
|
588 | 588 | if not self.applied: |
|
589 | 589 | raise util.Abort(_('no patches applied')) |
|
590 | 590 | revs = cmdutil.revrange(repo, opts['rev']) |
|
591 | 591 | if len(revs) > 1 and revs[0] > revs[1]: |
|
592 | 592 | revs.reverse() |
|
593 | 593 | for rev in revs: |
|
594 | 594 | if appliedbase >= len(self.applied): |
|
595 | 595 | raise util.Abort(_("revision %d is not managed") % rev) |
|
596 | 596 | |
|
597 | 597 | base = revlog.bin(self.applied[appliedbase].rev) |
|
598 | 598 | node = repo.changelog.node(rev) |
|
599 | 599 | if node != base: |
|
600 | 600 | raise util.Abort(_("cannot delete revision %d above " |
|
601 | 601 | "applied patches") % rev) |
|
602 | 602 | realpatches.append(self.applied[appliedbase].name) |
|
603 | 603 | appliedbase += 1 |
|
604 | 604 | |
|
605 | 605 | if not opts.get('keep'): |
|
606 | 606 | r = self.qrepo() |
|
607 | 607 | if r: |
|
608 | 608 | r.remove(realpatches, True) |
|
609 | 609 | else: |
|
610 | 610 | for p in realpatches: |
|
611 | 611 | os.unlink(self.join(p)) |
|
612 | 612 | |
|
613 | 613 | if appliedbase: |
|
614 | 614 | del self.applied[:appliedbase] |
|
615 | 615 | self.applied_dirty = 1 |
|
616 | 616 | self._clean_series(realpatches) |
|
617 | 617 | |
|
618 | 618 | def check_toppatch(self, repo): |
|
619 | 619 | if len(self.applied) > 0: |
|
620 | 620 | top = revlog.bin(self.applied[-1].rev) |
|
621 | 621 | pp = repo.dirstate.parents() |
|
622 | 622 | if top not in pp: |
|
623 | 623 | raise util.Abort(_("working directory revision is not qtip")) |
|
624 | 624 | return top |
|
625 | 625 | return None |
|
626 | 626 | def check_localchanges(self, repo, force=False, refresh=True): |
|
627 | 627 | m, a, r, d = repo.status()[:4] |
|
628 | 628 | if m or a or r or d: |
|
629 | 629 | if not force: |
|
630 | 630 | if refresh: |
|
631 | 631 | raise util.Abort(_("local changes found, refresh first")) |
|
632 | 632 | else: |
|
633 | 633 | raise util.Abort(_("local changes found")) |
|
634 | 634 | return m, a, r, d |
|
635 | 635 | |
|
636 | 636 | _reserved = ('series', 'status', 'guards') |
|
637 | 637 | def check_reserved_name(self, name): |
|
638 | 638 | if (name in self._reserved or name.startswith('.hg') |
|
639 | 639 | or name.startswith('.mq')): |
|
640 | 640 | raise util.Abort(_('"%s" cannot be used as the name of a patch') |
|
641 | 641 | % name) |
|
642 | 642 | |
|
643 | 643 | def new(self, repo, patch, *pats, **opts): |
|
644 | 644 | """options: |
|
645 | 645 | msg: a string or a no-argument function returning a string |
|
646 | 646 | """ |
|
647 | 647 | msg = opts.get('msg') |
|
648 | 648 | force = opts.get('force') |
|
649 | 649 | user = opts.get('user') |
|
650 | 650 | date = opts.get('date') |
|
651 | 651 | if date: |
|
652 | 652 | date = util.parsedate(date) |
|
653 | 653 | self.check_reserved_name(patch) |
|
654 | 654 | if os.path.exists(self.join(patch)): |
|
655 | 655 | raise util.Abort(_('patch "%s" already exists') % patch) |
|
656 | 656 | if opts.get('include') or opts.get('exclude') or pats: |
|
657 | 657 | match = cmdutil.match(repo, pats, opts) |
|
658 | 658 | m, a, r, d = repo.status(match=match)[:4] |
|
659 | 659 | else: |
|
660 | 660 | m, a, r, d = self.check_localchanges(repo, force) |
|
661 | 661 | match = cmdutil.match(repo, m + a + r) |
|
662 | 662 | commitfiles = m + a + r |
|
663 | 663 | self.check_toppatch(repo) |
|
664 | 664 | wlock = repo.wlock() |
|
665 | 665 | try: |
|
666 | 666 | insert = self.full_series_end() |
|
667 | 667 | if callable(msg): |
|
668 | 668 | msg = msg() |
|
669 | 669 | commitmsg = msg and msg or ("[mq]: %s" % patch) |
|
670 | 670 | n = repo.commit(commitfiles, commitmsg, user, date, match=match, force=True) |
|
671 | 671 | if n == None: |
|
672 | 672 | raise util.Abort(_("repo commit failed")) |
|
673 | 673 | self.full_series[insert:insert] = [patch] |
|
674 | 674 | self.applied.append(statusentry(revlog.hex(n), patch)) |
|
675 | 675 | self.parse_series() |
|
676 | 676 | self.series_dirty = 1 |
|
677 | 677 | self.applied_dirty = 1 |
|
678 | 678 | p = self.opener(patch, "w") |
|
679 | 679 | if date: |
|
680 | 680 | p.write("# HG changeset patch\n") |
|
681 | 681 | if user: |
|
682 | 682 | p.write("# User " + user + "\n") |
|
683 | 683 | p.write("# Date %d %d\n" % date) |
|
684 | 684 | p.write("\n") |
|
685 | 685 | elif user: |
|
686 | 686 | p.write("From: " + user + "\n") |
|
687 | 687 | p.write("\n") |
|
688 | 688 | if msg: |
|
689 | 689 | msg = msg + "\n" |
|
690 | 690 | p.write(msg) |
|
691 | 691 | p.close() |
|
692 | 692 | wlock = None |
|
693 | 693 | r = self.qrepo() |
|
694 | 694 | if r: r.add([patch]) |
|
695 | 695 | if commitfiles: |
|
696 | 696 | self.refresh(repo, short=True, git=opts.get('git')) |
|
697 | 697 | self.removeundo(repo) |
|
698 | 698 | finally: |
|
699 | 699 | del wlock |
|
700 | 700 | |
|
701 | 701 | def strip(self, repo, rev, update=True, backup="all", force=None): |
|
702 | 702 | wlock = lock = None |
|
703 | 703 | try: |
|
704 | 704 | wlock = repo.wlock() |
|
705 | 705 | lock = repo.lock() |
|
706 | 706 | |
|
707 | 707 | if update: |
|
708 | 708 | self.check_localchanges(repo, force=force, refresh=False) |
|
709 | 709 | urev = self.qparents(repo, rev) |
|
710 | 710 | hg.clean(repo, urev) |
|
711 | 711 | repo.dirstate.write() |
|
712 | 712 | |
|
713 | 713 | self.removeundo(repo) |
|
714 | 714 | repair.strip(self.ui, repo, rev, backup) |
|
715 | 715 | # strip may have unbundled a set of backed up revisions after |
|
716 | 716 | # the actual strip |
|
717 | 717 | self.removeundo(repo) |
|
718 | 718 | finally: |
|
719 | 719 | del lock, wlock |
|
720 | 720 | |
|
721 | 721 | def isapplied(self, patch): |
|
722 | 722 | """returns (index, rev, patch)""" |
|
723 | 723 | for i in xrange(len(self.applied)): |
|
724 | 724 | a = self.applied[i] |
|
725 | 725 | if a.name == patch: |
|
726 | 726 | return (i, a.rev, a.name) |
|
727 | 727 | return None |
|
728 | 728 | |
|
729 | 729 | # if the exact patch name does not exist, we try a few |
|
730 | 730 | # variations. If strict is passed, we try only #1 |
|
731 | 731 | # |
|
732 | 732 | # 1) a number to indicate an offset in the series file |
|
733 | 733 | # 2) a unique substring of the patch name was given |
|
734 | 734 | # 3) patchname[-+]num to indicate an offset in the series file |
|
735 | 735 | def lookup(self, patch, strict=False): |
|
736 | 736 | patch = patch and str(patch) |
|
737 | 737 | |
|
738 | 738 | def partial_name(s): |
|
739 | 739 | if s in self.series: |
|
740 | 740 | return s |
|
741 | 741 | matches = [x for x in self.series if s in x] |
|
742 | 742 | if len(matches) > 1: |
|
743 | 743 | self.ui.warn(_('patch name "%s" is ambiguous:\n') % s) |
|
744 | 744 | for m in matches: |
|
745 | 745 | self.ui.warn(' %s\n' % m) |
|
746 | 746 | return None |
|
747 | 747 | if matches: |
|
748 | 748 | return matches[0] |
|
749 | 749 | if len(self.series) > 0 and len(self.applied) > 0: |
|
750 | 750 | if s == 'qtip': |
|
751 | 751 | return self.series[self.series_end(True)-1] |
|
752 | 752 | if s == 'qbase': |
|
753 | 753 | return self.series[0] |
|
754 | 754 | return None |
|
755 | 755 | if patch == None: |
|
756 | 756 | return None |
|
757 | 757 | |
|
758 | 758 | # we don't want to return a partial match until we make |
|
759 | 759 | # sure the file name passed in does not exist (checked below) |
|
760 | 760 | res = partial_name(patch) |
|
761 | 761 | if res and res == patch: |
|
762 | 762 | return res |
|
763 | 763 | |
|
764 | 764 | if not os.path.isfile(self.join(patch)): |
|
765 | 765 | try: |
|
766 | 766 | sno = int(patch) |
|
767 | 767 | except(ValueError, OverflowError): |
|
768 | 768 | pass |
|
769 | 769 | else: |
|
770 | 770 | if sno < len(self.series): |
|
771 | 771 | return self.series[sno] |
|
772 | 772 | if not strict: |
|
773 | 773 | # return any partial match made above |
|
774 | 774 | if res: |
|
775 | 775 | return res |
|
776 | 776 | minus = patch.rfind('-') |
|
777 | 777 | if minus >= 0: |
|
778 | 778 | res = partial_name(patch[:minus]) |
|
779 | 779 | if res: |
|
780 | 780 | i = self.series.index(res) |
|
781 | 781 | try: |
|
782 | 782 | off = int(patch[minus+1:] or 1) |
|
783 | 783 | except(ValueError, OverflowError): |
|
784 | 784 | pass |
|
785 | 785 | else: |
|
786 | 786 | if i - off >= 0: |
|
787 | 787 | return self.series[i - off] |
|
788 | 788 | plus = patch.rfind('+') |
|
789 | 789 | if plus >= 0: |
|
790 | 790 | res = partial_name(patch[:plus]) |
|
791 | 791 | if res: |
|
792 | 792 | i = self.series.index(res) |
|
793 | 793 | try: |
|
794 | 794 | off = int(patch[plus+1:] or 1) |
|
795 | 795 | except(ValueError, OverflowError): |
|
796 | 796 | pass |
|
797 | 797 | else: |
|
798 | 798 | if i + off < len(self.series): |
|
799 | 799 | return self.series[i + off] |
|
800 | 800 | raise util.Abort(_("patch %s not in series") % patch) |
|
801 | 801 | |
|
802 | 802 | def push(self, repo, patch=None, force=False, list=False, |
|
803 | 803 | mergeq=None): |
|
804 | 804 | wlock = repo.wlock() |
|
805 | 805 | if repo.dirstate.parents()[0] != repo.changelog.tip(): |
|
806 | 806 | self.ui.status(_("(working directory not at tip)\n")) |
|
807 | 807 | |
|
808 | 808 | try: |
|
809 | 809 | patch = self.lookup(patch) |
|
810 | 810 | # Suppose our series file is: A B C and the current 'top' |
|
811 | 811 | # patch is B. qpush C should be performed (moving forward) |
|
812 | 812 | # qpush B is a NOP (no change) qpush A is an error (can't |
|
813 | 813 | # go backwards with qpush) |
|
814 | 814 | if patch: |
|
815 | 815 | info = self.isapplied(patch) |
|
816 | 816 | if info: |
|
817 | 817 | if info[0] < len(self.applied) - 1: |
|
818 | 818 | raise util.Abort( |
|
819 | 819 | _("cannot push to a previous patch: %s") % patch) |
|
820 | 820 | if info[0] < len(self.series) - 1: |
|
821 | 821 | self.ui.warn( |
|
822 | 822 | _('qpush: %s is already at the top\n') % patch) |
|
823 | 823 | else: |
|
824 | 824 | self.ui.warn(_('all patches are currently applied\n')) |
|
825 | 825 | return |
|
826 | 826 | |
|
827 | 827 | # Following the above example, starting at 'top' of B: |
|
828 | 828 | # qpush should be performed (pushes C), but a subsequent |
|
829 | 829 | # qpush without an argument is an error (nothing to |
|
830 | 830 | # apply). This allows a loop of "...while hg qpush..." to |
|
831 | 831 | # work as it detects an error when done |
|
832 | 832 | if self.series_end() == len(self.series): |
|
833 | 833 | self.ui.warn(_('patch series already fully applied\n')) |
|
834 | 834 | return 1 |
|
835 | 835 | if not force: |
|
836 | 836 | self.check_localchanges(repo) |
|
837 | 837 | |
|
838 | 838 | self.applied_dirty = 1; |
|
839 | 839 | start = self.series_end() |
|
840 | 840 | if start > 0: |
|
841 | 841 | self.check_toppatch(repo) |
|
842 | 842 | if not patch: |
|
843 | 843 | patch = self.series[start] |
|
844 | 844 | end = start + 1 |
|
845 | 845 | else: |
|
846 | 846 | end = self.series.index(patch, start) + 1 |
|
847 | 847 | s = self.series[start:end] |
|
848 | 848 | all_files = {} |
|
849 | 849 | try: |
|
850 | 850 | if mergeq: |
|
851 | 851 | ret = self.mergepatch(repo, mergeq, s) |
|
852 | 852 | else: |
|
853 | 853 | ret = self.apply(repo, s, list, all_files=all_files) |
|
854 | 854 | except: |
|
855 | 855 | self.ui.warn(_('cleaning up working directory...')) |
|
856 | 856 | node = repo.dirstate.parents()[0] |
|
857 | 857 | hg.revert(repo, node, None) |
|
858 | 858 | unknown = repo.status(unknown=True)[4] |
|
859 | 859 | # only remove unknown files that we know we touched or |
|
860 | 860 | # created while patching |
|
861 | 861 | for f in unknown: |
|
862 | 862 | if f in all_files: |
|
863 | 863 | util.unlink(repo.wjoin(f)) |
|
864 | 864 | self.ui.warn(_('done\n')) |
|
865 | 865 | raise |
|
866 | 866 | top = self.applied[-1].name |
|
867 | 867 | if ret[0]: |
|
868 | 868 | self.ui.write( |
|
869 | 869 | "Errors during apply, please fix and refresh %s\n" % top) |
|
870 | 870 | else: |
|
871 | 871 | self.ui.write("Now at: %s\n" % top) |
|
872 | 872 | return ret[0] |
|
873 | 873 | finally: |
|
874 | 874 | del wlock |
|
875 | 875 | |
|
876 | 876 | def pop(self, repo, patch=None, force=False, update=True, all=False): |
|
877 | 877 | def getfile(f, rev, flags): |
|
878 | 878 | t = repo.file(f).read(rev) |
|
879 | 879 | repo.wwrite(f, t, flags) |
|
880 | 880 | |
|
881 | 881 | wlock = repo.wlock() |
|
882 | 882 | try: |
|
883 | 883 | if patch: |
|
884 | 884 | # index, rev, patch |
|
885 | 885 | info = self.isapplied(patch) |
|
886 | 886 | if not info: |
|
887 | 887 | patch = self.lookup(patch) |
|
888 | 888 | info = self.isapplied(patch) |
|
889 | 889 | if not info: |
|
890 | 890 | raise util.Abort(_("patch %s is not applied") % patch) |
|
891 | 891 | |
|
892 | 892 | if len(self.applied) == 0: |
|
893 | 893 | # Allow qpop -a to work repeatedly, |
|
894 | 894 | # but not qpop without an argument |
|
895 | 895 | self.ui.warn(_("no patches applied\n")) |
|
896 | 896 | return not all |
|
897 | 897 | |
|
898 | 898 | if not update: |
|
899 | 899 | parents = repo.dirstate.parents() |
|
900 | 900 | rr = [ revlog.bin(x.rev) for x in self.applied ] |
|
901 | 901 | for p in parents: |
|
902 | 902 | if p in rr: |
|
903 | 903 | self.ui.warn(_("qpop: forcing dirstate update\n")) |
|
904 | 904 | update = True |
|
905 | 905 | |
|
906 | 906 | if not force and update: |
|
907 | 907 | self.check_localchanges(repo) |
|
908 | 908 | |
|
909 | 909 | self.applied_dirty = 1; |
|
910 | 910 | end = len(self.applied) |
|
911 | 911 | if not patch: |
|
912 | 912 | if all: |
|
913 | 913 | popi = 0 |
|
914 | 914 | else: |
|
915 | 915 | popi = len(self.applied) - 1 |
|
916 | 916 | else: |
|
917 | 917 | popi = info[0] + 1 |
|
918 | 918 | if popi >= end: |
|
919 | 919 | self.ui.warn(_("qpop: %s is already at the top\n") % patch) |
|
920 | 920 | return |
|
921 | 921 | info = [ popi ] + [self.applied[popi].rev, self.applied[popi].name] |
|
922 | 922 | |
|
923 | 923 | start = info[0] |
|
924 | 924 | rev = revlog.bin(info[1]) |
|
925 | 925 | |
|
926 | 926 | if update: |
|
927 | 927 | top = self.check_toppatch(repo) |
|
928 | 928 | |
|
929 | 929 | if repo.changelog.heads(rev) != [revlog.bin(self.applied[-1].rev)]: |
|
930 | 930 | raise util.Abort(_("popping would remove a revision not " |
|
931 | 931 | "managed by this patch queue")) |
|
932 | 932 | |
|
933 | 933 | # we know there are no local changes, so we can make a simplified |
|
934 | 934 | # form of hg.update. |
|
935 | 935 | if update: |
|
936 | 936 | qp = self.qparents(repo, rev) |
|
937 | 937 | changes = repo.changelog.read(qp) |
|
938 | 938 | mmap = repo.manifest.read(changes[0]) |
|
939 | 939 | m, a, r, d = repo.status(qp, top)[:4] |
|
940 | 940 | if d: |
|
941 | 941 | raise util.Abort(_("deletions found between repo revs")) |
|
942 | 942 | for f in m: |
|
943 | 943 | getfile(f, mmap[f], mmap.flags(f)) |
|
944 | 944 | for f in r: |
|
945 | 945 | getfile(f, mmap[f], mmap.flags(f)) |
|
946 | 946 | for f in m + r: |
|
947 | 947 | repo.dirstate.normal(f) |
|
948 | 948 | for f in a: |
|
949 | 949 | try: |
|
950 | 950 | os.unlink(repo.wjoin(f)) |
|
951 | 951 | except OSError, e: |
|
952 | 952 | if e.errno != errno.ENOENT: |
|
953 | 953 | raise |
|
954 | 954 | try: os.removedirs(os.path.dirname(repo.wjoin(f))) |
|
955 | 955 | except: pass |
|
956 | 956 | repo.dirstate.forget(f) |
|
957 | 957 | repo.dirstate.setparents(qp, revlog.nullid) |
|
958 | 958 | del self.applied[start:end] |
|
959 | 959 | self.strip(repo, rev, update=False, backup='strip') |
|
960 | 960 | if len(self.applied): |
|
961 | 961 | self.ui.write(_("Now at: %s\n") % self.applied[-1].name) |
|
962 | 962 | else: |
|
963 | 963 | self.ui.write(_("Patch queue now empty\n")) |
|
964 | 964 | finally: |
|
965 | 965 | del wlock |
|
966 | 966 | |
|
967 | 967 | def diff(self, repo, pats, opts): |
|
968 | 968 | top = self.check_toppatch(repo) |
|
969 | 969 | if not top: |
|
970 | 970 | self.ui.write(_("No patches applied\n")) |
|
971 | 971 | return |
|
972 | 972 | qp = self.qparents(repo, top) |
|
973 | 973 | self._diffopts = patch.diffopts(self.ui, opts) |
|
974 | 974 | self.printdiff(repo, qp, files=pats, opts=opts) |
|
975 | 975 | |
|
976 | 976 | def refresh(self, repo, pats=None, **opts): |
|
977 | 977 | if len(self.applied) == 0: |
|
978 | 978 | self.ui.write(_("No patches applied\n")) |
|
979 | 979 | return 1 |
|
980 | 980 | newdate = opts.get('date') |
|
981 | 981 | if newdate: |
|
982 | 982 | newdate = '%d %d' % util.parsedate(newdate) |
|
983 | 983 | wlock = repo.wlock() |
|
984 | 984 | try: |
|
985 | 985 | self.check_toppatch(repo) |
|
986 | 986 | (top, patchfn) = (self.applied[-1].rev, self.applied[-1].name) |
|
987 | 987 | top = revlog.bin(top) |
|
988 | 988 | if repo.changelog.heads(top) != [top]: |
|
989 | 989 | raise util.Abort(_("cannot refresh a revision with children")) |
|
990 | 990 | cparents = repo.changelog.parents(top) |
|
991 | 991 | patchparent = self.qparents(repo, top) |
|
992 | 992 | message, comments, user, date, patchfound = self.readheaders(patchfn) |
|
993 | 993 | |
|
994 | 994 | patchf = self.opener(patchfn, 'r+') |
|
995 | 995 | |
|
996 | 996 | # if the patch was a git patch, refresh it as a git patch |
|
997 | 997 | for line in patchf: |
|
998 | 998 | if line.startswith('diff --git'): |
|
999 | 999 | self.diffopts().git = True |
|
1000 | 1000 | break |
|
1001 | 1001 | |
|
1002 | 1002 | msg = opts.get('msg', '').rstrip() |
|
1003 | 1003 | if msg and comments: |
|
1004 | 1004 | # Remove existing message, keeping the rest of the comments |
|
1005 | 1005 | # fields. |
|
1006 | 1006 | # If comments contains 'subject: ', message will prepend |
|
1007 | 1007 | # the field and a blank line. |
|
1008 | 1008 | if message: |
|
1009 | 1009 | subj = 'subject: ' + message[0].lower() |
|
1010 | 1010 | for i in xrange(len(comments)): |
|
1011 | 1011 | if subj == comments[i].lower(): |
|
1012 | 1012 | del comments[i] |
|
1013 | 1013 | message = message[2:] |
|
1014 | 1014 | break |
|
1015 | 1015 | ci = 0 |
|
1016 | 1016 | for mi in xrange(len(message)): |
|
1017 | 1017 | while message[mi] != comments[ci]: |
|
1018 | 1018 | ci += 1 |
|
1019 | 1019 | del comments[ci] |
|
1020 | 1020 | |
|
1021 | 1021 | def setheaderfield(comments, prefixes, new): |
|
1022 | 1022 | # Update all references to a field in the patch header. |
|
1023 | 1023 | # If none found, add it email style. |
|
1024 | 1024 | res = False |
|
1025 | 1025 | for prefix in prefixes: |
|
1026 | 1026 | for i in xrange(len(comments)): |
|
1027 | 1027 | if comments[i].startswith(prefix): |
|
1028 | 1028 | comments[i] = prefix + new |
|
1029 | 1029 | res = True |
|
1030 | 1030 | break |
|
1031 | 1031 | return res |
|
1032 | 1032 | |
|
1033 | 1033 | newuser = opts.get('user') |
|
1034 | 1034 | if newuser: |
|
1035 | 1035 | if not setheaderfield(comments, ['From: ', '# User '], newuser): |
|
1036 | 1036 | try: |
|
1037 | 1037 | patchheaderat = comments.index('# HG changeset patch') |
|
1038 | 1038 | comments.insert(patchheaderat + 1,'# User ' + newuser) |
|
1039 | 1039 | except ValueError: |
|
1040 | 1040 | comments = ['From: ' + newuser, ''] + comments |
|
1041 | 1041 | user = newuser |
|
1042 | 1042 | |
|
1043 | 1043 | if newdate: |
|
1044 | 1044 | if setheaderfield(comments, ['# Date '], newdate): |
|
1045 | 1045 | date = newdate |
|
1046 | 1046 | |
|
1047 | 1047 | if msg: |
|
1048 | 1048 | comments.append(msg) |
|
1049 | 1049 | |
|
1050 | 1050 | patchf.seek(0) |
|
1051 | 1051 | patchf.truncate() |
|
1052 | 1052 | |
|
1053 | 1053 | if comments: |
|
1054 | 1054 | comments = "\n".join(comments) + '\n\n' |
|
1055 | 1055 | patchf.write(comments) |
|
1056 | 1056 | |
|
1057 | 1057 | if opts.get('git'): |
|
1058 | 1058 | self.diffopts().git = True |
|
1059 | 1059 | matchfn = cmdutil.match(repo, pats, opts) |
|
1060 | 1060 | tip = repo.changelog.tip() |
|
1061 | 1061 | if top == tip: |
|
1062 | 1062 | # if the top of our patch queue is also the tip, there is an |
|
1063 | 1063 | # optimization here. We update the dirstate in place and strip |
|
1064 | 1064 | # off the tip commit. Then just commit the current directory |
|
1065 | 1065 | # tree. We can also send repo.commit the list of files |
|
1066 | 1066 | # changed to speed up the diff |
|
1067 | 1067 | # |
|
1068 | 1068 | # in short mode, we only diff the files included in the |
|
1069 | 1069 | # patch already |
|
1070 | 1070 | # |
|
1071 | 1071 | # this should really read: |
|
1072 | 1072 | # mm, dd, aa, aa2 = repo.status(tip, patchparent)[:4] |
|
1073 | 1073 | # but we do it backwards to take advantage of manifest/chlog |
|
1074 | 1074 | # caching against the next repo.status call |
|
1075 | 1075 | # |
|
1076 | 1076 | mm, aa, dd, aa2 = repo.status(patchparent, tip)[:4] |
|
1077 | 1077 | changes = repo.changelog.read(tip) |
|
1078 | 1078 | man = repo.manifest.read(changes[0]) |
|
1079 | 1079 | aaa = aa[:] |
|
1080 | 1080 | if opts.get('short'): |
|
1081 | 1081 | # if amending a patch, we always match already-in-patch files |
|
1082 | 1082 | match = cmdutil.matchfiles(repo, mm + aa + dd + matchfn.files()) |
|
1083 | 1083 | matchfn = match # FIXME: Why have two matchers if we only need one? |
|
1084 | 1084 | else: |
|
1085 | 1085 | match = cmdutil.matchall(repo) |
|
1086 | 1086 | m, a, r, d = repo.status(match=match)[:4] |
|
1087 | 1087 | |
|
1088 | 1088 | # we might end up with files that were added between |
|
1089 | 1089 | # tip and the dirstate parent, but then changed in the |
|
1090 | 1090 | # local dirstate. in this case, we want them to only |
|
1091 | 1091 | # show up in the added section |
|
1092 | 1092 | for x in m: |
|
1093 | 1093 | if x not in aa: |
|
1094 | 1094 | mm.append(x) |
|
1095 | 1095 | # we might end up with files added by the local dirstate that |
|
1096 | 1096 | # were deleted by the patch. In this case, they should only |
|
1097 | 1097 | # show up in the changed section. |
|
1098 | 1098 | for x in a: |
|
1099 | 1099 | if x in dd: |
|
1100 | 1100 | del dd[dd.index(x)] |
|
1101 | 1101 | mm.append(x) |
|
1102 | 1102 | else: |
|
1103 | 1103 | aa.append(x) |
|
1104 | 1104 | # make sure any files deleted in the local dirstate |
|
1105 | 1105 | # are not in the add or change column of the patch |
|
1106 | 1106 | forget = [] |
|
1107 | 1107 | for x in d + r: |
|
1108 | 1108 | if x in aa: |
|
1109 | 1109 | del aa[aa.index(x)] |
|
1110 | 1110 | forget.append(x) |
|
1111 | 1111 | continue |
|
1112 | 1112 | elif x in mm: |
|
1113 | 1113 | del mm[mm.index(x)] |
|
1114 | 1114 | dd.append(x) |
|
1115 | 1115 | |
|
1116 | 1116 | m = util.unique(mm) |
|
1117 | 1117 | r = util.unique(dd) |
|
1118 | 1118 | a = util.unique(aa) |
|
1119 | 1119 | c = [filter(matchfn, l) for l in (m, a, r)] |
|
1120 | 1120 | match = cmdutil.matchfiles(repo, util.unique(c[0] + c[1] + c[2])) |
|
1121 | 1121 | patch.diff(repo, patchparent, match=match, |
|
1122 | 1122 | fp=patchf, changes=c, opts=self.diffopts()) |
|
1123 | 1123 | patchf.close() |
|
1124 | 1124 | |
|
1125 | 1125 | repo.dirstate.setparents(*cparents) |
|
1126 | 1126 | copies = {} |
|
1127 | 1127 | for dst in a: |
|
1128 | 1128 | src = repo.dirstate.copied(dst) |
|
1129 | 1129 | if src is not None: |
|
1130 | 1130 | copies.setdefault(src, []).append(dst) |
|
1131 | 1131 | repo.dirstate.add(dst) |
|
1132 | 1132 | # remember the copies between patchparent and tip |
|
1133 | 1133 | # this may be slow, so don't do it if we're not tracking copies |
|
1134 | 1134 | if self.diffopts().git: |
|
1135 | 1135 | for dst in aaa: |
|
1136 | 1136 | f = repo.file(dst) |
|
1137 | 1137 | src = f.renamed(man[dst]) |
|
1138 | 1138 | if src: |
|
1139 | 1139 | copies.setdefault(src[0], []).extend(copies.get(dst, [])) |
|
1140 | 1140 | if dst in a: |
|
1141 | 1141 | copies[src[0]].append(dst) |
|
1142 | 1142 | # we can't copy a file created by the patch itself |
|
1143 | 1143 | if dst in copies: |
|
1144 | 1144 | del copies[dst] |
|
1145 | 1145 | for src, dsts in copies.iteritems(): |
|
1146 | 1146 | for dst in dsts: |
|
1147 | 1147 | repo.dirstate.copy(src, dst) |
|
1148 | 1148 | for f in r: |
|
1149 | 1149 | repo.dirstate.remove(f) |
|
1150 | 1150 | # if the patch excludes a modified file, mark that |
|
1151 | 1151 | # file with mtime=0 so status can see it. |
|
1152 | 1152 | mm = [] |
|
1153 | 1153 | for i in xrange(len(m)-1, -1, -1): |
|
1154 | 1154 | if not matchfn(m[i]): |
|
1155 | 1155 | mm.append(m[i]) |
|
1156 | 1156 | del m[i] |
|
1157 | 1157 | for f in m: |
|
1158 | 1158 | repo.dirstate.normal(f) |
|
1159 | 1159 | for f in mm: |
|
1160 | 1160 | repo.dirstate.normallookup(f) |
|
1161 | 1161 | for f in forget: |
|
1162 | 1162 | repo.dirstate.forget(f) |
|
1163 | 1163 | |
|
1164 | 1164 | if not msg: |
|
1165 | 1165 | if not message: |
|
1166 | 1166 | message = "[mq]: %s\n" % patchfn |
|
1167 | 1167 | else: |
|
1168 | 1168 | message = "\n".join(message) |
|
1169 | 1169 | else: |
|
1170 | 1170 | message = msg |
|
1171 | 1171 | |
|
1172 | 1172 | if not user: |
|
1173 | 1173 | user = changes[1] |
|
1174 | 1174 | |
|
1175 | 1175 | self.applied.pop() |
|
1176 | 1176 | self.applied_dirty = 1 |
|
1177 | 1177 | self.strip(repo, top, update=False, |
|
1178 | 1178 | backup='strip') |
|
1179 | 1179 | n = repo.commit(match.files(), message, user, date, match=match, |
|
1180 | 1180 | force=1) |
|
1181 | 1181 | self.applied.append(statusentry(revlog.hex(n), patchfn)) |
|
1182 | 1182 | self.removeundo(repo) |
|
1183 | 1183 | else: |
|
1184 | 1184 | self.printdiff(repo, patchparent, fp=patchf) |
|
1185 | 1185 | patchf.close() |
|
1186 | 1186 | added = repo.status()[1] |
|
1187 | 1187 | for a in added: |
|
1188 | 1188 | f = repo.wjoin(a) |
|
1189 | 1189 | try: |
|
1190 | 1190 | os.unlink(f) |
|
1191 | 1191 | except OSError, e: |
|
1192 | 1192 | if e.errno != errno.ENOENT: |
|
1193 | 1193 | raise |
|
1194 | 1194 | try: os.removedirs(os.path.dirname(f)) |
|
1195 | 1195 | except: pass |
|
1196 | 1196 | # forget the file copies in the dirstate |
|
1197 | 1197 | # push should readd the files later on |
|
1198 | 1198 | repo.dirstate.forget(a) |
|
1199 | 1199 | self.pop(repo, force=True) |
|
1200 | 1200 | self.push(repo, force=True) |
|
1201 | 1201 | finally: |
|
1202 | 1202 | del wlock |
|
1203 | 1203 | |
|
1204 | 1204 | def init(self, repo, create=False): |
|
1205 | 1205 | if not create and os.path.isdir(self.path): |
|
1206 | 1206 | raise util.Abort(_("patch queue directory already exists")) |
|
1207 | 1207 | try: |
|
1208 | 1208 | os.mkdir(self.path) |
|
1209 | 1209 | except OSError, inst: |
|
1210 | 1210 | if inst.errno != errno.EEXIST or not create: |
|
1211 | 1211 | raise |
|
1212 | 1212 | if create: |
|
1213 | 1213 | return self.qrepo(create=True) |
|
1214 | 1214 | |
|
1215 | 1215 | def unapplied(self, repo, patch=None): |
|
1216 | 1216 | if patch and patch not in self.series: |
|
1217 | 1217 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1218 | 1218 | if not patch: |
|
1219 | 1219 | start = self.series_end() |
|
1220 | 1220 | else: |
|
1221 | 1221 | start = self.series.index(patch) + 1 |
|
1222 | 1222 | unapplied = [] |
|
1223 | 1223 | for i in xrange(start, len(self.series)): |
|
1224 | 1224 | pushable, reason = self.pushable(i) |
|
1225 | 1225 | if pushable: |
|
1226 | 1226 | unapplied.append((i, self.series[i])) |
|
1227 | 1227 | self.explain_pushable(i) |
|
1228 | 1228 | return unapplied |
|
1229 | 1229 | |
|
1230 | 1230 | def qseries(self, repo, missing=None, start=0, length=None, status=None, |
|
1231 | 1231 | summary=False): |
|
1232 | 1232 | def displayname(patchname): |
|
1233 | 1233 | if summary: |
|
1234 | 1234 | msg = self.readheaders(patchname)[0] |
|
1235 | 1235 | msg = msg and ': ' + msg[0] or ': ' |
|
1236 | 1236 | else: |
|
1237 | 1237 | msg = '' |
|
1238 | 1238 | return '%s%s' % (patchname, msg) |
|
1239 | 1239 | |
|
1240 | 1240 | applied = dict.fromkeys([p.name for p in self.applied]) |
|
1241 | 1241 | if length is None: |
|
1242 | 1242 | length = len(self.series) - start |
|
1243 | 1243 | if not missing: |
|
1244 | 1244 | for i in xrange(start, start+length): |
|
1245 | 1245 | patch = self.series[i] |
|
1246 | 1246 | if patch in applied: |
|
1247 | 1247 | stat = 'A' |
|
1248 | 1248 | elif self.pushable(i)[0]: |
|
1249 | 1249 | stat = 'U' |
|
1250 | 1250 | else: |
|
1251 | 1251 | stat = 'G' |
|
1252 | 1252 | pfx = '' |
|
1253 | 1253 | if self.ui.verbose: |
|
1254 | 1254 | pfx = '%d %s ' % (i, stat) |
|
1255 | 1255 | elif status and status != stat: |
|
1256 | 1256 | continue |
|
1257 | 1257 | self.ui.write('%s%s\n' % (pfx, displayname(patch))) |
|
1258 | 1258 | else: |
|
1259 | 1259 | msng_list = [] |
|
1260 | 1260 | for root, dirs, files in os.walk(self.path): |
|
1261 | 1261 | d = root[len(self.path) + 1:] |
|
1262 | 1262 | for f in files: |
|
1263 | 1263 | fl = os.path.join(d, f) |
|
1264 | 1264 | if (fl not in self.series and |
|
1265 | 1265 | fl not in (self.status_path, self.series_path, |
|
1266 | 1266 | self.guards_path) |
|
1267 | 1267 | and not fl.startswith('.')): |
|
1268 | 1268 | msng_list.append(fl) |
|
1269 | 1269 | for x in util.sort(msng_list): |
|
1270 | 1270 | pfx = self.ui.verbose and ('D ') or '' |
|
1271 | 1271 | self.ui.write("%s%s\n" % (pfx, displayname(x))) |
|
1272 | 1272 | |
|
1273 | 1273 | def issaveline(self, l): |
|
1274 | 1274 | if l.name == '.hg.patches.save.line': |
|
1275 | 1275 | return True |
|
1276 | 1276 | |
|
1277 | 1277 | def qrepo(self, create=False): |
|
1278 | 1278 | if create or os.path.isdir(self.join(".hg")): |
|
1279 | 1279 | return hg.repository(self.ui, path=self.path, create=create) |
|
1280 | 1280 | |
|
1281 | 1281 | def restore(self, repo, rev, delete=None, qupdate=None): |
|
1282 | 1282 | c = repo.changelog.read(rev) |
|
1283 | 1283 | desc = c[4].strip() |
|
1284 | 1284 | lines = desc.splitlines() |
|
1285 | 1285 | i = 0 |
|
1286 | 1286 | datastart = None |
|
1287 | 1287 | series = [] |
|
1288 | 1288 | applied = [] |
|
1289 | 1289 | qpp = None |
|
1290 | 1290 | for i in xrange(0, len(lines)): |
|
1291 | 1291 | if lines[i] == 'Patch Data:': |
|
1292 | 1292 | datastart = i + 1 |
|
1293 | 1293 | elif lines[i].startswith('Dirstate:'): |
|
1294 | 1294 | l = lines[i].rstrip() |
|
1295 | 1295 | l = l[10:].split(' ') |
|
1296 | 1296 | qpp = [ bin(x) for x in l ] |
|
1297 | 1297 | elif datastart != None: |
|
1298 | 1298 | l = lines[i].rstrip() |
|
1299 | 1299 | se = statusentry(l) |
|
1300 | 1300 | file_ = se.name |
|
1301 | 1301 | if se.rev: |
|
1302 | 1302 | applied.append(se) |
|
1303 | 1303 | else: |
|
1304 | 1304 | series.append(file_) |
|
1305 | 1305 | if datastart == None: |
|
1306 | 1306 | self.ui.warn(_("No saved patch data found\n")) |
|
1307 | 1307 | return 1 |
|
1308 | 1308 | self.ui.warn(_("restoring status: %s\n") % lines[0]) |
|
1309 | 1309 | self.full_series = series |
|
1310 | 1310 | self.applied = applied |
|
1311 | 1311 | self.parse_series() |
|
1312 | 1312 | self.series_dirty = 1 |
|
1313 | 1313 | self.applied_dirty = 1 |
|
1314 | 1314 | heads = repo.changelog.heads() |
|
1315 | 1315 | if delete: |
|
1316 | 1316 | if rev not in heads: |
|
1317 | 1317 | self.ui.warn(_("save entry has children, leaving it alone\n")) |
|
1318 | 1318 | else: |
|
1319 | 1319 | self.ui.warn(_("removing save entry %s\n") % short(rev)) |
|
1320 | 1320 | pp = repo.dirstate.parents() |
|
1321 | 1321 | if rev in pp: |
|
1322 | 1322 | update = True |
|
1323 | 1323 | else: |
|
1324 | 1324 | update = False |
|
1325 | 1325 | self.strip(repo, rev, update=update, backup='strip') |
|
1326 | 1326 | if qpp: |
|
1327 | 1327 | self.ui.warn(_("saved queue repository parents: %s %s\n") % |
|
1328 | 1328 | (short(qpp[0]), short(qpp[1]))) |
|
1329 | 1329 | if qupdate: |
|
1330 | 1330 | self.ui.status(_("queue directory updating\n")) |
|
1331 | 1331 | r = self.qrepo() |
|
1332 | 1332 | if not r: |
|
1333 | 1333 | self.ui.warn(_("Unable to load queue repository\n")) |
|
1334 | 1334 | return 1 |
|
1335 | 1335 | hg.clean(r, qpp[0]) |
|
1336 | 1336 | |
|
1337 | 1337 | def save(self, repo, msg=None): |
|
1338 | 1338 | if len(self.applied) == 0: |
|
1339 | 1339 | self.ui.warn(_("save: no patches applied, exiting\n")) |
|
1340 | 1340 | return 1 |
|
1341 | 1341 | if self.issaveline(self.applied[-1]): |
|
1342 | 1342 | self.ui.warn(_("status is already saved\n")) |
|
1343 | 1343 | return 1 |
|
1344 | 1344 | |
|
1345 | 1345 | ar = [ ':' + x for x in self.full_series ] |
|
1346 | 1346 | if not msg: |
|
1347 | 1347 | msg = _("hg patches saved state") |
|
1348 | 1348 | else: |
|
1349 | 1349 | msg = "hg patches: " + msg.rstrip('\r\n') |
|
1350 | 1350 | r = self.qrepo() |
|
1351 | 1351 | if r: |
|
1352 | 1352 | pp = r.dirstate.parents() |
|
1353 | 1353 | msg += "\nDirstate: %s %s" % (hex(pp[0]), hex(pp[1])) |
|
1354 | 1354 | msg += "\n\nPatch Data:\n" |
|
1355 | 1355 | text = msg + "\n".join([str(x) for x in self.applied]) + '\n' + (ar and |
|
1356 | 1356 | "\n".join(ar) + '\n' or "") |
|
1357 | 1357 | n = repo.commit(None, text, user=None, force=1) |
|
1358 | 1358 | if not n: |
|
1359 | 1359 | self.ui.warn(_("repo commit failed\n")) |
|
1360 | 1360 | return 1 |
|
1361 | 1361 | self.applied.append(statusentry(revlog.hex(n),'.hg.patches.save.line')) |
|
1362 | 1362 | self.applied_dirty = 1 |
|
1363 | 1363 | self.removeundo(repo) |
|
1364 | 1364 | |
|
1365 | 1365 | def full_series_end(self): |
|
1366 | 1366 | if len(self.applied) > 0: |
|
1367 | 1367 | p = self.applied[-1].name |
|
1368 | 1368 | end = self.find_series(p) |
|
1369 | 1369 | if end == None: |
|
1370 | 1370 | return len(self.full_series) |
|
1371 | 1371 | return end + 1 |
|
1372 | 1372 | return 0 |
|
1373 | 1373 | |
|
1374 | 1374 | def series_end(self, all_patches=False): |
|
1375 | 1375 | """If all_patches is False, return the index of the next pushable patch |
|
1376 | 1376 | in the series, or the series length. If all_patches is True, return the |
|
1377 | 1377 | index of the first patch past the last applied one. |
|
1378 | 1378 | """ |
|
1379 | 1379 | end = 0 |
|
1380 | 1380 | def next(start): |
|
1381 | 1381 | if all_patches: |
|
1382 | 1382 | return start |
|
1383 | 1383 | i = start |
|
1384 | 1384 | while i < len(self.series): |
|
1385 | 1385 | p, reason = self.pushable(i) |
|
1386 | 1386 | if p: |
|
1387 | 1387 | break |
|
1388 | 1388 | self.explain_pushable(i) |
|
1389 | 1389 | i += 1 |
|
1390 | 1390 | return i |
|
1391 | 1391 | if len(self.applied) > 0: |
|
1392 | 1392 | p = self.applied[-1].name |
|
1393 | 1393 | try: |
|
1394 | 1394 | end = self.series.index(p) |
|
1395 | 1395 | except ValueError: |
|
1396 | 1396 | return 0 |
|
1397 | 1397 | return next(end + 1) |
|
1398 | 1398 | return next(end) |
|
1399 | 1399 | |
|
1400 | 1400 | def appliedname(self, index): |
|
1401 | 1401 | pname = self.applied[index].name |
|
1402 | 1402 | if not self.ui.verbose: |
|
1403 | 1403 | p = pname |
|
1404 | 1404 | else: |
|
1405 | 1405 | p = str(self.series.index(pname)) + " " + pname |
|
1406 | 1406 | return p |
|
1407 | 1407 | |
|
1408 | 1408 | def qimport(self, repo, files, patchname=None, rev=None, existing=None, |
|
1409 | 1409 | force=None, git=False): |
|
1410 | 1410 | def checkseries(patchname): |
|
1411 | 1411 | if patchname in self.series: |
|
1412 | 1412 | raise util.Abort(_('patch %s is already in the series file') |
|
1413 | 1413 | % patchname) |
|
1414 | 1414 | def checkfile(patchname): |
|
1415 | 1415 | if not force and os.path.exists(self.join(patchname)): |
|
1416 | 1416 | raise util.Abort(_('patch "%s" already exists') |
|
1417 | 1417 | % patchname) |
|
1418 | 1418 | |
|
1419 | 1419 | if rev: |
|
1420 | 1420 | if files: |
|
1421 | 1421 | raise util.Abort(_('option "-r" not valid when importing ' |
|
1422 | 1422 | 'files')) |
|
1423 | 1423 | rev = cmdutil.revrange(repo, rev) |
|
1424 | 1424 | rev.sort(lambda x, y: cmp(y, x)) |
|
1425 | 1425 | if (len(files) > 1 or len(rev) > 1) and patchname: |
|
1426 | 1426 | raise util.Abort(_('option "-n" not valid when importing multiple ' |
|
1427 | 1427 | 'patches')) |
|
1428 | 1428 | i = 0 |
|
1429 | 1429 | added = [] |
|
1430 | 1430 | if rev: |
|
1431 | 1431 | # If mq patches are applied, we can only import revisions |
|
1432 | 1432 | # that form a linear path to qbase. |
|
1433 | 1433 | # Otherwise, they should form a linear path to a head. |
|
1434 | 1434 | heads = repo.changelog.heads(repo.changelog.node(rev[-1])) |
|
1435 | 1435 | if len(heads) > 1: |
|
1436 | 1436 | raise util.Abort(_('revision %d is the root of more than one ' |
|
1437 | 1437 | 'branch') % rev[-1]) |
|
1438 | 1438 | if self.applied: |
|
1439 | 1439 | base = revlog.hex(repo.changelog.node(rev[0])) |
|
1440 | 1440 | if base in [n.rev for n in self.applied]: |
|
1441 | 1441 | raise util.Abort(_('revision %d is already managed') |
|
1442 | 1442 | % rev[0]) |
|
1443 | 1443 | if heads != [revlog.bin(self.applied[-1].rev)]: |
|
1444 | 1444 | raise util.Abort(_('revision %d is not the parent of ' |
|
1445 | 1445 | 'the queue') % rev[0]) |
|
1446 | 1446 | base = repo.changelog.rev(revlog.bin(self.applied[0].rev)) |
|
1447 | 1447 | lastparent = repo.changelog.parentrevs(base)[0] |
|
1448 | 1448 | else: |
|
1449 | 1449 | if heads != [repo.changelog.node(rev[0])]: |
|
1450 | 1450 | raise util.Abort(_('revision %d has unmanaged children') |
|
1451 | 1451 | % rev[0]) |
|
1452 | 1452 | lastparent = None |
|
1453 | 1453 | |
|
1454 | 1454 | if git: |
|
1455 | 1455 | self.diffopts().git = True |
|
1456 | 1456 | |
|
1457 | 1457 | for r in rev: |
|
1458 | 1458 | p1, p2 = repo.changelog.parentrevs(r) |
|
1459 | 1459 | n = repo.changelog.node(r) |
|
1460 | 1460 | if p2 != revlog.nullrev: |
|
1461 | 1461 | raise util.Abort(_('cannot import merge revision %d') % r) |
|
1462 | 1462 | if lastparent and lastparent != r: |
|
1463 | 1463 | raise util.Abort(_('revision %d is not the parent of %d') |
|
1464 | 1464 | % (r, lastparent)) |
|
1465 | 1465 | lastparent = p1 |
|
1466 | 1466 | |
|
1467 | 1467 | if not patchname: |
|
1468 | 1468 | patchname = normname('%d.diff' % r) |
|
1469 | 1469 | self.check_reserved_name(patchname) |
|
1470 | 1470 | checkseries(patchname) |
|
1471 | 1471 | checkfile(patchname) |
|
1472 | 1472 | self.full_series.insert(0, patchname) |
|
1473 | 1473 | |
|
1474 | 1474 | patchf = self.opener(patchname, "w") |
|
1475 | 1475 | patch.export(repo, [n], fp=patchf, opts=self.diffopts()) |
|
1476 | 1476 | patchf.close() |
|
1477 | 1477 | |
|
1478 | 1478 | se = statusentry(revlog.hex(n), patchname) |
|
1479 | 1479 | self.applied.insert(0, se) |
|
1480 | 1480 | |
|
1481 | 1481 | added.append(patchname) |
|
1482 | 1482 | patchname = None |
|
1483 | 1483 | self.parse_series() |
|
1484 | 1484 | self.applied_dirty = 1 |
|
1485 | 1485 | |
|
1486 | 1486 | for filename in files: |
|
1487 | 1487 | if existing: |
|
1488 | 1488 | if filename == '-': |
|
1489 | 1489 | raise util.Abort(_('-e is incompatible with import from -')) |
|
1490 | 1490 | if not patchname: |
|
1491 | 1491 | patchname = normname(filename) |
|
1492 | 1492 | self.check_reserved_name(patchname) |
|
1493 | 1493 | if not os.path.isfile(self.join(patchname)): |
|
1494 | 1494 | raise util.Abort(_("patch %s does not exist") % patchname) |
|
1495 | 1495 | else: |
|
1496 | 1496 | try: |
|
1497 | 1497 | if filename == '-': |
|
1498 | 1498 | if not patchname: |
|
1499 | 1499 | raise util.Abort(_('need --name to import a patch from -')) |
|
1500 | 1500 | text = sys.stdin.read() |
|
1501 | 1501 | else: |
|
1502 | if os.path.exists(filename): | |
|
1502 | 1503 | text = file(filename, 'rb').read() |
|
1504 | else: | |
|
1505 | text = urllib.urlopen(filename).read() | |
|
1503 | 1506 | except IOError: |
|
1504 | 1507 | raise util.Abort(_("unable to read %s") % filename) |
|
1505 | 1508 | if not patchname: |
|
1506 | 1509 | patchname = normname(os.path.basename(filename)) |
|
1507 | 1510 | self.check_reserved_name(patchname) |
|
1508 | 1511 | checkfile(patchname) |
|
1509 | 1512 | patchf = self.opener(patchname, "w") |
|
1510 | 1513 | patchf.write(text) |
|
1511 | 1514 | checkseries(patchname) |
|
1512 | 1515 | index = self.full_series_end() + i |
|
1513 | 1516 | self.full_series[index:index] = [patchname] |
|
1514 | 1517 | self.parse_series() |
|
1515 | 1518 | self.ui.warn("adding %s to series file\n" % patchname) |
|
1516 | 1519 | i += 1 |
|
1517 | 1520 | added.append(patchname) |
|
1518 | 1521 | patchname = None |
|
1519 | 1522 | self.series_dirty = 1 |
|
1520 | 1523 | qrepo = self.qrepo() |
|
1521 | 1524 | if qrepo: |
|
1522 | 1525 | qrepo.add(added) |
|
1523 | 1526 | |
|
1524 | 1527 | def delete(ui, repo, *patches, **opts): |
|
1525 | 1528 | """remove patches from queue |
|
1526 | 1529 | |
|
1527 | 1530 | The patches must not be applied, unless they are arguments to |
|
1528 | 1531 | the --rev parameter. At least one patch or revision is required. |
|
1529 | 1532 | |
|
1530 | 1533 | With --rev, mq will stop managing the named revisions (converting |
|
1531 | 1534 | them to regular mercurial changesets). The qfinish command should be |
|
1532 | 1535 | used as an alternative for qdel -r, as the latter option is deprecated. |
|
1533 | 1536 | |
|
1534 | 1537 | With --keep, the patch files are preserved in the patch directory.""" |
|
1535 | 1538 | q = repo.mq |
|
1536 | 1539 | q.delete(repo, patches, opts) |
|
1537 | 1540 | q.save_dirty() |
|
1538 | 1541 | return 0 |
|
1539 | 1542 | |
|
1540 | 1543 | def applied(ui, repo, patch=None, **opts): |
|
1541 | 1544 | """print the patches already applied""" |
|
1542 | 1545 | q = repo.mq |
|
1543 | 1546 | if patch: |
|
1544 | 1547 | if patch not in q.series: |
|
1545 | 1548 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1546 | 1549 | end = q.series.index(patch) + 1 |
|
1547 | 1550 | else: |
|
1548 | 1551 | end = q.series_end(True) |
|
1549 | 1552 | return q.qseries(repo, length=end, status='A', summary=opts.get('summary')) |
|
1550 | 1553 | |
|
1551 | 1554 | def unapplied(ui, repo, patch=None, **opts): |
|
1552 | 1555 | """print the patches not yet applied""" |
|
1553 | 1556 | q = repo.mq |
|
1554 | 1557 | if patch: |
|
1555 | 1558 | if patch not in q.series: |
|
1556 | 1559 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1557 | 1560 | start = q.series.index(patch) + 1 |
|
1558 | 1561 | else: |
|
1559 | 1562 | start = q.series_end(True) |
|
1560 | 1563 | q.qseries(repo, start=start, status='U', summary=opts.get('summary')) |
|
1561 | 1564 | |
|
1562 | 1565 | def qimport(ui, repo, *filename, **opts): |
|
1563 | 1566 | """import a patch |
|
1564 | 1567 | |
|
1565 | 1568 | The patch is inserted into the series after the last applied patch. |
|
1566 | 1569 | If no patches have been applied, qimport prepends the patch |
|
1567 | 1570 | to the series. |
|
1568 | 1571 | |
|
1569 | 1572 | The patch will have the same name as its source file unless you |
|
1570 | 1573 | give it a new one with --name. |
|
1571 | 1574 | |
|
1572 | 1575 | You can register an existing patch inside the patch directory |
|
1573 | 1576 | with the --existing flag. |
|
1574 | 1577 | |
|
1575 | 1578 | With --force, an existing patch of the same name will be overwritten. |
|
1576 | 1579 | |
|
1577 | 1580 | An existing changeset may be placed under mq control with --rev |
|
1578 | 1581 | (e.g. qimport --rev tip -n patch will place tip under mq control). |
|
1579 | 1582 | With --git, patches imported with --rev will use the git diff |
|
1580 | 1583 | format. |
|
1581 | 1584 | """ |
|
1582 | 1585 | q = repo.mq |
|
1583 | 1586 | q.qimport(repo, filename, patchname=opts['name'], |
|
1584 | 1587 | existing=opts['existing'], force=opts['force'], rev=opts['rev'], |
|
1585 | 1588 | git=opts['git']) |
|
1586 | 1589 | q.save_dirty() |
|
1587 | 1590 | return 0 |
|
1588 | 1591 | |
|
1589 | 1592 | def init(ui, repo, **opts): |
|
1590 | 1593 | """init a new queue repository |
|
1591 | 1594 | |
|
1592 | 1595 | The queue repository is unversioned by default. If -c is |
|
1593 | 1596 | specified, qinit will create a separate nested repository |
|
1594 | 1597 | for patches (qinit -c may also be run later to convert |
|
1595 | 1598 | an unversioned patch repository into a versioned one). |
|
1596 | 1599 | You can use qcommit to commit changes to this queue repository.""" |
|
1597 | 1600 | q = repo.mq |
|
1598 | 1601 | r = q.init(repo, create=opts['create_repo']) |
|
1599 | 1602 | q.save_dirty() |
|
1600 | 1603 | if r: |
|
1601 | 1604 | if not os.path.exists(r.wjoin('.hgignore')): |
|
1602 | 1605 | fp = r.wopener('.hgignore', 'w') |
|
1603 | 1606 | fp.write('^\\.hg\n') |
|
1604 | 1607 | fp.write('^\\.mq\n') |
|
1605 | 1608 | fp.write('syntax: glob\n') |
|
1606 | 1609 | fp.write('status\n') |
|
1607 | 1610 | fp.write('guards\n') |
|
1608 | 1611 | fp.close() |
|
1609 | 1612 | if not os.path.exists(r.wjoin('series')): |
|
1610 | 1613 | r.wopener('series', 'w').close() |
|
1611 | 1614 | r.add(['.hgignore', 'series']) |
|
1612 | 1615 | commands.add(ui, r) |
|
1613 | 1616 | return 0 |
|
1614 | 1617 | |
|
1615 | 1618 | def clone(ui, source, dest=None, **opts): |
|
1616 | 1619 | '''clone main and patch repository at same time |
|
1617 | 1620 | |
|
1618 | 1621 | If source is local, destination will have no patches applied. If |
|
1619 | 1622 | source is remote, this command can not check if patches are |
|
1620 | 1623 | applied in source, so cannot guarantee that patches are not |
|
1621 | 1624 | applied in destination. If you clone remote repository, be sure |
|
1622 | 1625 | before that it has no patches applied. |
|
1623 | 1626 | |
|
1624 | 1627 | Source patch repository is looked for in <src>/.hg/patches by |
|
1625 | 1628 | default. Use -p <url> to change. |
|
1626 | 1629 | |
|
1627 | 1630 | The patch directory must be a nested mercurial repository, as |
|
1628 | 1631 | would be created by qinit -c. |
|
1629 | 1632 | ''' |
|
1630 | 1633 | def patchdir(repo): |
|
1631 | 1634 | url = repo.url() |
|
1632 | 1635 | if url.endswith('/'): |
|
1633 | 1636 | url = url[:-1] |
|
1634 | 1637 | return url + '/.hg/patches' |
|
1635 | 1638 | cmdutil.setremoteconfig(ui, opts) |
|
1636 | 1639 | if dest is None: |
|
1637 | 1640 | dest = hg.defaultdest(source) |
|
1638 | 1641 | sr = hg.repository(ui, ui.expandpath(source)) |
|
1639 | 1642 | patchespath = opts['patches'] or patchdir(sr) |
|
1640 | 1643 | try: |
|
1641 | 1644 | pr = hg.repository(ui, patchespath) |
|
1642 | 1645 | except RepoError: |
|
1643 | 1646 | raise util.Abort(_('versioned patch repository not found' |
|
1644 | 1647 | ' (see qinit -c)')) |
|
1645 | 1648 | qbase, destrev = None, None |
|
1646 | 1649 | if sr.local(): |
|
1647 | 1650 | if sr.mq.applied: |
|
1648 | 1651 | qbase = revlog.bin(sr.mq.applied[0].rev) |
|
1649 | 1652 | if not hg.islocal(dest): |
|
1650 | 1653 | heads = dict.fromkeys(sr.heads()) |
|
1651 | 1654 | for h in sr.heads(qbase): |
|
1652 | 1655 | del heads[h] |
|
1653 | 1656 | destrev = heads.keys() |
|
1654 | 1657 | destrev.append(sr.changelog.parents(qbase)[0]) |
|
1655 | 1658 | elif sr.capable('lookup'): |
|
1656 | 1659 | try: |
|
1657 | 1660 | qbase = sr.lookup('qbase') |
|
1658 | 1661 | except RepoError: |
|
1659 | 1662 | pass |
|
1660 | 1663 | ui.note(_('cloning main repo\n')) |
|
1661 | 1664 | sr, dr = hg.clone(ui, sr.url(), dest, |
|
1662 | 1665 | pull=opts['pull'], |
|
1663 | 1666 | rev=destrev, |
|
1664 | 1667 | update=False, |
|
1665 | 1668 | stream=opts['uncompressed']) |
|
1666 | 1669 | ui.note(_('cloning patch repo\n')) |
|
1667 | 1670 | spr, dpr = hg.clone(ui, opts['patches'] or patchdir(sr), patchdir(dr), |
|
1668 | 1671 | pull=opts['pull'], update=not opts['noupdate'], |
|
1669 | 1672 | stream=opts['uncompressed']) |
|
1670 | 1673 | if dr.local(): |
|
1671 | 1674 | if qbase: |
|
1672 | 1675 | ui.note(_('stripping applied patches from destination repo\n')) |
|
1673 | 1676 | dr.mq.strip(dr, qbase, update=False, backup=None) |
|
1674 | 1677 | if not opts['noupdate']: |
|
1675 | 1678 | ui.note(_('updating destination repo\n')) |
|
1676 | 1679 | hg.update(dr, dr.changelog.tip()) |
|
1677 | 1680 | |
|
1678 | 1681 | def commit(ui, repo, *pats, **opts): |
|
1679 | 1682 | """commit changes in the queue repository""" |
|
1680 | 1683 | q = repo.mq |
|
1681 | 1684 | r = q.qrepo() |
|
1682 | 1685 | if not r: raise util.Abort('no queue repository') |
|
1683 | 1686 | commands.commit(r.ui, r, *pats, **opts) |
|
1684 | 1687 | |
|
1685 | 1688 | def series(ui, repo, **opts): |
|
1686 | 1689 | """print the entire series file""" |
|
1687 | 1690 | repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary']) |
|
1688 | 1691 | return 0 |
|
1689 | 1692 | |
|
1690 | 1693 | def top(ui, repo, **opts): |
|
1691 | 1694 | """print the name of the current patch""" |
|
1692 | 1695 | q = repo.mq |
|
1693 | 1696 | t = q.applied and q.series_end(True) or 0 |
|
1694 | 1697 | if t: |
|
1695 | 1698 | return q.qseries(repo, start=t-1, length=1, status='A', |
|
1696 | 1699 | summary=opts.get('summary')) |
|
1697 | 1700 | else: |
|
1698 | 1701 | ui.write("No patches applied\n") |
|
1699 | 1702 | return 1 |
|
1700 | 1703 | |
|
1701 | 1704 | def next(ui, repo, **opts): |
|
1702 | 1705 | """print the name of the next patch""" |
|
1703 | 1706 | q = repo.mq |
|
1704 | 1707 | end = q.series_end() |
|
1705 | 1708 | if end == len(q.series): |
|
1706 | 1709 | ui.write("All patches applied\n") |
|
1707 | 1710 | return 1 |
|
1708 | 1711 | return q.qseries(repo, start=end, length=1, summary=opts.get('summary')) |
|
1709 | 1712 | |
|
1710 | 1713 | def prev(ui, repo, **opts): |
|
1711 | 1714 | """print the name of the previous patch""" |
|
1712 | 1715 | q = repo.mq |
|
1713 | 1716 | l = len(q.applied) |
|
1714 | 1717 | if l == 1: |
|
1715 | 1718 | ui.write("Only one patch applied\n") |
|
1716 | 1719 | return 1 |
|
1717 | 1720 | if not l: |
|
1718 | 1721 | ui.write("No patches applied\n") |
|
1719 | 1722 | return 1 |
|
1720 | 1723 | return q.qseries(repo, start=l-2, length=1, status='A', |
|
1721 | 1724 | summary=opts.get('summary')) |
|
1722 | 1725 | |
|
1723 | 1726 | def setupheaderopts(ui, opts): |
|
1724 | 1727 | def do(opt,val): |
|
1725 | 1728 | if not opts[opt] and opts['current' + opt]: |
|
1726 | 1729 | opts[opt] = val |
|
1727 | 1730 | do('user', ui.username()) |
|
1728 | 1731 | do('date', "%d %d" % util.makedate()) |
|
1729 | 1732 | |
|
1730 | 1733 | def new(ui, repo, patch, *args, **opts): |
|
1731 | 1734 | """create a new patch |
|
1732 | 1735 | |
|
1733 | 1736 | qnew creates a new patch on top of the currently-applied patch |
|
1734 | 1737 | (if any). It will refuse to run if there are any outstanding |
|
1735 | 1738 | changes unless -f is specified, in which case the patch will |
|
1736 | 1739 | be initialised with them. You may also use -I, -X, and/or a list of |
|
1737 | 1740 | files after the patch name to add only changes to matching files |
|
1738 | 1741 | to the new patch, leaving the rest as uncommitted modifications. |
|
1739 | 1742 | |
|
1740 | 1743 | -e, -m or -l set the patch header as well as the commit message. |
|
1741 | 1744 | If none is specified, the patch header is empty and the |
|
1742 | 1745 | commit message is '[mq]: PATCH'""" |
|
1743 | 1746 | msg = cmdutil.logmessage(opts) |
|
1744 | 1747 | def getmsg(): return ui.edit(msg, ui.username()) |
|
1745 | 1748 | q = repo.mq |
|
1746 | 1749 | opts['msg'] = msg |
|
1747 | 1750 | if opts.get('edit'): |
|
1748 | 1751 | opts['msg'] = getmsg |
|
1749 | 1752 | else: |
|
1750 | 1753 | opts['msg'] = msg |
|
1751 | 1754 | setupheaderopts(ui, opts) |
|
1752 | 1755 | q.new(repo, patch, *args, **opts) |
|
1753 | 1756 | q.save_dirty() |
|
1754 | 1757 | return 0 |
|
1755 | 1758 | |
|
1756 | 1759 | def refresh(ui, repo, *pats, **opts): |
|
1757 | 1760 | """update the current patch |
|
1758 | 1761 | |
|
1759 | 1762 | If any file patterns are provided, the refreshed patch will contain only |
|
1760 | 1763 | the modifications that match those patterns; the remaining modifications |
|
1761 | 1764 | will remain in the working directory. |
|
1762 | 1765 | |
|
1763 | 1766 | If --short is specified, files currently included in the patch will |
|
1764 | 1767 | be refreshed just like matched files and remain in the patch. |
|
1765 | 1768 | |
|
1766 | 1769 | hg add/remove/copy/rename work as usual, though you might want to use |
|
1767 | 1770 | git-style patches (--git or [diff] git=1) to track copies and renames. |
|
1768 | 1771 | """ |
|
1769 | 1772 | q = repo.mq |
|
1770 | 1773 | message = cmdutil.logmessage(opts) |
|
1771 | 1774 | if opts['edit']: |
|
1772 | 1775 | if not q.applied: |
|
1773 | 1776 | ui.write(_("No patches applied\n")) |
|
1774 | 1777 | return 1 |
|
1775 | 1778 | if message: |
|
1776 | 1779 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
1777 | 1780 | patch = q.applied[-1].name |
|
1778 | 1781 | (message, comment, user, date, hasdiff) = q.readheaders(patch) |
|
1779 | 1782 | message = ui.edit('\n'.join(message), user or ui.username()) |
|
1780 | 1783 | setupheaderopts(ui, opts) |
|
1781 | 1784 | ret = q.refresh(repo, pats, msg=message, **opts) |
|
1782 | 1785 | q.save_dirty() |
|
1783 | 1786 | return ret |
|
1784 | 1787 | |
|
1785 | 1788 | def diff(ui, repo, *pats, **opts): |
|
1786 | 1789 | """diff of the current patch and subsequent modifications |
|
1787 | 1790 | |
|
1788 | 1791 | Shows a diff which includes the current patch as well as any changes which |
|
1789 | 1792 | have been made in the working directory since the last refresh (thus |
|
1790 | 1793 | showing what the current patch would become after a qrefresh). |
|
1791 | 1794 | |
|
1792 | 1795 | Use 'hg diff' if you only want to see the changes made since the last |
|
1793 | 1796 | qrefresh, or 'hg export qtip' if you want to see changes made by the |
|
1794 | 1797 | current patch without including changes made since the qrefresh. |
|
1795 | 1798 | """ |
|
1796 | 1799 | repo.mq.diff(repo, pats, opts) |
|
1797 | 1800 | return 0 |
|
1798 | 1801 | |
|
1799 | 1802 | def fold(ui, repo, *files, **opts): |
|
1800 | 1803 | """fold the named patches into the current patch |
|
1801 | 1804 | |
|
1802 | 1805 | Patches must not yet be applied. Each patch will be successively |
|
1803 | 1806 | applied to the current patch in the order given. If all the |
|
1804 | 1807 | patches apply successfully, the current patch will be refreshed |
|
1805 | 1808 | with the new cumulative patch, and the folded patches will |
|
1806 | 1809 | be deleted. With -k/--keep, the folded patch files will not |
|
1807 | 1810 | be removed afterwards. |
|
1808 | 1811 | |
|
1809 | 1812 | The header for each folded patch will be concatenated with |
|
1810 | 1813 | the current patch header, separated by a line of '* * *'.""" |
|
1811 | 1814 | |
|
1812 | 1815 | q = repo.mq |
|
1813 | 1816 | |
|
1814 | 1817 | if not files: |
|
1815 | 1818 | raise util.Abort(_('qfold requires at least one patch name')) |
|
1816 | 1819 | if not q.check_toppatch(repo): |
|
1817 | 1820 | raise util.Abort(_('No patches applied')) |
|
1818 | 1821 | |
|
1819 | 1822 | message = cmdutil.logmessage(opts) |
|
1820 | 1823 | if opts['edit']: |
|
1821 | 1824 | if message: |
|
1822 | 1825 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
1823 | 1826 | |
|
1824 | 1827 | parent = q.lookup('qtip') |
|
1825 | 1828 | patches = [] |
|
1826 | 1829 | messages = [] |
|
1827 | 1830 | for f in files: |
|
1828 | 1831 | p = q.lookup(f) |
|
1829 | 1832 | if p in patches or p == parent: |
|
1830 | 1833 | ui.warn(_('Skipping already folded patch %s') % p) |
|
1831 | 1834 | if q.isapplied(p): |
|
1832 | 1835 | raise util.Abort(_('qfold cannot fold already applied patch %s') % p) |
|
1833 | 1836 | patches.append(p) |
|
1834 | 1837 | |
|
1835 | 1838 | for p in patches: |
|
1836 | 1839 | if not message: |
|
1837 | 1840 | messages.append(q.readheaders(p)[0]) |
|
1838 | 1841 | pf = q.join(p) |
|
1839 | 1842 | (patchsuccess, files, fuzz) = q.patch(repo, pf) |
|
1840 | 1843 | if not patchsuccess: |
|
1841 | 1844 | raise util.Abort(_('Error folding patch %s') % p) |
|
1842 | 1845 | patch.updatedir(ui, repo, files) |
|
1843 | 1846 | |
|
1844 | 1847 | if not message: |
|
1845 | 1848 | message, comments, user = q.readheaders(parent)[0:3] |
|
1846 | 1849 | for msg in messages: |
|
1847 | 1850 | message.append('* * *') |
|
1848 | 1851 | message.extend(msg) |
|
1849 | 1852 | message = '\n'.join(message) |
|
1850 | 1853 | |
|
1851 | 1854 | if opts['edit']: |
|
1852 | 1855 | message = ui.edit(message, user or ui.username()) |
|
1853 | 1856 | |
|
1854 | 1857 | q.refresh(repo, msg=message) |
|
1855 | 1858 | q.delete(repo, patches, opts) |
|
1856 | 1859 | q.save_dirty() |
|
1857 | 1860 | |
|
1858 | 1861 | def goto(ui, repo, patch, **opts): |
|
1859 | 1862 | '''push or pop patches until named patch is at top of stack''' |
|
1860 | 1863 | q = repo.mq |
|
1861 | 1864 | patch = q.lookup(patch) |
|
1862 | 1865 | if q.isapplied(patch): |
|
1863 | 1866 | ret = q.pop(repo, patch, force=opts['force']) |
|
1864 | 1867 | else: |
|
1865 | 1868 | ret = q.push(repo, patch, force=opts['force']) |
|
1866 | 1869 | q.save_dirty() |
|
1867 | 1870 | return ret |
|
1868 | 1871 | |
|
1869 | 1872 | def guard(ui, repo, *args, **opts): |
|
1870 | 1873 | '''set or print guards for a patch |
|
1871 | 1874 | |
|
1872 | 1875 | Guards control whether a patch can be pushed. A patch with no |
|
1873 | 1876 | guards is always pushed. A patch with a positive guard ("+foo") is |
|
1874 | 1877 | pushed only if the qselect command has activated it. A patch with |
|
1875 | 1878 | a negative guard ("-foo") is never pushed if the qselect command |
|
1876 | 1879 | has activated it. |
|
1877 | 1880 | |
|
1878 | 1881 | With no arguments, print the currently active guards. |
|
1879 | 1882 | With arguments, set guards for the named patch. |
|
1880 | 1883 | |
|
1881 | 1884 | To set a negative guard "-foo" on topmost patch ("--" is needed so |
|
1882 | 1885 | hg will not interpret "-foo" as an option): |
|
1883 | 1886 | hg qguard -- -foo |
|
1884 | 1887 | |
|
1885 | 1888 | To set guards on another patch: |
|
1886 | 1889 | hg qguard other.patch +2.6.17 -stable |
|
1887 | 1890 | ''' |
|
1888 | 1891 | def status(idx): |
|
1889 | 1892 | guards = q.series_guards[idx] or ['unguarded'] |
|
1890 | 1893 | ui.write('%s: %s\n' % (q.series[idx], ' '.join(guards))) |
|
1891 | 1894 | q = repo.mq |
|
1892 | 1895 | patch = None |
|
1893 | 1896 | args = list(args) |
|
1894 | 1897 | if opts['list']: |
|
1895 | 1898 | if args or opts['none']: |
|
1896 | 1899 | raise util.Abort(_('cannot mix -l/--list with options or arguments')) |
|
1897 | 1900 | for i in xrange(len(q.series)): |
|
1898 | 1901 | status(i) |
|
1899 | 1902 | return |
|
1900 | 1903 | if not args or args[0][0:1] in '-+': |
|
1901 | 1904 | if not q.applied: |
|
1902 | 1905 | raise util.Abort(_('no patches applied')) |
|
1903 | 1906 | patch = q.applied[-1].name |
|
1904 | 1907 | if patch is None and args[0][0:1] not in '-+': |
|
1905 | 1908 | patch = args.pop(0) |
|
1906 | 1909 | if patch is None: |
|
1907 | 1910 | raise util.Abort(_('no patch to work with')) |
|
1908 | 1911 | if args or opts['none']: |
|
1909 | 1912 | idx = q.find_series(patch) |
|
1910 | 1913 | if idx is None: |
|
1911 | 1914 | raise util.Abort(_('no patch named %s') % patch) |
|
1912 | 1915 | q.set_guards(idx, args) |
|
1913 | 1916 | q.save_dirty() |
|
1914 | 1917 | else: |
|
1915 | 1918 | status(q.series.index(q.lookup(patch))) |
|
1916 | 1919 | |
|
1917 | 1920 | def header(ui, repo, patch=None): |
|
1918 | 1921 | """Print the header of the topmost or specified patch""" |
|
1919 | 1922 | q = repo.mq |
|
1920 | 1923 | |
|
1921 | 1924 | if patch: |
|
1922 | 1925 | patch = q.lookup(patch) |
|
1923 | 1926 | else: |
|
1924 | 1927 | if not q.applied: |
|
1925 | 1928 | ui.write('No patches applied\n') |
|
1926 | 1929 | return 1 |
|
1927 | 1930 | patch = q.lookup('qtip') |
|
1928 | 1931 | message = repo.mq.readheaders(patch)[0] |
|
1929 | 1932 | |
|
1930 | 1933 | ui.write('\n'.join(message) + '\n') |
|
1931 | 1934 | |
|
1932 | 1935 | def lastsavename(path): |
|
1933 | 1936 | (directory, base) = os.path.split(path) |
|
1934 | 1937 | names = os.listdir(directory) |
|
1935 | 1938 | namere = re.compile("%s.([0-9]+)" % base) |
|
1936 | 1939 | maxindex = None |
|
1937 | 1940 | maxname = None |
|
1938 | 1941 | for f in names: |
|
1939 | 1942 | m = namere.match(f) |
|
1940 | 1943 | if m: |
|
1941 | 1944 | index = int(m.group(1)) |
|
1942 | 1945 | if maxindex == None or index > maxindex: |
|
1943 | 1946 | maxindex = index |
|
1944 | 1947 | maxname = f |
|
1945 | 1948 | if maxname: |
|
1946 | 1949 | return (os.path.join(directory, maxname), maxindex) |
|
1947 | 1950 | return (None, None) |
|
1948 | 1951 | |
|
1949 | 1952 | def savename(path): |
|
1950 | 1953 | (last, index) = lastsavename(path) |
|
1951 | 1954 | if last is None: |
|
1952 | 1955 | index = 0 |
|
1953 | 1956 | newpath = path + ".%d" % (index + 1) |
|
1954 | 1957 | return newpath |
|
1955 | 1958 | |
|
1956 | 1959 | def push(ui, repo, patch=None, **opts): |
|
1957 | 1960 | """push the next patch onto the stack |
|
1958 | 1961 | |
|
1959 | 1962 | When --force is applied, all local changes in patched files will be lost. |
|
1960 | 1963 | """ |
|
1961 | 1964 | q = repo.mq |
|
1962 | 1965 | mergeq = None |
|
1963 | 1966 | |
|
1964 | 1967 | if opts['all']: |
|
1965 | 1968 | if not q.series: |
|
1966 | 1969 | ui.warn(_('no patches in series\n')) |
|
1967 | 1970 | return 0 |
|
1968 | 1971 | patch = q.series[-1] |
|
1969 | 1972 | if opts['merge']: |
|
1970 | 1973 | if opts['name']: |
|
1971 | 1974 | newpath = repo.join(opts['name']) |
|
1972 | 1975 | else: |
|
1973 | 1976 | newpath, i = lastsavename(q.path) |
|
1974 | 1977 | if not newpath: |
|
1975 | 1978 | ui.warn(_("no saved queues found, please use -n\n")) |
|
1976 | 1979 | return 1 |
|
1977 | 1980 | mergeq = queue(ui, repo.join(""), newpath) |
|
1978 | 1981 | ui.warn(_("merging with queue at: %s\n") % mergeq.path) |
|
1979 | 1982 | ret = q.push(repo, patch, force=opts['force'], list=opts['list'], |
|
1980 | 1983 | mergeq=mergeq) |
|
1981 | 1984 | return ret |
|
1982 | 1985 | |
|
1983 | 1986 | def pop(ui, repo, patch=None, **opts): |
|
1984 | 1987 | """pop the current patch off the stack |
|
1985 | 1988 | |
|
1986 | 1989 | By default, pops off the top of the patch stack. If given a patch name, |
|
1987 | 1990 | keeps popping off patches until the named patch is at the top of the stack. |
|
1988 | 1991 | """ |
|
1989 | 1992 | localupdate = True |
|
1990 | 1993 | if opts['name']: |
|
1991 | 1994 | q = queue(ui, repo.join(""), repo.join(opts['name'])) |
|
1992 | 1995 | ui.warn(_('using patch queue: %s\n') % q.path) |
|
1993 | 1996 | localupdate = False |
|
1994 | 1997 | else: |
|
1995 | 1998 | q = repo.mq |
|
1996 | 1999 | ret = q.pop(repo, patch, force=opts['force'], update=localupdate, |
|
1997 | 2000 | all=opts['all']) |
|
1998 | 2001 | q.save_dirty() |
|
1999 | 2002 | return ret |
|
2000 | 2003 | |
|
2001 | 2004 | def rename(ui, repo, patch, name=None, **opts): |
|
2002 | 2005 | """rename a patch |
|
2003 | 2006 | |
|
2004 | 2007 | With one argument, renames the current patch to PATCH1. |
|
2005 | 2008 | With two arguments, renames PATCH1 to PATCH2.""" |
|
2006 | 2009 | |
|
2007 | 2010 | q = repo.mq |
|
2008 | 2011 | |
|
2009 | 2012 | if not name: |
|
2010 | 2013 | name = patch |
|
2011 | 2014 | patch = None |
|
2012 | 2015 | |
|
2013 | 2016 | if patch: |
|
2014 | 2017 | patch = q.lookup(patch) |
|
2015 | 2018 | else: |
|
2016 | 2019 | if not q.applied: |
|
2017 | 2020 | ui.write(_('No patches applied\n')) |
|
2018 | 2021 | return |
|
2019 | 2022 | patch = q.lookup('qtip') |
|
2020 | 2023 | absdest = q.join(name) |
|
2021 | 2024 | if os.path.isdir(absdest): |
|
2022 | 2025 | name = normname(os.path.join(name, os.path.basename(patch))) |
|
2023 | 2026 | absdest = q.join(name) |
|
2024 | 2027 | if os.path.exists(absdest): |
|
2025 | 2028 | raise util.Abort(_('%s already exists') % absdest) |
|
2026 | 2029 | |
|
2027 | 2030 | if name in q.series: |
|
2028 | 2031 | raise util.Abort(_('A patch named %s already exists in the series file') % name) |
|
2029 | 2032 | |
|
2030 | 2033 | if ui.verbose: |
|
2031 | 2034 | ui.write('Renaming %s to %s\n' % (patch, name)) |
|
2032 | 2035 | i = q.find_series(patch) |
|
2033 | 2036 | guards = q.guard_re.findall(q.full_series[i]) |
|
2034 | 2037 | q.full_series[i] = name + ''.join([' #' + g for g in guards]) |
|
2035 | 2038 | q.parse_series() |
|
2036 | 2039 | q.series_dirty = 1 |
|
2037 | 2040 | |
|
2038 | 2041 | info = q.isapplied(patch) |
|
2039 | 2042 | if info: |
|
2040 | 2043 | q.applied[info[0]] = statusentry(info[1], name) |
|
2041 | 2044 | q.applied_dirty = 1 |
|
2042 | 2045 | |
|
2043 | 2046 | util.rename(q.join(patch), absdest) |
|
2044 | 2047 | r = q.qrepo() |
|
2045 | 2048 | if r: |
|
2046 | 2049 | wlock = r.wlock() |
|
2047 | 2050 | try: |
|
2048 | 2051 | if r.dirstate[patch] == 'a': |
|
2049 | 2052 | r.dirstate.forget(patch) |
|
2050 | 2053 | r.dirstate.add(name) |
|
2051 | 2054 | else: |
|
2052 | 2055 | if r.dirstate[name] == 'r': |
|
2053 | 2056 | r.undelete([name]) |
|
2054 | 2057 | r.copy(patch, name) |
|
2055 | 2058 | r.remove([patch], False) |
|
2056 | 2059 | finally: |
|
2057 | 2060 | del wlock |
|
2058 | 2061 | |
|
2059 | 2062 | q.save_dirty() |
|
2060 | 2063 | |
|
2061 | 2064 | def restore(ui, repo, rev, **opts): |
|
2062 | 2065 | """restore the queue state saved by a rev""" |
|
2063 | 2066 | rev = repo.lookup(rev) |
|
2064 | 2067 | q = repo.mq |
|
2065 | 2068 | q.restore(repo, rev, delete=opts['delete'], |
|
2066 | 2069 | qupdate=opts['update']) |
|
2067 | 2070 | q.save_dirty() |
|
2068 | 2071 | return 0 |
|
2069 | 2072 | |
|
2070 | 2073 | def save(ui, repo, **opts): |
|
2071 | 2074 | """save current queue state""" |
|
2072 | 2075 | q = repo.mq |
|
2073 | 2076 | message = cmdutil.logmessage(opts) |
|
2074 | 2077 | ret = q.save(repo, msg=message) |
|
2075 | 2078 | if ret: |
|
2076 | 2079 | return ret |
|
2077 | 2080 | q.save_dirty() |
|
2078 | 2081 | if opts['copy']: |
|
2079 | 2082 | path = q.path |
|
2080 | 2083 | if opts['name']: |
|
2081 | 2084 | newpath = os.path.join(q.basepath, opts['name']) |
|
2082 | 2085 | if os.path.exists(newpath): |
|
2083 | 2086 | if not os.path.isdir(newpath): |
|
2084 | 2087 | raise util.Abort(_('destination %s exists and is not ' |
|
2085 | 2088 | 'a directory') % newpath) |
|
2086 | 2089 | if not opts['force']: |
|
2087 | 2090 | raise util.Abort(_('destination %s exists, ' |
|
2088 | 2091 | 'use -f to force') % newpath) |
|
2089 | 2092 | else: |
|
2090 | 2093 | newpath = savename(path) |
|
2091 | 2094 | ui.warn(_("copy %s to %s\n") % (path, newpath)) |
|
2092 | 2095 | util.copyfiles(path, newpath) |
|
2093 | 2096 | if opts['empty']: |
|
2094 | 2097 | try: |
|
2095 | 2098 | os.unlink(q.join(q.status_path)) |
|
2096 | 2099 | except: |
|
2097 | 2100 | pass |
|
2098 | 2101 | return 0 |
|
2099 | 2102 | |
|
2100 | 2103 | def strip(ui, repo, rev, **opts): |
|
2101 | 2104 | """strip a revision and all its descendants from the repository |
|
2102 | 2105 | |
|
2103 | 2106 | If one of the working dir's parent revisions is stripped, the working |
|
2104 | 2107 | directory will be updated to the parent of the stripped revision. |
|
2105 | 2108 | """ |
|
2106 | 2109 | backup = 'all' |
|
2107 | 2110 | if opts['backup']: |
|
2108 | 2111 | backup = 'strip' |
|
2109 | 2112 | elif opts['nobackup']: |
|
2110 | 2113 | backup = 'none' |
|
2111 | 2114 | |
|
2112 | 2115 | rev = repo.lookup(rev) |
|
2113 | 2116 | p = repo.dirstate.parents() |
|
2114 | 2117 | cl = repo.changelog |
|
2115 | 2118 | update = True |
|
2116 | 2119 | if p[0] == revlog.nullid: |
|
2117 | 2120 | update = False |
|
2118 | 2121 | elif p[1] == revlog.nullid and rev != cl.ancestor(p[0], rev): |
|
2119 | 2122 | update = False |
|
2120 | 2123 | elif rev not in (cl.ancestor(p[0], rev), cl.ancestor(p[1], rev)): |
|
2121 | 2124 | update = False |
|
2122 | 2125 | |
|
2123 | 2126 | repo.mq.strip(repo, rev, backup=backup, update=update, force=opts['force']) |
|
2124 | 2127 | return 0 |
|
2125 | 2128 | |
|
2126 | 2129 | def select(ui, repo, *args, **opts): |
|
2127 | 2130 | '''set or print guarded patches to push |
|
2128 | 2131 | |
|
2129 | 2132 | Use the qguard command to set or print guards on patch, then use |
|
2130 | 2133 | qselect to tell mq which guards to use. A patch will be pushed if it |
|
2131 | 2134 | has no guards or any positive guards match the currently selected guard, |
|
2132 | 2135 | but will not be pushed if any negative guards match the current guard. |
|
2133 | 2136 | For example: |
|
2134 | 2137 | |
|
2135 | 2138 | qguard foo.patch -stable (negative guard) |
|
2136 | 2139 | qguard bar.patch +stable (positive guard) |
|
2137 | 2140 | qselect stable |
|
2138 | 2141 | |
|
2139 | 2142 | This activates the "stable" guard. mq will skip foo.patch (because |
|
2140 | 2143 | it has a negative match) but push bar.patch (because it |
|
2141 | 2144 | has a positive match). |
|
2142 | 2145 | |
|
2143 | 2146 | With no arguments, prints the currently active guards. |
|
2144 | 2147 | With one argument, sets the active guard. |
|
2145 | 2148 | |
|
2146 | 2149 | Use -n/--none to deactivate guards (no other arguments needed). |
|
2147 | 2150 | When no guards are active, patches with positive guards are skipped |
|
2148 | 2151 | and patches with negative guards are pushed. |
|
2149 | 2152 | |
|
2150 | 2153 | qselect can change the guards on applied patches. It does not pop |
|
2151 | 2154 | guarded patches by default. Use --pop to pop back to the last applied |
|
2152 | 2155 | patch that is not guarded. Use --reapply (which implies --pop) to push |
|
2153 | 2156 | back to the current patch afterwards, but skip guarded patches. |
|
2154 | 2157 | |
|
2155 | 2158 | Use -s/--series to print a list of all guards in the series file (no |
|
2156 | 2159 | other arguments needed). Use -v for more information.''' |
|
2157 | 2160 | |
|
2158 | 2161 | q = repo.mq |
|
2159 | 2162 | guards = q.active() |
|
2160 | 2163 | if args or opts['none']: |
|
2161 | 2164 | old_unapplied = q.unapplied(repo) |
|
2162 | 2165 | old_guarded = [i for i in xrange(len(q.applied)) if |
|
2163 | 2166 | not q.pushable(i)[0]] |
|
2164 | 2167 | q.set_active(args) |
|
2165 | 2168 | q.save_dirty() |
|
2166 | 2169 | if not args: |
|
2167 | 2170 | ui.status(_('guards deactivated\n')) |
|
2168 | 2171 | if not opts['pop'] and not opts['reapply']: |
|
2169 | 2172 | unapplied = q.unapplied(repo) |
|
2170 | 2173 | guarded = [i for i in xrange(len(q.applied)) |
|
2171 | 2174 | if not q.pushable(i)[0]] |
|
2172 | 2175 | if len(unapplied) != len(old_unapplied): |
|
2173 | 2176 | ui.status(_('number of unguarded, unapplied patches has ' |
|
2174 | 2177 | 'changed from %d to %d\n') % |
|
2175 | 2178 | (len(old_unapplied), len(unapplied))) |
|
2176 | 2179 | if len(guarded) != len(old_guarded): |
|
2177 | 2180 | ui.status(_('number of guarded, applied patches has changed ' |
|
2178 | 2181 | 'from %d to %d\n') % |
|
2179 | 2182 | (len(old_guarded), len(guarded))) |
|
2180 | 2183 | elif opts['series']: |
|
2181 | 2184 | guards = {} |
|
2182 | 2185 | noguards = 0 |
|
2183 | 2186 | for gs in q.series_guards: |
|
2184 | 2187 | if not gs: |
|
2185 | 2188 | noguards += 1 |
|
2186 | 2189 | for g in gs: |
|
2187 | 2190 | guards.setdefault(g, 0) |
|
2188 | 2191 | guards[g] += 1 |
|
2189 | 2192 | if ui.verbose: |
|
2190 | 2193 | guards['NONE'] = noguards |
|
2191 | 2194 | guards = guards.items() |
|
2192 | 2195 | guards.sort(lambda a, b: cmp(a[0][1:], b[0][1:])) |
|
2193 | 2196 | if guards: |
|
2194 | 2197 | ui.note(_('guards in series file:\n')) |
|
2195 | 2198 | for guard, count in guards: |
|
2196 | 2199 | ui.note('%2d ' % count) |
|
2197 | 2200 | ui.write(guard, '\n') |
|
2198 | 2201 | else: |
|
2199 | 2202 | ui.note(_('no guards in series file\n')) |
|
2200 | 2203 | else: |
|
2201 | 2204 | if guards: |
|
2202 | 2205 | ui.note(_('active guards:\n')) |
|
2203 | 2206 | for g in guards: |
|
2204 | 2207 | ui.write(g, '\n') |
|
2205 | 2208 | else: |
|
2206 | 2209 | ui.write(_('no active guards\n')) |
|
2207 | 2210 | reapply = opts['reapply'] and q.applied and q.appliedname(-1) |
|
2208 | 2211 | popped = False |
|
2209 | 2212 | if opts['pop'] or opts['reapply']: |
|
2210 | 2213 | for i in xrange(len(q.applied)): |
|
2211 | 2214 | pushable, reason = q.pushable(i) |
|
2212 | 2215 | if not pushable: |
|
2213 | 2216 | ui.status(_('popping guarded patches\n')) |
|
2214 | 2217 | popped = True |
|
2215 | 2218 | if i == 0: |
|
2216 | 2219 | q.pop(repo, all=True) |
|
2217 | 2220 | else: |
|
2218 | 2221 | q.pop(repo, i-1) |
|
2219 | 2222 | break |
|
2220 | 2223 | if popped: |
|
2221 | 2224 | try: |
|
2222 | 2225 | if reapply: |
|
2223 | 2226 | ui.status(_('reapplying unguarded patches\n')) |
|
2224 | 2227 | q.push(repo, reapply) |
|
2225 | 2228 | finally: |
|
2226 | 2229 | q.save_dirty() |
|
2227 | 2230 | |
|
2228 | 2231 | def finish(ui, repo, *revrange, **opts): |
|
2229 | 2232 | """move applied patches into repository history |
|
2230 | 2233 | |
|
2231 | 2234 | Finishes the specified revisions (corresponding to applied patches) by |
|
2232 | 2235 | moving them out of mq control into regular repository history. |
|
2233 | 2236 | |
|
2234 | 2237 | Accepts a revision range or the --applied option. If --applied is |
|
2235 | 2238 | specified, all applied mq revisions are removed from mq control. |
|
2236 | 2239 | Otherwise, the given revisions must be at the base of the stack of |
|
2237 | 2240 | applied patches. |
|
2238 | 2241 | |
|
2239 | 2242 | This can be especially useful if your changes have been applied to an |
|
2240 | 2243 | upstream repository, or if you are about to push your changes to upstream. |
|
2241 | 2244 | """ |
|
2242 | 2245 | if not opts['applied'] and not revrange: |
|
2243 | 2246 | raise util.Abort(_('no revisions specified')) |
|
2244 | 2247 | elif opts['applied']: |
|
2245 | 2248 | revrange = ('qbase:qtip',) + revrange |
|
2246 | 2249 | |
|
2247 | 2250 | q = repo.mq |
|
2248 | 2251 | if not q.applied: |
|
2249 | 2252 | ui.status(_('no patches applied\n')) |
|
2250 | 2253 | return 0 |
|
2251 | 2254 | |
|
2252 | 2255 | revs = cmdutil.revrange(repo, revrange) |
|
2253 | 2256 | q.finish(repo, revs) |
|
2254 | 2257 | q.save_dirty() |
|
2255 | 2258 | return 0 |
|
2256 | 2259 | |
|
2257 | 2260 | def reposetup(ui, repo): |
|
2258 | 2261 | class mqrepo(repo.__class__): |
|
2259 | 2262 | def abort_if_wdir_patched(self, errmsg, force=False): |
|
2260 | 2263 | if self.mq.applied and not force: |
|
2261 | 2264 | parent = revlog.hex(self.dirstate.parents()[0]) |
|
2262 | 2265 | if parent in [s.rev for s in self.mq.applied]: |
|
2263 | 2266 | raise util.Abort(errmsg) |
|
2264 | 2267 | |
|
2265 | 2268 | def commit(self, *args, **opts): |
|
2266 | 2269 | if len(args) >= 6: |
|
2267 | 2270 | force = args[5] |
|
2268 | 2271 | else: |
|
2269 | 2272 | force = opts.get('force') |
|
2270 | 2273 | self.abort_if_wdir_patched( |
|
2271 | 2274 | _('cannot commit over an applied mq patch'), |
|
2272 | 2275 | force) |
|
2273 | 2276 | |
|
2274 | 2277 | return super(mqrepo, self).commit(*args, **opts) |
|
2275 | 2278 | |
|
2276 | 2279 | def push(self, remote, force=False, revs=None): |
|
2277 | 2280 | if self.mq.applied and not force and not revs: |
|
2278 | 2281 | raise util.Abort(_('source has mq patches applied')) |
|
2279 | 2282 | return super(mqrepo, self).push(remote, force, revs) |
|
2280 | 2283 | |
|
2281 | 2284 | def tags(self): |
|
2282 | 2285 | if self.tagscache: |
|
2283 | 2286 | return self.tagscache |
|
2284 | 2287 | |
|
2285 | 2288 | tagscache = super(mqrepo, self).tags() |
|
2286 | 2289 | |
|
2287 | 2290 | q = self.mq |
|
2288 | 2291 | if not q.applied: |
|
2289 | 2292 | return tagscache |
|
2290 | 2293 | |
|
2291 | 2294 | mqtags = [(revlog.bin(patch.rev), patch.name) for patch in q.applied] |
|
2292 | 2295 | |
|
2293 | 2296 | if mqtags[-1][0] not in self.changelog.nodemap: |
|
2294 | 2297 | self.ui.warn(_('mq status file refers to unknown node %s\n') |
|
2295 | 2298 | % revlog.short(mqtags[-1][0])) |
|
2296 | 2299 | return tagscache |
|
2297 | 2300 | |
|
2298 | 2301 | mqtags.append((mqtags[-1][0], 'qtip')) |
|
2299 | 2302 | mqtags.append((mqtags[0][0], 'qbase')) |
|
2300 | 2303 | mqtags.append((self.changelog.parents(mqtags[0][0])[0], 'qparent')) |
|
2301 | 2304 | for patch in mqtags: |
|
2302 | 2305 | if patch[1] in tagscache: |
|
2303 | 2306 | self.ui.warn(_('Tag %s overrides mq patch of the same name\n') |
|
2304 | 2307 | % patch[1]) |
|
2305 | 2308 | else: |
|
2306 | 2309 | tagscache[patch[1]] = patch[0] |
|
2307 | 2310 | |
|
2308 | 2311 | return tagscache |
|
2309 | 2312 | |
|
2310 | 2313 | def _branchtags(self, partial, lrev): |
|
2311 | 2314 | q = self.mq |
|
2312 | 2315 | if not q.applied: |
|
2313 | 2316 | return super(mqrepo, self)._branchtags(partial, lrev) |
|
2314 | 2317 | |
|
2315 | 2318 | cl = self.changelog |
|
2316 | 2319 | qbasenode = revlog.bin(q.applied[0].rev) |
|
2317 | 2320 | if qbasenode not in cl.nodemap: |
|
2318 | 2321 | self.ui.warn(_('mq status file refers to unknown node %s\n') |
|
2319 | 2322 | % revlog.short(qbasenode)) |
|
2320 | 2323 | return super(mqrepo, self)._branchtags(partial, lrev) |
|
2321 | 2324 | |
|
2322 | 2325 | qbase = cl.rev(qbasenode) |
|
2323 | 2326 | start = lrev + 1 |
|
2324 | 2327 | if start < qbase: |
|
2325 | 2328 | # update the cache (excluding the patches) and save it |
|
2326 | 2329 | self._updatebranchcache(partial, lrev+1, qbase) |
|
2327 | 2330 | self._writebranchcache(partial, cl.node(qbase-1), qbase-1) |
|
2328 | 2331 | start = qbase |
|
2329 | 2332 | # if start = qbase, the cache is as updated as it should be. |
|
2330 | 2333 | # if start > qbase, the cache includes (part of) the patches. |
|
2331 | 2334 | # we might as well use it, but we won't save it. |
|
2332 | 2335 | |
|
2333 | 2336 | # update the cache up to the tip |
|
2334 | 2337 | self._updatebranchcache(partial, start, len(cl)) |
|
2335 | 2338 | |
|
2336 | 2339 | return partial |
|
2337 | 2340 | |
|
2338 | 2341 | if repo.local(): |
|
2339 | 2342 | repo.__class__ = mqrepo |
|
2340 | 2343 | repo.mq = queue(ui, repo.join("")) |
|
2341 | 2344 | |
|
2342 | 2345 | def uisetup(ui): |
|
2343 | 2346 | # override import to disallow importing over patch |
|
2344 | 2347 | importalias, importcmd = cmdutil.findcmd(ui, 'import', commands.table) |
|
2345 | 2348 | for alias, cmd in commands.table.iteritems(): |
|
2346 | 2349 | if cmd is importcmd: |
|
2347 | 2350 | importkey = alias |
|
2348 | 2351 | break |
|
2349 | 2352 | orig_import = importcmd[0] |
|
2350 | 2353 | def mqimport(ui, repo, patch1, *patches, **opts): |
|
2351 | 2354 | if hasattr(repo, 'abort_if_wdir_patched'): |
|
2352 | 2355 | repo.abort_if_wdir_patched(_('cannot import over an applied patch'), |
|
2353 | 2356 | opts.get('force')) |
|
2354 | 2357 | orig_import(ui, repo, patch1, *patches, **opts) |
|
2355 | 2358 | importcmd = list(importcmd) |
|
2356 | 2359 | importcmd[0] = mqimport |
|
2357 | 2360 | commands.table[importkey] = tuple(importcmd) |
|
2358 | 2361 | |
|
2359 | 2362 | seriesopts = [('s', 'summary', None, _('print first line of patch header'))] |
|
2360 | 2363 | |
|
2361 | 2364 | cmdtable = { |
|
2362 | 2365 | "qapplied": (applied, [] + seriesopts, _('hg qapplied [-s] [PATCH]')), |
|
2363 | 2366 | "qclone": |
|
2364 | 2367 | (clone, |
|
2365 | 2368 | [('', 'pull', None, _('use pull protocol to copy metadata')), |
|
2366 | 2369 | ('U', 'noupdate', None, _('do not update the new working directories')), |
|
2367 | 2370 | ('', 'uncompressed', None, |
|
2368 | 2371 | _('use uncompressed transfer (fast over LAN)')), |
|
2369 | 2372 | ('p', 'patches', '', _('location of source patch repo')), |
|
2370 | 2373 | ] + commands.remoteopts, |
|
2371 | 2374 | _('hg qclone [OPTION]... SOURCE [DEST]')), |
|
2372 | 2375 | "qcommit|qci": |
|
2373 | 2376 | (commit, |
|
2374 | 2377 | commands.table["^commit|ci"][1], |
|
2375 | 2378 | _('hg qcommit [OPTION]... [FILE]...')), |
|
2376 | 2379 | "^qdiff": |
|
2377 | 2380 | (diff, |
|
2378 | 2381 | commands.diffopts + commands.diffopts2 + commands.walkopts, |
|
2379 | 2382 | _('hg qdiff [OPTION]... [FILE]...')), |
|
2380 | 2383 | "qdelete|qremove|qrm": |
|
2381 | 2384 | (delete, |
|
2382 | 2385 | [('k', 'keep', None, _('keep patch file')), |
|
2383 | 2386 | ('r', 'rev', [], _('stop managing a revision'))], |
|
2384 | 2387 | _('hg qdelete [-k] [-r REV]... [PATCH]...')), |
|
2385 | 2388 | 'qfold': |
|
2386 | 2389 | (fold, |
|
2387 | 2390 | [('e', 'edit', None, _('edit patch header')), |
|
2388 | 2391 | ('k', 'keep', None, _('keep folded patch files')), |
|
2389 | 2392 | ] + commands.commitopts, |
|
2390 | 2393 | _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')), |
|
2391 | 2394 | 'qgoto': |
|
2392 | 2395 | (goto, |
|
2393 | 2396 | [('f', 'force', None, _('overwrite any local changes'))], |
|
2394 | 2397 | _('hg qgoto [OPTION]... PATCH')), |
|
2395 | 2398 | 'qguard': |
|
2396 | 2399 | (guard, |
|
2397 | 2400 | [('l', 'list', None, _('list all patches and guards')), |
|
2398 | 2401 | ('n', 'none', None, _('drop all guards'))], |
|
2399 | 2402 | _('hg qguard [-l] [-n] [PATCH] [+GUARD]... [-GUARD]...')), |
|
2400 | 2403 | 'qheader': (header, [], _('hg qheader [PATCH]')), |
|
2401 | 2404 | "^qimport": |
|
2402 | 2405 | (qimport, |
|
2403 | 2406 | [('e', 'existing', None, _('import file in patch dir')), |
|
2404 | 2407 | ('n', 'name', '', _('patch file name')), |
|
2405 | 2408 | ('f', 'force', None, _('overwrite existing files')), |
|
2406 | 2409 | ('r', 'rev', [], _('place existing revisions under mq control')), |
|
2407 | 2410 | ('g', 'git', None, _('use git extended diff format'))], |
|
2408 | 2411 | _('hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE...')), |
|
2409 | 2412 | "^qinit": |
|
2410 | 2413 | (init, |
|
2411 | 2414 | [('c', 'create-repo', None, _('create queue repository'))], |
|
2412 | 2415 | _('hg qinit [-c]')), |
|
2413 | 2416 | "qnew": |
|
2414 | 2417 | (new, |
|
2415 | 2418 | [('e', 'edit', None, _('edit commit message')), |
|
2416 | 2419 | ('f', 'force', None, _('import uncommitted changes into patch')), |
|
2417 | 2420 | ('g', 'git', None, _('use git extended diff format')), |
|
2418 | 2421 | ('U', 'currentuser', None, _('add "From: <current user>" to patch')), |
|
2419 | 2422 | ('u', 'user', '', _('add "From: <given user>" to patch')), |
|
2420 | 2423 | ('D', 'currentdate', None, _('add "Date: <current date>" to patch')), |
|
2421 | 2424 | ('d', 'date', '', _('add "Date: <given date>" to patch')) |
|
2422 | 2425 | ] + commands.walkopts + commands.commitopts, |
|
2423 | 2426 | _('hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]...')), |
|
2424 | 2427 | "qnext": (next, [] + seriesopts, _('hg qnext [-s]')), |
|
2425 | 2428 | "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')), |
|
2426 | 2429 | "^qpop": |
|
2427 | 2430 | (pop, |
|
2428 | 2431 | [('a', 'all', None, _('pop all patches')), |
|
2429 | 2432 | ('n', 'name', '', _('queue name to pop')), |
|
2430 | 2433 | ('f', 'force', None, _('forget any local changes'))], |
|
2431 | 2434 | _('hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]')), |
|
2432 | 2435 | "^qpush": |
|
2433 | 2436 | (push, |
|
2434 | 2437 | [('f', 'force', None, _('apply if the patch has rejects')), |
|
2435 | 2438 | ('l', 'list', None, _('list patch name in commit text')), |
|
2436 | 2439 | ('a', 'all', None, _('apply all patches')), |
|
2437 | 2440 | ('m', 'merge', None, _('merge from another queue')), |
|
2438 | 2441 | ('n', 'name', '', _('merge queue name'))], |
|
2439 | 2442 | _('hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]')), |
|
2440 | 2443 | "^qrefresh": |
|
2441 | 2444 | (refresh, |
|
2442 | 2445 | [('e', 'edit', None, _('edit commit message')), |
|
2443 | 2446 | ('g', 'git', None, _('use git extended diff format')), |
|
2444 | 2447 | ('s', 'short', None, _('refresh only files already in the patch and specified files')), |
|
2445 | 2448 | ('U', 'currentuser', None, _('add/update "From: <current user>" in patch')), |
|
2446 | 2449 | ('u', 'user', '', _('add/update "From: <given user>" in patch')), |
|
2447 | 2450 | ('D', 'currentdate', None, _('update "Date: <current date>" in patch (if present)')), |
|
2448 | 2451 | ('d', 'date', '', _('update "Date: <given date>" in patch (if present)')) |
|
2449 | 2452 | ] + commands.walkopts + commands.commitopts, |
|
2450 | 2453 | _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')), |
|
2451 | 2454 | 'qrename|qmv': |
|
2452 | 2455 | (rename, [], _('hg qrename PATCH1 [PATCH2]')), |
|
2453 | 2456 | "qrestore": |
|
2454 | 2457 | (restore, |
|
2455 | 2458 | [('d', 'delete', None, _('delete save entry')), |
|
2456 | 2459 | ('u', 'update', None, _('update queue working dir'))], |
|
2457 | 2460 | _('hg qrestore [-d] [-u] REV')), |
|
2458 | 2461 | "qsave": |
|
2459 | 2462 | (save, |
|
2460 | 2463 | [('c', 'copy', None, _('copy patch directory')), |
|
2461 | 2464 | ('n', 'name', '', _('copy directory name')), |
|
2462 | 2465 | ('e', 'empty', None, _('clear queue status file')), |
|
2463 | 2466 | ('f', 'force', None, _('force copy'))] + commands.commitopts, |
|
2464 | 2467 | _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]')), |
|
2465 | 2468 | "qselect": |
|
2466 | 2469 | (select, |
|
2467 | 2470 | [('n', 'none', None, _('disable all guards')), |
|
2468 | 2471 | ('s', 'series', None, _('list all guards in series file')), |
|
2469 | 2472 | ('', 'pop', None, _('pop to before first guarded applied patch')), |
|
2470 | 2473 | ('', 'reapply', None, _('pop, then reapply patches'))], |
|
2471 | 2474 | _('hg qselect [OPTION]... [GUARD]...')), |
|
2472 | 2475 | "qseries": |
|
2473 | 2476 | (series, |
|
2474 | 2477 | [('m', 'missing', None, _('print patches not in series')), |
|
2475 | 2478 | ] + seriesopts, |
|
2476 | 2479 | _('hg qseries [-ms]')), |
|
2477 | 2480 | "^strip": |
|
2478 | 2481 | (strip, |
|
2479 | 2482 | [('f', 'force', None, _('force removal with local changes')), |
|
2480 | 2483 | ('b', 'backup', None, _('bundle unrelated changesets')), |
|
2481 | 2484 | ('n', 'nobackup', None, _('no backups'))], |
|
2482 | 2485 | _('hg strip [-f] [-b] [-n] REV')), |
|
2483 | 2486 | "qtop": (top, [] + seriesopts, _('hg qtop [-s]')), |
|
2484 | 2487 | "qunapplied": (unapplied, [] + seriesopts, _('hg qunapplied [-s] [PATCH]')), |
|
2485 | 2488 | "qfinish": |
|
2486 | 2489 | (finish, |
|
2487 | 2490 | [('a', 'applied', None, _('finish all applied changesets'))], |
|
2488 | 2491 | _('hg qfinish [-a] [REV...]')), |
|
2489 | 2492 | } |
@@ -1,40 +1,49 b'' | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | cat > writelines.py <<EOF |
|
4 | 4 | import sys |
|
5 | 5 | path = sys.argv[1] |
|
6 | 6 | args = sys.argv[2:] |
|
7 | 7 | assert (len(args) % 2) == 0 |
|
8 | 8 | |
|
9 | 9 | f = file(path, 'wb') |
|
10 | 10 | for i in xrange(len(args)/2): |
|
11 | 11 | count, s = args[2*i:2*i+2] |
|
12 | 12 | count = int(count) |
|
13 | 13 | s = s.decode('string_escape') |
|
14 | 14 | f.write(s*count) |
|
15 | 15 | f.close() |
|
16 | 16 | |
|
17 | 17 | EOF |
|
18 | 18 | |
|
19 | 19 | echo "[extensions]" >> $HGRCPATH |
|
20 | 20 | echo "mq=" >> $HGRCPATH |
|
21 | 21 | echo "[diff]" >> $HGRCPATH |
|
22 | 22 | echo "git=1" >> $HGRCPATH |
|
23 | 23 | |
|
24 | 24 | hg init repo |
|
25 | 25 | cd repo |
|
26 | 26 | |
|
27 | 27 | echo % qimport non-existing-file |
|
28 | 28 | hg qimport non-existing-file |
|
29 | 29 | |
|
30 | echo % import URL | |
|
31 | echo foo >> foo | |
|
32 | hg add foo | |
|
33 | hg diff > $HGTMP/url.diff | |
|
34 | hg revert --no-backup foo | |
|
35 | rm foo | |
|
36 | hg qimport file://$HGTMP/url.diff | |
|
37 | hg qun | |
|
38 | ||
|
30 | 39 | echo % build diff with CRLF |
|
31 | 40 | python ../writelines.py b 5 'a\n' 5 'a\r\n' |
|
32 | 41 | hg ci -Am addb |
|
33 | 42 | python ../writelines.py b 2 'a\n' 10 'b\n' 2 'a\r\n' |
|
34 | 43 | hg diff > b.diff |
|
35 | 44 | hg up -C |
|
36 | 45 | echo % qimport CRLF diff |
|
37 | 46 | hg qimport b.diff |
|
38 | 47 | hg qpush |
|
39 | 48 | |
|
40 | 49 |
@@ -1,9 +1,12 b'' | |||
|
1 | 1 | % qimport non-existing-file |
|
2 | 2 | abort: unable to read non-existing-file |
|
3 | % import URL | |
|
4 | adding url.diff to series file | |
|
5 | url.diff | |
|
3 | 6 | % build diff with CRLF |
|
4 | 7 | adding b |
|
5 | 8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6 | 9 | % qimport CRLF diff |
|
7 | 10 | adding b.diff to series file |
|
8 | 11 | applying b.diff |
|
9 | 12 | Now at: b.diff |
General Comments 0
You need to be logged in to leave comments.
Login now