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