##// END OF EJS Templates
py3: explicitly convert dict.values() to a list on py3...
Pulkit Goyal -
r32862:e4a43b81 default
parent child Browse files
Show More
@@ -1,3591 +1,3591
1 1 # cmdutil.py - help for command processing in mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.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 or any later version.
7 7
8 8 from __future__ import absolute_import
9 9
10 10 import errno
11 11 import itertools
12 12 import os
13 13 import re
14 14 import tempfile
15 15
16 16 from .i18n import _
17 17 from .node import (
18 18 hex,
19 19 nullid,
20 20 nullrev,
21 21 short,
22 22 )
23 23
24 24 from . import (
25 25 bookmarks,
26 26 changelog,
27 27 copies,
28 28 crecord as crecordmod,
29 29 encoding,
30 30 error,
31 31 formatter,
32 32 graphmod,
33 33 lock as lockmod,
34 34 match as matchmod,
35 35 obsolete,
36 36 patch,
37 37 pathutil,
38 38 phases,
39 39 pycompat,
40 40 registrar,
41 41 repair,
42 42 revlog,
43 43 revset,
44 44 scmutil,
45 45 smartset,
46 46 templatekw,
47 47 templater,
48 48 util,
49 49 vfs as vfsmod,
50 50 )
51 51 stringio = util.stringio
52 52
53 53 # templates of common command options
54 54
55 55 dryrunopts = [
56 56 ('n', 'dry-run', None,
57 57 _('do not perform actions, just print output')),
58 58 ]
59 59
60 60 remoteopts = [
61 61 ('e', 'ssh', '',
62 62 _('specify ssh command to use'), _('CMD')),
63 63 ('', 'remotecmd', '',
64 64 _('specify hg command to run on the remote side'), _('CMD')),
65 65 ('', 'insecure', None,
66 66 _('do not verify server certificate (ignoring web.cacerts config)')),
67 67 ]
68 68
69 69 walkopts = [
70 70 ('I', 'include', [],
71 71 _('include names matching the given patterns'), _('PATTERN')),
72 72 ('X', 'exclude', [],
73 73 _('exclude names matching the given patterns'), _('PATTERN')),
74 74 ]
75 75
76 76 commitopts = [
77 77 ('m', 'message', '',
78 78 _('use text as commit message'), _('TEXT')),
79 79 ('l', 'logfile', '',
80 80 _('read commit message from file'), _('FILE')),
81 81 ]
82 82
83 83 commitopts2 = [
84 84 ('d', 'date', '',
85 85 _('record the specified date as commit date'), _('DATE')),
86 86 ('u', 'user', '',
87 87 _('record the specified user as committer'), _('USER')),
88 88 ]
89 89
90 90 # hidden for now
91 91 formatteropts = [
92 92 ('T', 'template', '',
93 93 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
94 94 ]
95 95
96 96 templateopts = [
97 97 ('', 'style', '',
98 98 _('display using template map file (DEPRECATED)'), _('STYLE')),
99 99 ('T', 'template', '',
100 100 _('display with template'), _('TEMPLATE')),
101 101 ]
102 102
103 103 logopts = [
104 104 ('p', 'patch', None, _('show patch')),
105 105 ('g', 'git', None, _('use git extended diff format')),
106 106 ('l', 'limit', '',
107 107 _('limit number of changes displayed'), _('NUM')),
108 108 ('M', 'no-merges', None, _('do not show merges')),
109 109 ('', 'stat', None, _('output diffstat-style summary of changes')),
110 110 ('G', 'graph', None, _("show the revision DAG")),
111 111 ] + templateopts
112 112
113 113 diffopts = [
114 114 ('a', 'text', None, _('treat all files as text')),
115 115 ('g', 'git', None, _('use git extended diff format')),
116 116 ('', 'binary', None, _('generate binary diffs in git mode (default)')),
117 117 ('', 'nodates', None, _('omit dates from diff headers'))
118 118 ]
119 119
120 120 diffwsopts = [
121 121 ('w', 'ignore-all-space', None,
122 122 _('ignore white space when comparing lines')),
123 123 ('b', 'ignore-space-change', None,
124 124 _('ignore changes in the amount of white space')),
125 125 ('B', 'ignore-blank-lines', None,
126 126 _('ignore changes whose lines are all blank')),
127 127 ]
128 128
129 129 diffopts2 = [
130 130 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
131 131 ('p', 'show-function', None, _('show which function each change is in')),
132 132 ('', 'reverse', None, _('produce a diff that undoes the changes')),
133 133 ] + diffwsopts + [
134 134 ('U', 'unified', '',
135 135 _('number of lines of context to show'), _('NUM')),
136 136 ('', 'stat', None, _('output diffstat-style summary of changes')),
137 137 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
138 138 ]
139 139
140 140 mergetoolopts = [
141 141 ('t', 'tool', '', _('specify merge tool')),
142 142 ]
143 143
144 144 similarityopts = [
145 145 ('s', 'similarity', '',
146 146 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
147 147 ]
148 148
149 149 subrepoopts = [
150 150 ('S', 'subrepos', None,
151 151 _('recurse into subrepositories'))
152 152 ]
153 153
154 154 debugrevlogopts = [
155 155 ('c', 'changelog', False, _('open changelog')),
156 156 ('m', 'manifest', False, _('open manifest')),
157 157 ('', 'dir', '', _('open directory manifest')),
158 158 ]
159 159
160 160 # special string such that everything below this line will be ingored in the
161 161 # editor text
162 162 _linebelow = "^HG: ------------------------ >8 ------------------------$"
163 163
164 164 def ishunk(x):
165 165 hunkclasses = (crecordmod.uihunk, patch.recordhunk)
166 166 return isinstance(x, hunkclasses)
167 167
168 168 def newandmodified(chunks, originalchunks):
169 169 newlyaddedandmodifiedfiles = set()
170 170 for chunk in chunks:
171 171 if ishunk(chunk) and chunk.header.isnewfile() and chunk not in \
172 172 originalchunks:
173 173 newlyaddedandmodifiedfiles.add(chunk.header.filename())
174 174 return newlyaddedandmodifiedfiles
175 175
176 176 def parsealiases(cmd):
177 177 return cmd.lstrip("^").split("|")
178 178
179 179 def setupwrapcolorwrite(ui):
180 180 # wrap ui.write so diff output can be labeled/colorized
181 181 def wrapwrite(orig, *args, **kw):
182 182 label = kw.pop('label', '')
183 183 for chunk, l in patch.difflabel(lambda: args):
184 184 orig(chunk, label=label + l)
185 185
186 186 oldwrite = ui.write
187 187 def wrap(*args, **kwargs):
188 188 return wrapwrite(oldwrite, *args, **kwargs)
189 189 setattr(ui, 'write', wrap)
190 190 return oldwrite
191 191
192 192 def filterchunks(ui, originalhunks, usecurses, testfile, operation=None):
193 193 if usecurses:
194 194 if testfile:
195 195 recordfn = crecordmod.testdecorator(testfile,
196 196 crecordmod.testchunkselector)
197 197 else:
198 198 recordfn = crecordmod.chunkselector
199 199
200 200 return crecordmod.filterpatch(ui, originalhunks, recordfn, operation)
201 201
202 202 else:
203 203 return patch.filterpatch(ui, originalhunks, operation)
204 204
205 205 def recordfilter(ui, originalhunks, operation=None):
206 206 """ Prompts the user to filter the originalhunks and return a list of
207 207 selected hunks.
208 208 *operation* is used for to build ui messages to indicate the user what
209 209 kind of filtering they are doing: reverting, committing, shelving, etc.
210 210 (see patch.filterpatch).
211 211 """
212 212 usecurses = crecordmod.checkcurses(ui)
213 213 testfile = ui.config('experimental', 'crecordtest', None)
214 214 oldwrite = setupwrapcolorwrite(ui)
215 215 try:
216 216 newchunks, newopts = filterchunks(ui, originalhunks, usecurses,
217 217 testfile, operation)
218 218 finally:
219 219 ui.write = oldwrite
220 220 return newchunks, newopts
221 221
222 222 def dorecord(ui, repo, commitfunc, cmdsuggest, backupall,
223 223 filterfn, *pats, **opts):
224 224 from . import merge as mergemod
225 225 opts = pycompat.byteskwargs(opts)
226 226 if not ui.interactive():
227 227 if cmdsuggest:
228 228 msg = _('running non-interactively, use %s instead') % cmdsuggest
229 229 else:
230 230 msg = _('running non-interactively')
231 231 raise error.Abort(msg)
232 232
233 233 # make sure username is set before going interactive
234 234 if not opts.get('user'):
235 235 ui.username() # raise exception, username not provided
236 236
237 237 def recordfunc(ui, repo, message, match, opts):
238 238 """This is generic record driver.
239 239
240 240 Its job is to interactively filter local changes, and
241 241 accordingly prepare working directory into a state in which the
242 242 job can be delegated to a non-interactive commit command such as
243 243 'commit' or 'qrefresh'.
244 244
245 245 After the actual job is done by non-interactive command, the
246 246 working directory is restored to its original state.
247 247
248 248 In the end we'll record interesting changes, and everything else
249 249 will be left in place, so the user can continue working.
250 250 """
251 251
252 252 checkunfinished(repo, commit=True)
253 253 wctx = repo[None]
254 254 merge = len(wctx.parents()) > 1
255 255 if merge:
256 256 raise error.Abort(_('cannot partially commit a merge '
257 257 '(use "hg commit" instead)'))
258 258
259 259 def fail(f, msg):
260 260 raise error.Abort('%s: %s' % (f, msg))
261 261
262 262 force = opts.get('force')
263 263 if not force:
264 264 vdirs = []
265 265 match.explicitdir = vdirs.append
266 266 match.bad = fail
267 267
268 268 status = repo.status(match=match)
269 269 if not force:
270 270 repo.checkcommitpatterns(wctx, vdirs, match, status, fail)
271 271 diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
272 272 diffopts.nodates = True
273 273 diffopts.git = True
274 274 diffopts.showfunc = True
275 275 originaldiff = patch.diff(repo, changes=status, opts=diffopts)
276 276 originalchunks = patch.parsepatch(originaldiff)
277 277
278 278 # 1. filter patch, since we are intending to apply subset of it
279 279 try:
280 280 chunks, newopts = filterfn(ui, originalchunks)
281 281 except patch.PatchError as err:
282 282 raise error.Abort(_('error parsing patch: %s') % err)
283 283 opts.update(newopts)
284 284
285 285 # We need to keep a backup of files that have been newly added and
286 286 # modified during the recording process because there is a previous
287 287 # version without the edit in the workdir
288 288 newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks)
289 289 contenders = set()
290 290 for h in chunks:
291 291 try:
292 292 contenders.update(set(h.files()))
293 293 except AttributeError:
294 294 pass
295 295
296 296 changed = status.modified + status.added + status.removed
297 297 newfiles = [f for f in changed if f in contenders]
298 298 if not newfiles:
299 299 ui.status(_('no changes to record\n'))
300 300 return 0
301 301
302 302 modified = set(status.modified)
303 303
304 304 # 2. backup changed files, so we can restore them in the end
305 305
306 306 if backupall:
307 307 tobackup = changed
308 308 else:
309 309 tobackup = [f for f in newfiles if f in modified or f in \
310 310 newlyaddedandmodifiedfiles]
311 311 backups = {}
312 312 if tobackup:
313 313 backupdir = repo.vfs.join('record-backups')
314 314 try:
315 315 os.mkdir(backupdir)
316 316 except OSError as err:
317 317 if err.errno != errno.EEXIST:
318 318 raise
319 319 try:
320 320 # backup continues
321 321 for f in tobackup:
322 322 fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
323 323 dir=backupdir)
324 324 os.close(fd)
325 325 ui.debug('backup %r as %r\n' % (f, tmpname))
326 326 util.copyfile(repo.wjoin(f), tmpname, copystat=True)
327 327 backups[f] = tmpname
328 328
329 329 fp = stringio()
330 330 for c in chunks:
331 331 fname = c.filename()
332 332 if fname in backups:
333 333 c.write(fp)
334 334 dopatch = fp.tell()
335 335 fp.seek(0)
336 336
337 337 # 2.5 optionally review / modify patch in text editor
338 338 if opts.get('review', False):
339 339 patchtext = (crecordmod.diffhelptext
340 340 + crecordmod.patchhelptext
341 341 + fp.read())
342 342 reviewedpatch = ui.edit(patchtext, "",
343 343 extra={"suffix": ".diff"},
344 344 repopath=repo.path)
345 345 fp.truncate(0)
346 346 fp.write(reviewedpatch)
347 347 fp.seek(0)
348 348
349 349 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles]
350 350 # 3a. apply filtered patch to clean repo (clean)
351 351 if backups:
352 352 # Equivalent to hg.revert
353 353 m = scmutil.matchfiles(repo, backups.keys())
354 354 mergemod.update(repo, repo.dirstate.p1(),
355 355 False, True, matcher=m)
356 356
357 357 # 3b. (apply)
358 358 if dopatch:
359 359 try:
360 360 ui.debug('applying patch\n')
361 361 ui.debug(fp.getvalue())
362 362 patch.internalpatch(ui, repo, fp, 1, eolmode=None)
363 363 except patch.PatchError as err:
364 364 raise error.Abort(str(err))
365 365 del fp
366 366
367 367 # 4. We prepared working directory according to filtered
368 368 # patch. Now is the time to delegate the job to
369 369 # commit/qrefresh or the like!
370 370
371 371 # Make all of the pathnames absolute.
372 372 newfiles = [repo.wjoin(nf) for nf in newfiles]
373 373 return commitfunc(ui, repo, *newfiles, **opts)
374 374 finally:
375 375 # 5. finally restore backed-up files
376 376 try:
377 377 dirstate = repo.dirstate
378 378 for realname, tmpname in backups.iteritems():
379 379 ui.debug('restoring %r to %r\n' % (tmpname, realname))
380 380
381 381 if dirstate[realname] == 'n':
382 382 # without normallookup, restoring timestamp
383 383 # may cause partially committed files
384 384 # to be treated as unmodified
385 385 dirstate.normallookup(realname)
386 386
387 387 # copystat=True here and above are a hack to trick any
388 388 # editors that have f open that we haven't modified them.
389 389 #
390 390 # Also note that this racy as an editor could notice the
391 391 # file's mtime before we've finished writing it.
392 392 util.copyfile(tmpname, repo.wjoin(realname), copystat=True)
393 393 os.unlink(tmpname)
394 394 if tobackup:
395 395 os.rmdir(backupdir)
396 396 except OSError:
397 397 pass
398 398
399 399 def recordinwlock(ui, repo, message, match, opts):
400 400 with repo.wlock():
401 401 return recordfunc(ui, repo, message, match, opts)
402 402
403 403 return commit(ui, repo, recordinwlock, pats, opts)
404 404
405 405 def findpossible(cmd, table, strict=False):
406 406 """
407 407 Return cmd -> (aliases, command table entry)
408 408 for each matching command.
409 409 Return debug commands (or their aliases) only if no normal command matches.
410 410 """
411 411 choice = {}
412 412 debugchoice = {}
413 413
414 414 if cmd in table:
415 415 # short-circuit exact matches, "log" alias beats "^log|history"
416 416 keys = [cmd]
417 417 else:
418 418 keys = table.keys()
419 419
420 420 allcmds = []
421 421 for e in keys:
422 422 aliases = parsealiases(e)
423 423 allcmds.extend(aliases)
424 424 found = None
425 425 if cmd in aliases:
426 426 found = cmd
427 427 elif not strict:
428 428 for a in aliases:
429 429 if a.startswith(cmd):
430 430 found = a
431 431 break
432 432 if found is not None:
433 433 if aliases[0].startswith("debug") or found.startswith("debug"):
434 434 debugchoice[found] = (aliases, table[e])
435 435 else:
436 436 choice[found] = (aliases, table[e])
437 437
438 438 if not choice and debugchoice:
439 439 choice = debugchoice
440 440
441 441 return choice, allcmds
442 442
443 443 def findcmd(cmd, table, strict=True):
444 444 """Return (aliases, command table entry) for command string."""
445 445 choice, allcmds = findpossible(cmd, table, strict)
446 446
447 447 if cmd in choice:
448 448 return choice[cmd]
449 449
450 450 if len(choice) > 1:
451 451 clist = sorted(choice)
452 452 raise error.AmbiguousCommand(cmd, clist)
453 453
454 454 if choice:
455 return choice.values()[0]
455 return list(choice.values())[0]
456 456
457 457 raise error.UnknownCommand(cmd, allcmds)
458 458
459 459 def findrepo(p):
460 460 while not os.path.isdir(os.path.join(p, ".hg")):
461 461 oldp, p = p, os.path.dirname(p)
462 462 if p == oldp:
463 463 return None
464 464
465 465 return p
466 466
467 467 def bailifchanged(repo, merge=True, hint=None):
468 468 """ enforce the precondition that working directory must be clean.
469 469
470 470 'merge' can be set to false if a pending uncommitted merge should be
471 471 ignored (such as when 'update --check' runs).
472 472
473 473 'hint' is the usual hint given to Abort exception.
474 474 """
475 475
476 476 if merge and repo.dirstate.p2() != nullid:
477 477 raise error.Abort(_('outstanding uncommitted merge'), hint=hint)
478 478 modified, added, removed, deleted = repo.status()[:4]
479 479 if modified or added or removed or deleted:
480 480 raise error.Abort(_('uncommitted changes'), hint=hint)
481 481 ctx = repo[None]
482 482 for s in sorted(ctx.substate):
483 483 ctx.sub(s).bailifchanged(hint=hint)
484 484
485 485 def logmessage(ui, opts):
486 486 """ get the log message according to -m and -l option """
487 487 message = opts.get('message')
488 488 logfile = opts.get('logfile')
489 489
490 490 if message and logfile:
491 491 raise error.Abort(_('options --message and --logfile are mutually '
492 492 'exclusive'))
493 493 if not message and logfile:
494 494 try:
495 495 if isstdiofilename(logfile):
496 496 message = ui.fin.read()
497 497 else:
498 498 message = '\n'.join(util.readfile(logfile).splitlines())
499 499 except IOError as inst:
500 500 raise error.Abort(_("can't read commit message '%s': %s") %
501 501 (logfile, inst.strerror))
502 502 return message
503 503
504 504 def mergeeditform(ctxorbool, baseformname):
505 505 """return appropriate editform name (referencing a committemplate)
506 506
507 507 'ctxorbool' is either a ctx to be committed, or a bool indicating whether
508 508 merging is committed.
509 509
510 510 This returns baseformname with '.merge' appended if it is a merge,
511 511 otherwise '.normal' is appended.
512 512 """
513 513 if isinstance(ctxorbool, bool):
514 514 if ctxorbool:
515 515 return baseformname + ".merge"
516 516 elif 1 < len(ctxorbool.parents()):
517 517 return baseformname + ".merge"
518 518
519 519 return baseformname + ".normal"
520 520
521 521 def getcommiteditor(edit=False, finishdesc=None, extramsg=None,
522 522 editform='', **opts):
523 523 """get appropriate commit message editor according to '--edit' option
524 524
525 525 'finishdesc' is a function to be called with edited commit message
526 526 (= 'description' of the new changeset) just after editing, but
527 527 before checking empty-ness. It should return actual text to be
528 528 stored into history. This allows to change description before
529 529 storing.
530 530
531 531 'extramsg' is a extra message to be shown in the editor instead of
532 532 'Leave message empty to abort commit' line. 'HG: ' prefix and EOL
533 533 is automatically added.
534 534
535 535 'editform' is a dot-separated list of names, to distinguish
536 536 the purpose of commit text editing.
537 537
538 538 'getcommiteditor' returns 'commitforceeditor' regardless of
539 539 'edit', if one of 'finishdesc' or 'extramsg' is specified, because
540 540 they are specific for usage in MQ.
541 541 """
542 542 if edit or finishdesc or extramsg:
543 543 return lambda r, c, s: commitforceeditor(r, c, s,
544 544 finishdesc=finishdesc,
545 545 extramsg=extramsg,
546 546 editform=editform)
547 547 elif editform:
548 548 return lambda r, c, s: commiteditor(r, c, s, editform=editform)
549 549 else:
550 550 return commiteditor
551 551
552 552 def loglimit(opts):
553 553 """get the log limit according to option -l/--limit"""
554 554 limit = opts.get('limit')
555 555 if limit:
556 556 try:
557 557 limit = int(limit)
558 558 except ValueError:
559 559 raise error.Abort(_('limit must be a positive integer'))
560 560 if limit <= 0:
561 561 raise error.Abort(_('limit must be positive'))
562 562 else:
563 563 limit = None
564 564 return limit
565 565
566 566 def makefilename(repo, pat, node, desc=None,
567 567 total=None, seqno=None, revwidth=None, pathname=None):
568 568 node_expander = {
569 569 'H': lambda: hex(node),
570 570 'R': lambda: str(repo.changelog.rev(node)),
571 571 'h': lambda: short(node),
572 572 'm': lambda: re.sub('[^\w]', '_', str(desc))
573 573 }
574 574 expander = {
575 575 '%': lambda: '%',
576 576 'b': lambda: os.path.basename(repo.root),
577 577 }
578 578
579 579 try:
580 580 if node:
581 581 expander.update(node_expander)
582 582 if node:
583 583 expander['r'] = (lambda:
584 584 str(repo.changelog.rev(node)).zfill(revwidth or 0))
585 585 if total is not None:
586 586 expander['N'] = lambda: str(total)
587 587 if seqno is not None:
588 588 expander['n'] = lambda: str(seqno)
589 589 if total is not None and seqno is not None:
590 590 expander['n'] = lambda: str(seqno).zfill(len(str(total)))
591 591 if pathname is not None:
592 592 expander['s'] = lambda: os.path.basename(pathname)
593 593 expander['d'] = lambda: os.path.dirname(pathname) or '.'
594 594 expander['p'] = lambda: pathname
595 595
596 596 newname = []
597 597 patlen = len(pat)
598 598 i = 0
599 599 while i < patlen:
600 600 c = pat[i:i + 1]
601 601 if c == '%':
602 602 i += 1
603 603 c = pat[i:i + 1]
604 604 c = expander[c]()
605 605 newname.append(c)
606 606 i += 1
607 607 return ''.join(newname)
608 608 except KeyError as inst:
609 609 raise error.Abort(_("invalid format spec '%%%s' in output filename") %
610 610 inst.args[0])
611 611
612 612 def isstdiofilename(pat):
613 613 """True if the given pat looks like a filename denoting stdin/stdout"""
614 614 return not pat or pat == '-'
615 615
616 616 class _unclosablefile(object):
617 617 def __init__(self, fp):
618 618 self._fp = fp
619 619
620 620 def close(self):
621 621 pass
622 622
623 623 def __iter__(self):
624 624 return iter(self._fp)
625 625
626 626 def __getattr__(self, attr):
627 627 return getattr(self._fp, attr)
628 628
629 629 def __enter__(self):
630 630 return self
631 631
632 632 def __exit__(self, exc_type, exc_value, exc_tb):
633 633 pass
634 634
635 635 def makefileobj(repo, pat, node=None, desc=None, total=None,
636 636 seqno=None, revwidth=None, mode='wb', modemap=None,
637 637 pathname=None):
638 638
639 639 writable = mode not in ('r', 'rb')
640 640
641 641 if isstdiofilename(pat):
642 642 if writable:
643 643 fp = repo.ui.fout
644 644 else:
645 645 fp = repo.ui.fin
646 646 return _unclosablefile(fp)
647 647 fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname)
648 648 if modemap is not None:
649 649 mode = modemap.get(fn, mode)
650 650 if mode == 'wb':
651 651 modemap[fn] = 'ab'
652 652 return open(fn, mode)
653 653
654 654 def openrevlog(repo, cmd, file_, opts):
655 655 """opens the changelog, manifest, a filelog or a given revlog"""
656 656 cl = opts['changelog']
657 657 mf = opts['manifest']
658 658 dir = opts['dir']
659 659 msg = None
660 660 if cl and mf:
661 661 msg = _('cannot specify --changelog and --manifest at the same time')
662 662 elif cl and dir:
663 663 msg = _('cannot specify --changelog and --dir at the same time')
664 664 elif cl or mf or dir:
665 665 if file_:
666 666 msg = _('cannot specify filename with --changelog or --manifest')
667 667 elif not repo:
668 668 msg = _('cannot specify --changelog or --manifest or --dir '
669 669 'without a repository')
670 670 if msg:
671 671 raise error.Abort(msg)
672 672
673 673 r = None
674 674 if repo:
675 675 if cl:
676 676 r = repo.unfiltered().changelog
677 677 elif dir:
678 678 if 'treemanifest' not in repo.requirements:
679 679 raise error.Abort(_("--dir can only be used on repos with "
680 680 "treemanifest enabled"))
681 681 dirlog = repo.manifestlog._revlog.dirlog(dir)
682 682 if len(dirlog):
683 683 r = dirlog
684 684 elif mf:
685 685 r = repo.manifestlog._revlog
686 686 elif file_:
687 687 filelog = repo.file(file_)
688 688 if len(filelog):
689 689 r = filelog
690 690 if not r:
691 691 if not file_:
692 692 raise error.CommandError(cmd, _('invalid arguments'))
693 693 if not os.path.isfile(file_):
694 694 raise error.Abort(_("revlog '%s' not found") % file_)
695 695 r = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False),
696 696 file_[:-2] + ".i")
697 697 return r
698 698
699 699 def copy(ui, repo, pats, opts, rename=False):
700 700 # called with the repo lock held
701 701 #
702 702 # hgsep => pathname that uses "/" to separate directories
703 703 # ossep => pathname that uses os.sep to separate directories
704 704 cwd = repo.getcwd()
705 705 targets = {}
706 706 after = opts.get("after")
707 707 dryrun = opts.get("dry_run")
708 708 wctx = repo[None]
709 709
710 710 def walkpat(pat):
711 711 srcs = []
712 712 if after:
713 713 badstates = '?'
714 714 else:
715 715 badstates = '?r'
716 716 m = scmutil.match(wctx, [pat], opts, globbed=True)
717 717 for abs in wctx.walk(m):
718 718 state = repo.dirstate[abs]
719 719 rel = m.rel(abs)
720 720 exact = m.exact(abs)
721 721 if state in badstates:
722 722 if exact and state == '?':
723 723 ui.warn(_('%s: not copying - file is not managed\n') % rel)
724 724 if exact and state == 'r':
725 725 ui.warn(_('%s: not copying - file has been marked for'
726 726 ' remove\n') % rel)
727 727 continue
728 728 # abs: hgsep
729 729 # rel: ossep
730 730 srcs.append((abs, rel, exact))
731 731 return srcs
732 732
733 733 # abssrc: hgsep
734 734 # relsrc: ossep
735 735 # otarget: ossep
736 736 def copyfile(abssrc, relsrc, otarget, exact):
737 737 abstarget = pathutil.canonpath(repo.root, cwd, otarget)
738 738 if '/' in abstarget:
739 739 # We cannot normalize abstarget itself, this would prevent
740 740 # case only renames, like a => A.
741 741 abspath, absname = abstarget.rsplit('/', 1)
742 742 abstarget = repo.dirstate.normalize(abspath) + '/' + absname
743 743 reltarget = repo.pathto(abstarget, cwd)
744 744 target = repo.wjoin(abstarget)
745 745 src = repo.wjoin(abssrc)
746 746 state = repo.dirstate[abstarget]
747 747
748 748 scmutil.checkportable(ui, abstarget)
749 749
750 750 # check for collisions
751 751 prevsrc = targets.get(abstarget)
752 752 if prevsrc is not None:
753 753 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
754 754 (reltarget, repo.pathto(abssrc, cwd),
755 755 repo.pathto(prevsrc, cwd)))
756 756 return
757 757
758 758 # check for overwrites
759 759 exists = os.path.lexists(target)
760 760 samefile = False
761 761 if exists and abssrc != abstarget:
762 762 if (repo.dirstate.normalize(abssrc) ==
763 763 repo.dirstate.normalize(abstarget)):
764 764 if not rename:
765 765 ui.warn(_("%s: can't copy - same file\n") % reltarget)
766 766 return
767 767 exists = False
768 768 samefile = True
769 769
770 770 if not after and exists or after and state in 'mn':
771 771 if not opts['force']:
772 772 if state in 'mn':
773 773 msg = _('%s: not overwriting - file already committed\n')
774 774 if after:
775 775 flags = '--after --force'
776 776 else:
777 777 flags = '--force'
778 778 if rename:
779 779 hint = _('(hg rename %s to replace the file by '
780 780 'recording a rename)\n') % flags
781 781 else:
782 782 hint = _('(hg copy %s to replace the file by '
783 783 'recording a copy)\n') % flags
784 784 else:
785 785 msg = _('%s: not overwriting - file exists\n')
786 786 if rename:
787 787 hint = _('(hg rename --after to record the rename)\n')
788 788 else:
789 789 hint = _('(hg copy --after to record the copy)\n')
790 790 ui.warn(msg % reltarget)
791 791 ui.warn(hint)
792 792 return
793 793
794 794 if after:
795 795 if not exists:
796 796 if rename:
797 797 ui.warn(_('%s: not recording move - %s does not exist\n') %
798 798 (relsrc, reltarget))
799 799 else:
800 800 ui.warn(_('%s: not recording copy - %s does not exist\n') %
801 801 (relsrc, reltarget))
802 802 return
803 803 elif not dryrun:
804 804 try:
805 805 if exists:
806 806 os.unlink(target)
807 807 targetdir = os.path.dirname(target) or '.'
808 808 if not os.path.isdir(targetdir):
809 809 os.makedirs(targetdir)
810 810 if samefile:
811 811 tmp = target + "~hgrename"
812 812 os.rename(src, tmp)
813 813 os.rename(tmp, target)
814 814 else:
815 815 util.copyfile(src, target)
816 816 srcexists = True
817 817 except IOError as inst:
818 818 if inst.errno == errno.ENOENT:
819 819 ui.warn(_('%s: deleted in working directory\n') % relsrc)
820 820 srcexists = False
821 821 else:
822 822 ui.warn(_('%s: cannot copy - %s\n') %
823 823 (relsrc, inst.strerror))
824 824 return True # report a failure
825 825
826 826 if ui.verbose or not exact:
827 827 if rename:
828 828 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
829 829 else:
830 830 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
831 831
832 832 targets[abstarget] = abssrc
833 833
834 834 # fix up dirstate
835 835 scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget,
836 836 dryrun=dryrun, cwd=cwd)
837 837 if rename and not dryrun:
838 838 if not after and srcexists and not samefile:
839 839 repo.wvfs.unlinkpath(abssrc)
840 840 wctx.forget([abssrc])
841 841
842 842 # pat: ossep
843 843 # dest ossep
844 844 # srcs: list of (hgsep, hgsep, ossep, bool)
845 845 # return: function that takes hgsep and returns ossep
846 846 def targetpathfn(pat, dest, srcs):
847 847 if os.path.isdir(pat):
848 848 abspfx = pathutil.canonpath(repo.root, cwd, pat)
849 849 abspfx = util.localpath(abspfx)
850 850 if destdirexists:
851 851 striplen = len(os.path.split(abspfx)[0])
852 852 else:
853 853 striplen = len(abspfx)
854 854 if striplen:
855 855 striplen += len(pycompat.ossep)
856 856 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
857 857 elif destdirexists:
858 858 res = lambda p: os.path.join(dest,
859 859 os.path.basename(util.localpath(p)))
860 860 else:
861 861 res = lambda p: dest
862 862 return res
863 863
864 864 # pat: ossep
865 865 # dest ossep
866 866 # srcs: list of (hgsep, hgsep, ossep, bool)
867 867 # return: function that takes hgsep and returns ossep
868 868 def targetpathafterfn(pat, dest, srcs):
869 869 if matchmod.patkind(pat):
870 870 # a mercurial pattern
871 871 res = lambda p: os.path.join(dest,
872 872 os.path.basename(util.localpath(p)))
873 873 else:
874 874 abspfx = pathutil.canonpath(repo.root, cwd, pat)
875 875 if len(abspfx) < len(srcs[0][0]):
876 876 # A directory. Either the target path contains the last
877 877 # component of the source path or it does not.
878 878 def evalpath(striplen):
879 879 score = 0
880 880 for s in srcs:
881 881 t = os.path.join(dest, util.localpath(s[0])[striplen:])
882 882 if os.path.lexists(t):
883 883 score += 1
884 884 return score
885 885
886 886 abspfx = util.localpath(abspfx)
887 887 striplen = len(abspfx)
888 888 if striplen:
889 889 striplen += len(pycompat.ossep)
890 890 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
891 891 score = evalpath(striplen)
892 892 striplen1 = len(os.path.split(abspfx)[0])
893 893 if striplen1:
894 894 striplen1 += len(pycompat.ossep)
895 895 if evalpath(striplen1) > score:
896 896 striplen = striplen1
897 897 res = lambda p: os.path.join(dest,
898 898 util.localpath(p)[striplen:])
899 899 else:
900 900 # a file
901 901 if destdirexists:
902 902 res = lambda p: os.path.join(dest,
903 903 os.path.basename(util.localpath(p)))
904 904 else:
905 905 res = lambda p: dest
906 906 return res
907 907
908 908 pats = scmutil.expandpats(pats)
909 909 if not pats:
910 910 raise error.Abort(_('no source or destination specified'))
911 911 if len(pats) == 1:
912 912 raise error.Abort(_('no destination specified'))
913 913 dest = pats.pop()
914 914 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
915 915 if not destdirexists:
916 916 if len(pats) > 1 or matchmod.patkind(pats[0]):
917 917 raise error.Abort(_('with multiple sources, destination must be an '
918 918 'existing directory'))
919 919 if util.endswithsep(dest):
920 920 raise error.Abort(_('destination %s is not a directory') % dest)
921 921
922 922 tfn = targetpathfn
923 923 if after:
924 924 tfn = targetpathafterfn
925 925 copylist = []
926 926 for pat in pats:
927 927 srcs = walkpat(pat)
928 928 if not srcs:
929 929 continue
930 930 copylist.append((tfn(pat, dest, srcs), srcs))
931 931 if not copylist:
932 932 raise error.Abort(_('no files to copy'))
933 933
934 934 errors = 0
935 935 for targetpath, srcs in copylist:
936 936 for abssrc, relsrc, exact in srcs:
937 937 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
938 938 errors += 1
939 939
940 940 if errors:
941 941 ui.warn(_('(consider using --after)\n'))
942 942
943 943 return errors != 0
944 944
945 945 ## facility to let extension process additional data into an import patch
946 946 # list of identifier to be executed in order
947 947 extrapreimport = [] # run before commit
948 948 extrapostimport = [] # run after commit
949 949 # mapping from identifier to actual import function
950 950 #
951 951 # 'preimport' are run before the commit is made and are provided the following
952 952 # arguments:
953 953 # - repo: the localrepository instance,
954 954 # - patchdata: data extracted from patch header (cf m.patch.patchheadermap),
955 955 # - extra: the future extra dictionary of the changeset, please mutate it,
956 956 # - opts: the import options.
957 957 # XXX ideally, we would just pass an ctx ready to be computed, that would allow
958 958 # mutation of in memory commit and more. Feel free to rework the code to get
959 959 # there.
960 960 extrapreimportmap = {}
961 961 # 'postimport' are run after the commit is made and are provided the following
962 962 # argument:
963 963 # - ctx: the changectx created by import.
964 964 extrapostimportmap = {}
965 965
966 966 def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc):
967 967 """Utility function used by commands.import to import a single patch
968 968
969 969 This function is explicitly defined here to help the evolve extension to
970 970 wrap this part of the import logic.
971 971
972 972 The API is currently a bit ugly because it a simple code translation from
973 973 the import command. Feel free to make it better.
974 974
975 975 :hunk: a patch (as a binary string)
976 976 :parents: nodes that will be parent of the created commit
977 977 :opts: the full dict of option passed to the import command
978 978 :msgs: list to save commit message to.
979 979 (used in case we need to save it when failing)
980 980 :updatefunc: a function that update a repo to a given node
981 981 updatefunc(<repo>, <node>)
982 982 """
983 983 # avoid cycle context -> subrepo -> cmdutil
984 984 from . import context
985 985 extractdata = patch.extract(ui, hunk)
986 986 tmpname = extractdata.get('filename')
987 987 message = extractdata.get('message')
988 988 user = opts.get('user') or extractdata.get('user')
989 989 date = opts.get('date') or extractdata.get('date')
990 990 branch = extractdata.get('branch')
991 991 nodeid = extractdata.get('nodeid')
992 992 p1 = extractdata.get('p1')
993 993 p2 = extractdata.get('p2')
994 994
995 995 nocommit = opts.get('no_commit')
996 996 importbranch = opts.get('import_branch')
997 997 update = not opts.get('bypass')
998 998 strip = opts["strip"]
999 999 prefix = opts["prefix"]
1000 1000 sim = float(opts.get('similarity') or 0)
1001 1001 if not tmpname:
1002 1002 return (None, None, False)
1003 1003
1004 1004 rejects = False
1005 1005
1006 1006 try:
1007 1007 cmdline_message = logmessage(ui, opts)
1008 1008 if cmdline_message:
1009 1009 # pickup the cmdline msg
1010 1010 message = cmdline_message
1011 1011 elif message:
1012 1012 # pickup the patch msg
1013 1013 message = message.strip()
1014 1014 else:
1015 1015 # launch the editor
1016 1016 message = None
1017 1017 ui.debug('message:\n%s\n' % message)
1018 1018
1019 1019 if len(parents) == 1:
1020 1020 parents.append(repo[nullid])
1021 1021 if opts.get('exact'):
1022 1022 if not nodeid or not p1:
1023 1023 raise error.Abort(_('not a Mercurial patch'))
1024 1024 p1 = repo[p1]
1025 1025 p2 = repo[p2 or nullid]
1026 1026 elif p2:
1027 1027 try:
1028 1028 p1 = repo[p1]
1029 1029 p2 = repo[p2]
1030 1030 # Without any options, consider p2 only if the
1031 1031 # patch is being applied on top of the recorded
1032 1032 # first parent.
1033 1033 if p1 != parents[0]:
1034 1034 p1 = parents[0]
1035 1035 p2 = repo[nullid]
1036 1036 except error.RepoError:
1037 1037 p1, p2 = parents
1038 1038 if p2.node() == nullid:
1039 1039 ui.warn(_("warning: import the patch as a normal revision\n"
1040 1040 "(use --exact to import the patch as a merge)\n"))
1041 1041 else:
1042 1042 p1, p2 = parents
1043 1043
1044 1044 n = None
1045 1045 if update:
1046 1046 if p1 != parents[0]:
1047 1047 updatefunc(repo, p1.node())
1048 1048 if p2 != parents[1]:
1049 1049 repo.setparents(p1.node(), p2.node())
1050 1050
1051 1051 if opts.get('exact') or importbranch:
1052 1052 repo.dirstate.setbranch(branch or 'default')
1053 1053
1054 1054 partial = opts.get('partial', False)
1055 1055 files = set()
1056 1056 try:
1057 1057 patch.patch(ui, repo, tmpname, strip=strip, prefix=prefix,
1058 1058 files=files, eolmode=None, similarity=sim / 100.0)
1059 1059 except patch.PatchError as e:
1060 1060 if not partial:
1061 1061 raise error.Abort(str(e))
1062 1062 if partial:
1063 1063 rejects = True
1064 1064
1065 1065 files = list(files)
1066 1066 if nocommit:
1067 1067 if message:
1068 1068 msgs.append(message)
1069 1069 else:
1070 1070 if opts.get('exact') or p2:
1071 1071 # If you got here, you either use --force and know what
1072 1072 # you are doing or used --exact or a merge patch while
1073 1073 # being updated to its first parent.
1074 1074 m = None
1075 1075 else:
1076 1076 m = scmutil.matchfiles(repo, files or [])
1077 1077 editform = mergeeditform(repo[None], 'import.normal')
1078 1078 if opts.get('exact'):
1079 1079 editor = None
1080 1080 else:
1081 1081 editor = getcommiteditor(editform=editform, **opts)
1082 1082 extra = {}
1083 1083 for idfunc in extrapreimport:
1084 1084 extrapreimportmap[idfunc](repo, extractdata, extra, opts)
1085 1085 overrides = {}
1086 1086 if partial:
1087 1087 overrides[('ui', 'allowemptycommit')] = True
1088 1088 with repo.ui.configoverride(overrides, 'import'):
1089 1089 n = repo.commit(message, user,
1090 1090 date, match=m,
1091 1091 editor=editor, extra=extra)
1092 1092 for idfunc in extrapostimport:
1093 1093 extrapostimportmap[idfunc](repo[n])
1094 1094 else:
1095 1095 if opts.get('exact') or importbranch:
1096 1096 branch = branch or 'default'
1097 1097 else:
1098 1098 branch = p1.branch()
1099 1099 store = patch.filestore()
1100 1100 try:
1101 1101 files = set()
1102 1102 try:
1103 1103 patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix,
1104 1104 files, eolmode=None)
1105 1105 except patch.PatchError as e:
1106 1106 raise error.Abort(str(e))
1107 1107 if opts.get('exact'):
1108 1108 editor = None
1109 1109 else:
1110 1110 editor = getcommiteditor(editform='import.bypass')
1111 1111 memctx = context.memctx(repo, (p1.node(), p2.node()),
1112 1112 message,
1113 1113 files=files,
1114 1114 filectxfn=store,
1115 1115 user=user,
1116 1116 date=date,
1117 1117 branch=branch,
1118 1118 editor=editor)
1119 1119 n = memctx.commit()
1120 1120 finally:
1121 1121 store.close()
1122 1122 if opts.get('exact') and nocommit:
1123 1123 # --exact with --no-commit is still useful in that it does merge
1124 1124 # and branch bits
1125 1125 ui.warn(_("warning: can't check exact import with --no-commit\n"))
1126 1126 elif opts.get('exact') and hex(n) != nodeid:
1127 1127 raise error.Abort(_('patch is damaged or loses information'))
1128 1128 msg = _('applied to working directory')
1129 1129 if n:
1130 1130 # i18n: refers to a short changeset id
1131 1131 msg = _('created %s') % short(n)
1132 1132 return (msg, n, rejects)
1133 1133 finally:
1134 1134 os.unlink(tmpname)
1135 1135
1136 1136 # facility to let extensions include additional data in an exported patch
1137 1137 # list of identifiers to be executed in order
1138 1138 extraexport = []
1139 1139 # mapping from identifier to actual export function
1140 1140 # function as to return a string to be added to the header or None
1141 1141 # it is given two arguments (sequencenumber, changectx)
1142 1142 extraexportmap = {}
1143 1143
1144 1144 def _exportsingle(repo, ctx, match, switch_parent, rev, seqno, write, diffopts):
1145 1145 node = scmutil.binnode(ctx)
1146 1146 parents = [p.node() for p in ctx.parents() if p]
1147 1147 branch = ctx.branch()
1148 1148 if switch_parent:
1149 1149 parents.reverse()
1150 1150
1151 1151 if parents:
1152 1152 prev = parents[0]
1153 1153 else:
1154 1154 prev = nullid
1155 1155
1156 1156 write("# HG changeset patch\n")
1157 1157 write("# User %s\n" % ctx.user())
1158 1158 write("# Date %d %d\n" % ctx.date())
1159 1159 write("# %s\n" % util.datestr(ctx.date()))
1160 1160 if branch and branch != 'default':
1161 1161 write("# Branch %s\n" % branch)
1162 1162 write("# Node ID %s\n" % hex(node))
1163 1163 write("# Parent %s\n" % hex(prev))
1164 1164 if len(parents) > 1:
1165 1165 write("# Parent %s\n" % hex(parents[1]))
1166 1166
1167 1167 for headerid in extraexport:
1168 1168 header = extraexportmap[headerid](seqno, ctx)
1169 1169 if header is not None:
1170 1170 write('# %s\n' % header)
1171 1171 write(ctx.description().rstrip())
1172 1172 write("\n\n")
1173 1173
1174 1174 for chunk, label in patch.diffui(repo, prev, node, match, opts=diffopts):
1175 1175 write(chunk, label=label)
1176 1176
1177 1177 def export(repo, revs, fntemplate='hg-%h.patch', fp=None, switch_parent=False,
1178 1178 opts=None, match=None):
1179 1179 '''export changesets as hg patches
1180 1180
1181 1181 Args:
1182 1182 repo: The repository from which we're exporting revisions.
1183 1183 revs: A list of revisions to export as revision numbers.
1184 1184 fntemplate: An optional string to use for generating patch file names.
1185 1185 fp: An optional file-like object to which patches should be written.
1186 1186 switch_parent: If True, show diffs against second parent when not nullid.
1187 1187 Default is false, which always shows diff against p1.
1188 1188 opts: diff options to use for generating the patch.
1189 1189 match: If specified, only export changes to files matching this matcher.
1190 1190
1191 1191 Returns:
1192 1192 Nothing.
1193 1193
1194 1194 Side Effect:
1195 1195 "HG Changeset Patch" data is emitted to one of the following
1196 1196 destinations:
1197 1197 fp is specified: All revs are written to the specified
1198 1198 file-like object.
1199 1199 fntemplate specified: Each rev is written to a unique file named using
1200 1200 the given template.
1201 1201 Neither fp nor template specified: All revs written to repo.ui.write()
1202 1202 '''
1203 1203
1204 1204 total = len(revs)
1205 1205 revwidth = max(len(str(rev)) for rev in revs)
1206 1206 filemode = {}
1207 1207
1208 1208 write = None
1209 1209 dest = '<unnamed>'
1210 1210 if fp:
1211 1211 dest = getattr(fp, 'name', dest)
1212 1212 def write(s, **kw):
1213 1213 fp.write(s)
1214 1214 elif not fntemplate:
1215 1215 write = repo.ui.write
1216 1216
1217 1217 for seqno, rev in enumerate(revs, 1):
1218 1218 ctx = repo[rev]
1219 1219 fo = None
1220 1220 if not fp and fntemplate:
1221 1221 desc_lines = ctx.description().rstrip().split('\n')
1222 1222 desc = desc_lines[0] #Commit always has a first line.
1223 1223 fo = makefileobj(repo, fntemplate, ctx.node(), desc=desc,
1224 1224 total=total, seqno=seqno, revwidth=revwidth,
1225 1225 mode='wb', modemap=filemode)
1226 1226 dest = fo.name
1227 1227 def write(s, **kw):
1228 1228 fo.write(s)
1229 1229 if not dest.startswith('<'):
1230 1230 repo.ui.note("%s\n" % dest)
1231 1231 _exportsingle(
1232 1232 repo, ctx, match, switch_parent, rev, seqno, write, opts)
1233 1233 if fo is not None:
1234 1234 fo.close()
1235 1235
1236 1236 def diffordiffstat(ui, repo, diffopts, node1, node2, match,
1237 1237 changes=None, stat=False, fp=None, prefix='',
1238 1238 root='', listsubrepos=False):
1239 1239 '''show diff or diffstat.'''
1240 1240 if fp is None:
1241 1241 write = ui.write
1242 1242 else:
1243 1243 def write(s, **kw):
1244 1244 fp.write(s)
1245 1245
1246 1246 if root:
1247 1247 relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
1248 1248 else:
1249 1249 relroot = ''
1250 1250 if relroot != '':
1251 1251 # XXX relative roots currently don't work if the root is within a
1252 1252 # subrepo
1253 1253 uirelroot = match.uipath(relroot)
1254 1254 relroot += '/'
1255 1255 for matchroot in match.files():
1256 1256 if not matchroot.startswith(relroot):
1257 1257 ui.warn(_('warning: %s not inside relative root %s\n') % (
1258 1258 match.uipath(matchroot), uirelroot))
1259 1259
1260 1260 if stat:
1261 1261 diffopts = diffopts.copy(context=0)
1262 1262 width = 80
1263 1263 if not ui.plain():
1264 1264 width = ui.termwidth()
1265 1265 chunks = patch.diff(repo, node1, node2, match, changes, diffopts,
1266 1266 prefix=prefix, relroot=relroot)
1267 1267 for chunk, label in patch.diffstatui(util.iterlines(chunks),
1268 1268 width=width):
1269 1269 write(chunk, label=label)
1270 1270 else:
1271 1271 for chunk, label in patch.diffui(repo, node1, node2, match,
1272 1272 changes, diffopts, prefix=prefix,
1273 1273 relroot=relroot):
1274 1274 write(chunk, label=label)
1275 1275
1276 1276 if listsubrepos:
1277 1277 ctx1 = repo[node1]
1278 1278 ctx2 = repo[node2]
1279 1279 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
1280 1280 tempnode2 = node2
1281 1281 try:
1282 1282 if node2 is not None:
1283 1283 tempnode2 = ctx2.substate[subpath][1]
1284 1284 except KeyError:
1285 1285 # A subrepo that existed in node1 was deleted between node1 and
1286 1286 # node2 (inclusive). Thus, ctx2's substate won't contain that
1287 1287 # subpath. The best we can do is to ignore it.
1288 1288 tempnode2 = None
1289 1289 submatch = matchmod.subdirmatcher(subpath, match)
1290 1290 sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
1291 1291 stat=stat, fp=fp, prefix=prefix)
1292 1292
1293 1293 def _changesetlabels(ctx):
1294 1294 labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()]
1295 1295 if ctx.obsolete():
1296 1296 labels.append('changeset.obsolete')
1297 1297 if ctx.troubled():
1298 1298 labels.append('changeset.troubled')
1299 1299 for trouble in ctx.troubles():
1300 1300 labels.append('trouble.%s' % trouble)
1301 1301 return ' '.join(labels)
1302 1302
1303 1303 class changeset_printer(object):
1304 1304 '''show changeset information when templating not requested.'''
1305 1305
1306 1306 def __init__(self, ui, repo, matchfn, diffopts, buffered):
1307 1307 self.ui = ui
1308 1308 self.repo = repo
1309 1309 self.buffered = buffered
1310 1310 self.matchfn = matchfn
1311 1311 self.diffopts = diffopts
1312 1312 self.header = {}
1313 1313 self.hunk = {}
1314 1314 self.lastheader = None
1315 1315 self.footer = None
1316 1316
1317 1317 def flush(self, ctx):
1318 1318 rev = ctx.rev()
1319 1319 if rev in self.header:
1320 1320 h = self.header[rev]
1321 1321 if h != self.lastheader:
1322 1322 self.lastheader = h
1323 1323 self.ui.write(h)
1324 1324 del self.header[rev]
1325 1325 if rev in self.hunk:
1326 1326 self.ui.write(self.hunk[rev])
1327 1327 del self.hunk[rev]
1328 1328 return 1
1329 1329 return 0
1330 1330
1331 1331 def close(self):
1332 1332 if self.footer:
1333 1333 self.ui.write(self.footer)
1334 1334
1335 1335 def show(self, ctx, copies=None, matchfn=None, **props):
1336 1336 if self.buffered:
1337 1337 self.ui.pushbuffer(labeled=True)
1338 1338 self._show(ctx, copies, matchfn, props)
1339 1339 self.hunk[ctx.rev()] = self.ui.popbuffer()
1340 1340 else:
1341 1341 self._show(ctx, copies, matchfn, props)
1342 1342
1343 1343 def _show(self, ctx, copies, matchfn, props):
1344 1344 '''show a single changeset or file revision'''
1345 1345 changenode = ctx.node()
1346 1346 rev = ctx.rev()
1347 1347 if self.ui.debugflag:
1348 1348 hexfunc = hex
1349 1349 else:
1350 1350 hexfunc = short
1351 1351 # as of now, wctx.node() and wctx.rev() return None, but we want to
1352 1352 # show the same values as {node} and {rev} templatekw
1353 1353 revnode = (scmutil.intrev(ctx), hexfunc(scmutil.binnode(ctx)))
1354 1354
1355 1355 if self.ui.quiet:
1356 1356 self.ui.write("%d:%s\n" % revnode, label='log.node')
1357 1357 return
1358 1358
1359 1359 date = util.datestr(ctx.date())
1360 1360
1361 1361 # i18n: column positioning for "hg log"
1362 1362 self.ui.write(_("changeset: %d:%s\n") % revnode,
1363 1363 label=_changesetlabels(ctx))
1364 1364
1365 1365 # branches are shown first before any other names due to backwards
1366 1366 # compatibility
1367 1367 branch = ctx.branch()
1368 1368 # don't show the default branch name
1369 1369 if branch != 'default':
1370 1370 # i18n: column positioning for "hg log"
1371 1371 self.ui.write(_("branch: %s\n") % branch,
1372 1372 label='log.branch')
1373 1373
1374 1374 for nsname, ns in self.repo.names.iteritems():
1375 1375 # branches has special logic already handled above, so here we just
1376 1376 # skip it
1377 1377 if nsname == 'branches':
1378 1378 continue
1379 1379 # we will use the templatename as the color name since those two
1380 1380 # should be the same
1381 1381 for name in ns.names(self.repo, changenode):
1382 1382 self.ui.write(ns.logfmt % name,
1383 1383 label='log.%s' % ns.colorname)
1384 1384 if self.ui.debugflag:
1385 1385 # i18n: column positioning for "hg log"
1386 1386 self.ui.write(_("phase: %s\n") % ctx.phasestr(),
1387 1387 label='log.phase')
1388 1388 for pctx in scmutil.meaningfulparents(self.repo, ctx):
1389 1389 label = 'log.parent changeset.%s' % pctx.phasestr()
1390 1390 # i18n: column positioning for "hg log"
1391 1391 self.ui.write(_("parent: %d:%s\n")
1392 1392 % (pctx.rev(), hexfunc(pctx.node())),
1393 1393 label=label)
1394 1394
1395 1395 if self.ui.debugflag and rev is not None:
1396 1396 mnode = ctx.manifestnode()
1397 1397 # i18n: column positioning for "hg log"
1398 1398 self.ui.write(_("manifest: %d:%s\n") %
1399 1399 (self.repo.manifestlog._revlog.rev(mnode),
1400 1400 hex(mnode)),
1401 1401 label='ui.debug log.manifest')
1402 1402 # i18n: column positioning for "hg log"
1403 1403 self.ui.write(_("user: %s\n") % ctx.user(),
1404 1404 label='log.user')
1405 1405 # i18n: column positioning for "hg log"
1406 1406 self.ui.write(_("date: %s\n") % date,
1407 1407 label='log.date')
1408 1408
1409 1409 if ctx.troubled():
1410 1410 # i18n: column positioning for "hg log"
1411 1411 self.ui.write(_("trouble: %s\n") % ', '.join(ctx.troubles()),
1412 1412 label='log.trouble')
1413 1413
1414 1414 if self.ui.debugflag:
1415 1415 files = ctx.p1().status(ctx)[:3]
1416 1416 for key, value in zip([# i18n: column positioning for "hg log"
1417 1417 _("files:"),
1418 1418 # i18n: column positioning for "hg log"
1419 1419 _("files+:"),
1420 1420 # i18n: column positioning for "hg log"
1421 1421 _("files-:")], files):
1422 1422 if value:
1423 1423 self.ui.write("%-12s %s\n" % (key, " ".join(value)),
1424 1424 label='ui.debug log.files')
1425 1425 elif ctx.files() and self.ui.verbose:
1426 1426 # i18n: column positioning for "hg log"
1427 1427 self.ui.write(_("files: %s\n") % " ".join(ctx.files()),
1428 1428 label='ui.note log.files')
1429 1429 if copies and self.ui.verbose:
1430 1430 copies = ['%s (%s)' % c for c in copies]
1431 1431 # i18n: column positioning for "hg log"
1432 1432 self.ui.write(_("copies: %s\n") % ' '.join(copies),
1433 1433 label='ui.note log.copies')
1434 1434
1435 1435 extra = ctx.extra()
1436 1436 if extra and self.ui.debugflag:
1437 1437 for key, value in sorted(extra.items()):
1438 1438 # i18n: column positioning for "hg log"
1439 1439 self.ui.write(_("extra: %s=%s\n")
1440 1440 % (key, util.escapestr(value)),
1441 1441 label='ui.debug log.extra')
1442 1442
1443 1443 description = ctx.description().strip()
1444 1444 if description:
1445 1445 if self.ui.verbose:
1446 1446 self.ui.write(_("description:\n"),
1447 1447 label='ui.note log.description')
1448 1448 self.ui.write(description,
1449 1449 label='ui.note log.description')
1450 1450 self.ui.write("\n\n")
1451 1451 else:
1452 1452 # i18n: column positioning for "hg log"
1453 1453 self.ui.write(_("summary: %s\n") %
1454 1454 description.splitlines()[0],
1455 1455 label='log.summary')
1456 1456 self.ui.write("\n")
1457 1457
1458 1458 self.showpatch(ctx, matchfn)
1459 1459
1460 1460 def showpatch(self, ctx, matchfn):
1461 1461 if not matchfn:
1462 1462 matchfn = self.matchfn
1463 1463 if matchfn:
1464 1464 stat = self.diffopts.get('stat')
1465 1465 diff = self.diffopts.get('patch')
1466 1466 diffopts = patch.diffallopts(self.ui, self.diffopts)
1467 1467 node = ctx.node()
1468 1468 prev = ctx.p1().node()
1469 1469 if stat:
1470 1470 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
1471 1471 match=matchfn, stat=True)
1472 1472 if diff:
1473 1473 if stat:
1474 1474 self.ui.write("\n")
1475 1475 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
1476 1476 match=matchfn, stat=False)
1477 1477 self.ui.write("\n")
1478 1478
1479 1479 class jsonchangeset(changeset_printer):
1480 1480 '''format changeset information.'''
1481 1481
1482 1482 def __init__(self, ui, repo, matchfn, diffopts, buffered):
1483 1483 changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered)
1484 1484 self.cache = {}
1485 1485 self._first = True
1486 1486
1487 1487 def close(self):
1488 1488 if not self._first:
1489 1489 self.ui.write("\n]\n")
1490 1490 else:
1491 1491 self.ui.write("[]\n")
1492 1492
1493 1493 def _show(self, ctx, copies, matchfn, props):
1494 1494 '''show a single changeset or file revision'''
1495 1495 rev = ctx.rev()
1496 1496 if rev is None:
1497 1497 jrev = jnode = 'null'
1498 1498 else:
1499 1499 jrev = '%d' % rev
1500 1500 jnode = '"%s"' % hex(ctx.node())
1501 1501 j = encoding.jsonescape
1502 1502
1503 1503 if self._first:
1504 1504 self.ui.write("[\n {")
1505 1505 self._first = False
1506 1506 else:
1507 1507 self.ui.write(",\n {")
1508 1508
1509 1509 if self.ui.quiet:
1510 1510 self.ui.write(('\n "rev": %s') % jrev)
1511 1511 self.ui.write((',\n "node": %s') % jnode)
1512 1512 self.ui.write('\n }')
1513 1513 return
1514 1514
1515 1515 self.ui.write(('\n "rev": %s') % jrev)
1516 1516 self.ui.write((',\n "node": %s') % jnode)
1517 1517 self.ui.write((',\n "branch": "%s"') % j(ctx.branch()))
1518 1518 self.ui.write((',\n "phase": "%s"') % ctx.phasestr())
1519 1519 self.ui.write((',\n "user": "%s"') % j(ctx.user()))
1520 1520 self.ui.write((',\n "date": [%d, %d]') % ctx.date())
1521 1521 self.ui.write((',\n "desc": "%s"') % j(ctx.description()))
1522 1522
1523 1523 self.ui.write((',\n "bookmarks": [%s]') %
1524 1524 ", ".join('"%s"' % j(b) for b in ctx.bookmarks()))
1525 1525 self.ui.write((',\n "tags": [%s]') %
1526 1526 ", ".join('"%s"' % j(t) for t in ctx.tags()))
1527 1527 self.ui.write((',\n "parents": [%s]') %
1528 1528 ", ".join('"%s"' % c.hex() for c in ctx.parents()))
1529 1529
1530 1530 if self.ui.debugflag:
1531 1531 if rev is None:
1532 1532 jmanifestnode = 'null'
1533 1533 else:
1534 1534 jmanifestnode = '"%s"' % hex(ctx.manifestnode())
1535 1535 self.ui.write((',\n "manifest": %s') % jmanifestnode)
1536 1536
1537 1537 self.ui.write((',\n "extra": {%s}') %
1538 1538 ", ".join('"%s": "%s"' % (j(k), j(v))
1539 1539 for k, v in ctx.extra().items()))
1540 1540
1541 1541 files = ctx.p1().status(ctx)
1542 1542 self.ui.write((',\n "modified": [%s]') %
1543 1543 ", ".join('"%s"' % j(f) for f in files[0]))
1544 1544 self.ui.write((',\n "added": [%s]') %
1545 1545 ", ".join('"%s"' % j(f) for f in files[1]))
1546 1546 self.ui.write((',\n "removed": [%s]') %
1547 1547 ", ".join('"%s"' % j(f) for f in files[2]))
1548 1548
1549 1549 elif self.ui.verbose:
1550 1550 self.ui.write((',\n "files": [%s]') %
1551 1551 ", ".join('"%s"' % j(f) for f in ctx.files()))
1552 1552
1553 1553 if copies:
1554 1554 self.ui.write((',\n "copies": {%s}') %
1555 1555 ", ".join('"%s": "%s"' % (j(k), j(v))
1556 1556 for k, v in copies))
1557 1557
1558 1558 matchfn = self.matchfn
1559 1559 if matchfn:
1560 1560 stat = self.diffopts.get('stat')
1561 1561 diff = self.diffopts.get('patch')
1562 1562 diffopts = patch.difffeatureopts(self.ui, self.diffopts, git=True)
1563 1563 node, prev = ctx.node(), ctx.p1().node()
1564 1564 if stat:
1565 1565 self.ui.pushbuffer()
1566 1566 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
1567 1567 match=matchfn, stat=True)
1568 1568 self.ui.write((',\n "diffstat": "%s"')
1569 1569 % j(self.ui.popbuffer()))
1570 1570 if diff:
1571 1571 self.ui.pushbuffer()
1572 1572 diffordiffstat(self.ui, self.repo, diffopts, prev, node,
1573 1573 match=matchfn, stat=False)
1574 1574 self.ui.write((',\n "diff": "%s"') % j(self.ui.popbuffer()))
1575 1575
1576 1576 self.ui.write("\n }")
1577 1577
1578 1578 class changeset_templater(changeset_printer):
1579 1579 '''format changeset information.'''
1580 1580
1581 1581 def __init__(self, ui, repo, tmplspec, matchfn, diffopts, buffered):
1582 1582 changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered)
1583 1583 self.t = formatter.loadtemplater(ui, tmplspec,
1584 1584 cache=templatekw.defaulttempl)
1585 1585 self._counter = itertools.count()
1586 1586 self.cache = {}
1587 1587
1588 1588 # find correct templates for current mode
1589 1589 tmplmodes = [
1590 1590 (True, None),
1591 1591 (self.ui.verbose, 'verbose'),
1592 1592 (self.ui.quiet, 'quiet'),
1593 1593 (self.ui.debugflag, 'debug'),
1594 1594 ]
1595 1595
1596 1596 self._tref = tmplspec.ref
1597 1597 self._parts = {'header': '', 'footer': '',
1598 1598 tmplspec.ref: tmplspec.ref,
1599 1599 'docheader': '', 'docfooter': ''}
1600 1600 for mode, postfix in tmplmodes:
1601 1601 for t in self._parts:
1602 1602 cur = t
1603 1603 if postfix:
1604 1604 cur += "_" + postfix
1605 1605 if mode and cur in self.t:
1606 1606 self._parts[t] = cur
1607 1607
1608 1608 if self._parts['docheader']:
1609 1609 self.ui.write(templater.stringify(self.t(self._parts['docheader'])))
1610 1610
1611 1611 def close(self):
1612 1612 if self._parts['docfooter']:
1613 1613 if not self.footer:
1614 1614 self.footer = ""
1615 1615 self.footer += templater.stringify(self.t(self._parts['docfooter']))
1616 1616 return super(changeset_templater, self).close()
1617 1617
1618 1618 def _show(self, ctx, copies, matchfn, props):
1619 1619 '''show a single changeset or file revision'''
1620 1620 props = props.copy()
1621 1621 props.update(templatekw.keywords)
1622 1622 props['templ'] = self.t
1623 1623 props['ctx'] = ctx
1624 1624 props['repo'] = self.repo
1625 1625 props['ui'] = self.repo.ui
1626 1626 props['index'] = next(self._counter)
1627 1627 props['revcache'] = {'copies': copies}
1628 1628 props['cache'] = self.cache
1629 1629 props = pycompat.strkwargs(props)
1630 1630
1631 1631 # write header
1632 1632 if self._parts['header']:
1633 1633 h = templater.stringify(self.t(self._parts['header'], **props))
1634 1634 if self.buffered:
1635 1635 self.header[ctx.rev()] = h
1636 1636 else:
1637 1637 if self.lastheader != h:
1638 1638 self.lastheader = h
1639 1639 self.ui.write(h)
1640 1640
1641 1641 # write changeset metadata, then patch if requested
1642 1642 key = self._parts[self._tref]
1643 1643 self.ui.write(templater.stringify(self.t(key, **props)))
1644 1644 self.showpatch(ctx, matchfn)
1645 1645
1646 1646 if self._parts['footer']:
1647 1647 if not self.footer:
1648 1648 self.footer = templater.stringify(
1649 1649 self.t(self._parts['footer'], **props))
1650 1650
1651 1651 def logtemplatespec(tmpl, mapfile):
1652 1652 return formatter.templatespec('changeset', tmpl, mapfile)
1653 1653
1654 1654 def _lookuplogtemplate(ui, tmpl, style):
1655 1655 """Find the template matching the given template spec or style
1656 1656
1657 1657 See formatter.lookuptemplate() for details.
1658 1658 """
1659 1659
1660 1660 # ui settings
1661 1661 if not tmpl and not style: # template are stronger than style
1662 1662 tmpl = ui.config('ui', 'logtemplate')
1663 1663 if tmpl:
1664 1664 return logtemplatespec(templater.unquotestring(tmpl), None)
1665 1665 else:
1666 1666 style = util.expandpath(ui.config('ui', 'style', ''))
1667 1667
1668 1668 if not tmpl and style:
1669 1669 mapfile = style
1670 1670 if not os.path.split(mapfile)[0]:
1671 1671 mapname = (templater.templatepath('map-cmdline.' + mapfile)
1672 1672 or templater.templatepath(mapfile))
1673 1673 if mapname:
1674 1674 mapfile = mapname
1675 1675 return logtemplatespec(None, mapfile)
1676 1676
1677 1677 if not tmpl:
1678 1678 return logtemplatespec(None, None)
1679 1679
1680 1680 return formatter.lookuptemplate(ui, 'changeset', tmpl)
1681 1681
1682 1682 def makelogtemplater(ui, repo, tmpl, buffered=False):
1683 1683 """Create a changeset_templater from a literal template 'tmpl'"""
1684 1684 spec = logtemplatespec(tmpl, None)
1685 1685 return changeset_templater(ui, repo, spec, matchfn=None, diffopts={},
1686 1686 buffered=buffered)
1687 1687
1688 1688 def show_changeset(ui, repo, opts, buffered=False):
1689 1689 """show one changeset using template or regular display.
1690 1690
1691 1691 Display format will be the first non-empty hit of:
1692 1692 1. option 'template'
1693 1693 2. option 'style'
1694 1694 3. [ui] setting 'logtemplate'
1695 1695 4. [ui] setting 'style'
1696 1696 If all of these values are either the unset or the empty string,
1697 1697 regular display via changeset_printer() is done.
1698 1698 """
1699 1699 # options
1700 1700 matchfn = None
1701 1701 if opts.get('patch') or opts.get('stat'):
1702 1702 matchfn = scmutil.matchall(repo)
1703 1703
1704 1704 if opts.get('template') == 'json':
1705 1705 return jsonchangeset(ui, repo, matchfn, opts, buffered)
1706 1706
1707 1707 spec = _lookuplogtemplate(ui, opts.get('template'), opts.get('style'))
1708 1708
1709 1709 if not spec.tmpl and not spec.mapfile:
1710 1710 return changeset_printer(ui, repo, matchfn, opts, buffered)
1711 1711
1712 1712 return changeset_templater(ui, repo, spec, matchfn, opts, buffered)
1713 1713
1714 1714 def showmarker(fm, marker, index=None):
1715 1715 """utility function to display obsolescence marker in a readable way
1716 1716
1717 1717 To be used by debug function."""
1718 1718 if index is not None:
1719 1719 fm.write('index', '%i ', index)
1720 1720 fm.write('precnode', '%s ', hex(marker.precnode()))
1721 1721 succs = marker.succnodes()
1722 1722 fm.condwrite(succs, 'succnodes', '%s ',
1723 1723 fm.formatlist(map(hex, succs), name='node'))
1724 1724 fm.write('flag', '%X ', marker.flags())
1725 1725 parents = marker.parentnodes()
1726 1726 if parents is not None:
1727 1727 fm.write('parentnodes', '{%s} ',
1728 1728 fm.formatlist(map(hex, parents), name='node', sep=', '))
1729 1729 fm.write('date', '(%s) ', fm.formatdate(marker.date()))
1730 1730 meta = marker.metadata().copy()
1731 1731 meta.pop('date', None)
1732 1732 fm.write('metadata', '{%s}', fm.formatdict(meta, fmt='%r: %r', sep=', '))
1733 1733 fm.plain('\n')
1734 1734
1735 1735 def finddate(ui, repo, date):
1736 1736 """Find the tipmost changeset that matches the given date spec"""
1737 1737
1738 1738 df = util.matchdate(date)
1739 1739 m = scmutil.matchall(repo)
1740 1740 results = {}
1741 1741
1742 1742 def prep(ctx, fns):
1743 1743 d = ctx.date()
1744 1744 if df(d[0]):
1745 1745 results[ctx.rev()] = d
1746 1746
1747 1747 for ctx in walkchangerevs(repo, m, {'rev': None}, prep):
1748 1748 rev = ctx.rev()
1749 1749 if rev in results:
1750 1750 ui.status(_("found revision %s from %s\n") %
1751 1751 (rev, util.datestr(results[rev])))
1752 1752 return '%d' % rev
1753 1753
1754 1754 raise error.Abort(_("revision matching date not found"))
1755 1755
1756 1756 def increasingwindows(windowsize=8, sizelimit=512):
1757 1757 while True:
1758 1758 yield windowsize
1759 1759 if windowsize < sizelimit:
1760 1760 windowsize *= 2
1761 1761
1762 1762 class FileWalkError(Exception):
1763 1763 pass
1764 1764
1765 1765 def walkfilerevs(repo, match, follow, revs, fncache):
1766 1766 '''Walks the file history for the matched files.
1767 1767
1768 1768 Returns the changeset revs that are involved in the file history.
1769 1769
1770 1770 Throws FileWalkError if the file history can't be walked using
1771 1771 filelogs alone.
1772 1772 '''
1773 1773 wanted = set()
1774 1774 copies = []
1775 1775 minrev, maxrev = min(revs), max(revs)
1776 1776 def filerevgen(filelog, last):
1777 1777 """
1778 1778 Only files, no patterns. Check the history of each file.
1779 1779
1780 1780 Examines filelog entries within minrev, maxrev linkrev range
1781 1781 Returns an iterator yielding (linkrev, parentlinkrevs, copied)
1782 1782 tuples in backwards order
1783 1783 """
1784 1784 cl_count = len(repo)
1785 1785 revs = []
1786 1786 for j in xrange(0, last + 1):
1787 1787 linkrev = filelog.linkrev(j)
1788 1788 if linkrev < minrev:
1789 1789 continue
1790 1790 # only yield rev for which we have the changelog, it can
1791 1791 # happen while doing "hg log" during a pull or commit
1792 1792 if linkrev >= cl_count:
1793 1793 break
1794 1794
1795 1795 parentlinkrevs = []
1796 1796 for p in filelog.parentrevs(j):
1797 1797 if p != nullrev:
1798 1798 parentlinkrevs.append(filelog.linkrev(p))
1799 1799 n = filelog.node(j)
1800 1800 revs.append((linkrev, parentlinkrevs,
1801 1801 follow and filelog.renamed(n)))
1802 1802
1803 1803 return reversed(revs)
1804 1804 def iterfiles():
1805 1805 pctx = repo['.']
1806 1806 for filename in match.files():
1807 1807 if follow:
1808 1808 if filename not in pctx:
1809 1809 raise error.Abort(_('cannot follow file not in parent '
1810 1810 'revision: "%s"') % filename)
1811 1811 yield filename, pctx[filename].filenode()
1812 1812 else:
1813 1813 yield filename, None
1814 1814 for filename_node in copies:
1815 1815 yield filename_node
1816 1816
1817 1817 for file_, node in iterfiles():
1818 1818 filelog = repo.file(file_)
1819 1819 if not len(filelog):
1820 1820 if node is None:
1821 1821 # A zero count may be a directory or deleted file, so
1822 1822 # try to find matching entries on the slow path.
1823 1823 if follow:
1824 1824 raise error.Abort(
1825 1825 _('cannot follow nonexistent file: "%s"') % file_)
1826 1826 raise FileWalkError("Cannot walk via filelog")
1827 1827 else:
1828 1828 continue
1829 1829
1830 1830 if node is None:
1831 1831 last = len(filelog) - 1
1832 1832 else:
1833 1833 last = filelog.rev(node)
1834 1834
1835 1835 # keep track of all ancestors of the file
1836 1836 ancestors = {filelog.linkrev(last)}
1837 1837
1838 1838 # iterate from latest to oldest revision
1839 1839 for rev, flparentlinkrevs, copied in filerevgen(filelog, last):
1840 1840 if not follow:
1841 1841 if rev > maxrev:
1842 1842 continue
1843 1843 else:
1844 1844 # Note that last might not be the first interesting
1845 1845 # rev to us:
1846 1846 # if the file has been changed after maxrev, we'll
1847 1847 # have linkrev(last) > maxrev, and we still need
1848 1848 # to explore the file graph
1849 1849 if rev not in ancestors:
1850 1850 continue
1851 1851 # XXX insert 1327 fix here
1852 1852 if flparentlinkrevs:
1853 1853 ancestors.update(flparentlinkrevs)
1854 1854
1855 1855 fncache.setdefault(rev, []).append(file_)
1856 1856 wanted.add(rev)
1857 1857 if copied:
1858 1858 copies.append(copied)
1859 1859
1860 1860 return wanted
1861 1861
1862 1862 class _followfilter(object):
1863 1863 def __init__(self, repo, onlyfirst=False):
1864 1864 self.repo = repo
1865 1865 self.startrev = nullrev
1866 1866 self.roots = set()
1867 1867 self.onlyfirst = onlyfirst
1868 1868
1869 1869 def match(self, rev):
1870 1870 def realparents(rev):
1871 1871 if self.onlyfirst:
1872 1872 return self.repo.changelog.parentrevs(rev)[0:1]
1873 1873 else:
1874 1874 return filter(lambda x: x != nullrev,
1875 1875 self.repo.changelog.parentrevs(rev))
1876 1876
1877 1877 if self.startrev == nullrev:
1878 1878 self.startrev = rev
1879 1879 return True
1880 1880
1881 1881 if rev > self.startrev:
1882 1882 # forward: all descendants
1883 1883 if not self.roots:
1884 1884 self.roots.add(self.startrev)
1885 1885 for parent in realparents(rev):
1886 1886 if parent in self.roots:
1887 1887 self.roots.add(rev)
1888 1888 return True
1889 1889 else:
1890 1890 # backwards: all parents
1891 1891 if not self.roots:
1892 1892 self.roots.update(realparents(self.startrev))
1893 1893 if rev in self.roots:
1894 1894 self.roots.remove(rev)
1895 1895 self.roots.update(realparents(rev))
1896 1896 return True
1897 1897
1898 1898 return False
1899 1899
1900 1900 def walkchangerevs(repo, match, opts, prepare):
1901 1901 '''Iterate over files and the revs in which they changed.
1902 1902
1903 1903 Callers most commonly need to iterate backwards over the history
1904 1904 in which they are interested. Doing so has awful (quadratic-looking)
1905 1905 performance, so we use iterators in a "windowed" way.
1906 1906
1907 1907 We walk a window of revisions in the desired order. Within the
1908 1908 window, we first walk forwards to gather data, then in the desired
1909 1909 order (usually backwards) to display it.
1910 1910
1911 1911 This function returns an iterator yielding contexts. Before
1912 1912 yielding each context, the iterator will first call the prepare
1913 1913 function on each context in the window in forward order.'''
1914 1914
1915 1915 follow = opts.get('follow') or opts.get('follow_first')
1916 1916 revs = _logrevs(repo, opts)
1917 1917 if not revs:
1918 1918 return []
1919 1919 wanted = set()
1920 1920 slowpath = match.anypats() or ((match.isexact() or match.prefix()) and
1921 1921 opts.get('removed'))
1922 1922 fncache = {}
1923 1923 change = repo.changectx
1924 1924
1925 1925 # First step is to fill wanted, the set of revisions that we want to yield.
1926 1926 # When it does not induce extra cost, we also fill fncache for revisions in
1927 1927 # wanted: a cache of filenames that were changed (ctx.files()) and that
1928 1928 # match the file filtering conditions.
1929 1929
1930 1930 if match.always():
1931 1931 # No files, no patterns. Display all revs.
1932 1932 wanted = revs
1933 1933 elif not slowpath:
1934 1934 # We only have to read through the filelog to find wanted revisions
1935 1935
1936 1936 try:
1937 1937 wanted = walkfilerevs(repo, match, follow, revs, fncache)
1938 1938 except FileWalkError:
1939 1939 slowpath = True
1940 1940
1941 1941 # We decided to fall back to the slowpath because at least one
1942 1942 # of the paths was not a file. Check to see if at least one of them
1943 1943 # existed in history, otherwise simply return
1944 1944 for path in match.files():
1945 1945 if path == '.' or path in repo.store:
1946 1946 break
1947 1947 else:
1948 1948 return []
1949 1949
1950 1950 if slowpath:
1951 1951 # We have to read the changelog to match filenames against
1952 1952 # changed files
1953 1953
1954 1954 if follow:
1955 1955 raise error.Abort(_('can only follow copies/renames for explicit '
1956 1956 'filenames'))
1957 1957
1958 1958 # The slow path checks files modified in every changeset.
1959 1959 # This is really slow on large repos, so compute the set lazily.
1960 1960 class lazywantedset(object):
1961 1961 def __init__(self):
1962 1962 self.set = set()
1963 1963 self.revs = set(revs)
1964 1964
1965 1965 # No need to worry about locality here because it will be accessed
1966 1966 # in the same order as the increasing window below.
1967 1967 def __contains__(self, value):
1968 1968 if value in self.set:
1969 1969 return True
1970 1970 elif not value in self.revs:
1971 1971 return False
1972 1972 else:
1973 1973 self.revs.discard(value)
1974 1974 ctx = change(value)
1975 1975 matches = filter(match, ctx.files())
1976 1976 if matches:
1977 1977 fncache[value] = matches
1978 1978 self.set.add(value)
1979 1979 return True
1980 1980 return False
1981 1981
1982 1982 def discard(self, value):
1983 1983 self.revs.discard(value)
1984 1984 self.set.discard(value)
1985 1985
1986 1986 wanted = lazywantedset()
1987 1987
1988 1988 # it might be worthwhile to do this in the iterator if the rev range
1989 1989 # is descending and the prune args are all within that range
1990 1990 for rev in opts.get('prune', ()):
1991 1991 rev = repo[rev].rev()
1992 1992 ff = _followfilter(repo)
1993 1993 stop = min(revs[0], revs[-1])
1994 1994 for x in xrange(rev, stop - 1, -1):
1995 1995 if ff.match(x):
1996 1996 wanted = wanted - [x]
1997 1997
1998 1998 # Now that wanted is correctly initialized, we can iterate over the
1999 1999 # revision range, yielding only revisions in wanted.
2000 2000 def iterate():
2001 2001 if follow and match.always():
2002 2002 ff = _followfilter(repo, onlyfirst=opts.get('follow_first'))
2003 2003 def want(rev):
2004 2004 return ff.match(rev) and rev in wanted
2005 2005 else:
2006 2006 def want(rev):
2007 2007 return rev in wanted
2008 2008
2009 2009 it = iter(revs)
2010 2010 stopiteration = False
2011 2011 for windowsize in increasingwindows():
2012 2012 nrevs = []
2013 2013 for i in xrange(windowsize):
2014 2014 rev = next(it, None)
2015 2015 if rev is None:
2016 2016 stopiteration = True
2017 2017 break
2018 2018 elif want(rev):
2019 2019 nrevs.append(rev)
2020 2020 for rev in sorted(nrevs):
2021 2021 fns = fncache.get(rev)
2022 2022 ctx = change(rev)
2023 2023 if not fns:
2024 2024 def fns_generator():
2025 2025 for f in ctx.files():
2026 2026 if match(f):
2027 2027 yield f
2028 2028 fns = fns_generator()
2029 2029 prepare(ctx, fns)
2030 2030 for rev in nrevs:
2031 2031 yield change(rev)
2032 2032
2033 2033 if stopiteration:
2034 2034 break
2035 2035
2036 2036 return iterate()
2037 2037
2038 2038 def _makefollowlogfilematcher(repo, files, followfirst):
2039 2039 # When displaying a revision with --patch --follow FILE, we have
2040 2040 # to know which file of the revision must be diffed. With
2041 2041 # --follow, we want the names of the ancestors of FILE in the
2042 2042 # revision, stored in "fcache". "fcache" is populated by
2043 2043 # reproducing the graph traversal already done by --follow revset
2044 2044 # and relating revs to file names (which is not "correct" but
2045 2045 # good enough).
2046 2046 fcache = {}
2047 2047 fcacheready = [False]
2048 2048 pctx = repo['.']
2049 2049
2050 2050 def populate():
2051 2051 for fn in files:
2052 2052 fctx = pctx[fn]
2053 2053 fcache.setdefault(fctx.introrev(), set()).add(fctx.path())
2054 2054 for c in fctx.ancestors(followfirst=followfirst):
2055 2055 fcache.setdefault(c.rev(), set()).add(c.path())
2056 2056
2057 2057 def filematcher(rev):
2058 2058 if not fcacheready[0]:
2059 2059 # Lazy initialization
2060 2060 fcacheready[0] = True
2061 2061 populate()
2062 2062 return scmutil.matchfiles(repo, fcache.get(rev, []))
2063 2063
2064 2064 return filematcher
2065 2065
2066 2066 def _makenofollowlogfilematcher(repo, pats, opts):
2067 2067 '''hook for extensions to override the filematcher for non-follow cases'''
2068 2068 return None
2069 2069
2070 2070 def _makelogrevset(repo, pats, opts, revs):
2071 2071 """Return (expr, filematcher) where expr is a revset string built
2072 2072 from log options and file patterns or None. If --stat or --patch
2073 2073 are not passed filematcher is None. Otherwise it is a callable
2074 2074 taking a revision number and returning a match objects filtering
2075 2075 the files to be detailed when displaying the revision.
2076 2076 """
2077 2077 opt2revset = {
2078 2078 'no_merges': ('not merge()', None),
2079 2079 'only_merges': ('merge()', None),
2080 2080 '_ancestors': ('ancestors(%(val)s)', None),
2081 2081 '_fancestors': ('_firstancestors(%(val)s)', None),
2082 2082 '_descendants': ('descendants(%(val)s)', None),
2083 2083 '_fdescendants': ('_firstdescendants(%(val)s)', None),
2084 2084 '_matchfiles': ('_matchfiles(%(val)s)', None),
2085 2085 'date': ('date(%(val)r)', None),
2086 2086 'branch': ('branch(%(val)r)', ' or '),
2087 2087 '_patslog': ('filelog(%(val)r)', ' or '),
2088 2088 '_patsfollow': ('follow(%(val)r)', ' or '),
2089 2089 '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '),
2090 2090 'keyword': ('keyword(%(val)r)', ' or '),
2091 2091 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '),
2092 2092 'user': ('user(%(val)r)', ' or '),
2093 2093 }
2094 2094
2095 2095 opts = dict(opts)
2096 2096 # follow or not follow?
2097 2097 follow = opts.get('follow') or opts.get('follow_first')
2098 2098 if opts.get('follow_first'):
2099 2099 followfirst = 1
2100 2100 else:
2101 2101 followfirst = 0
2102 2102 # --follow with FILE behavior depends on revs...
2103 2103 it = iter(revs)
2104 2104 startrev = next(it)
2105 2105 followdescendants = startrev < next(it, startrev)
2106 2106
2107 2107 # branch and only_branch are really aliases and must be handled at
2108 2108 # the same time
2109 2109 opts['branch'] = opts.get('branch', []) + opts.get('only_branch', [])
2110 2110 opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']]
2111 2111 # pats/include/exclude are passed to match.match() directly in
2112 2112 # _matchfiles() revset but walkchangerevs() builds its matcher with
2113 2113 # scmutil.match(). The difference is input pats are globbed on
2114 2114 # platforms without shell expansion (windows).
2115 2115 wctx = repo[None]
2116 2116 match, pats = scmutil.matchandpats(wctx, pats, opts)
2117 2117 slowpath = match.anypats() or ((match.isexact() or match.prefix()) and
2118 2118 opts.get('removed'))
2119 2119 if not slowpath:
2120 2120 for f in match.files():
2121 2121 if follow and f not in wctx:
2122 2122 # If the file exists, it may be a directory, so let it
2123 2123 # take the slow path.
2124 2124 if os.path.exists(repo.wjoin(f)):
2125 2125 slowpath = True
2126 2126 continue
2127 2127 else:
2128 2128 raise error.Abort(_('cannot follow file not in parent '
2129 2129 'revision: "%s"') % f)
2130 2130 filelog = repo.file(f)
2131 2131 if not filelog:
2132 2132 # A zero count may be a directory or deleted file, so
2133 2133 # try to find matching entries on the slow path.
2134 2134 if follow:
2135 2135 raise error.Abort(
2136 2136 _('cannot follow nonexistent file: "%s"') % f)
2137 2137 slowpath = True
2138 2138
2139 2139 # We decided to fall back to the slowpath because at least one
2140 2140 # of the paths was not a file. Check to see if at least one of them
2141 2141 # existed in history - in that case, we'll continue down the
2142 2142 # slowpath; otherwise, we can turn off the slowpath
2143 2143 if slowpath:
2144 2144 for path in match.files():
2145 2145 if path == '.' or path in repo.store:
2146 2146 break
2147 2147 else:
2148 2148 slowpath = False
2149 2149
2150 2150 fpats = ('_patsfollow', '_patsfollowfirst')
2151 2151 fnopats = (('_ancestors', '_fancestors'),
2152 2152 ('_descendants', '_fdescendants'))
2153 2153 if slowpath:
2154 2154 # See walkchangerevs() slow path.
2155 2155 #
2156 2156 # pats/include/exclude cannot be represented as separate
2157 2157 # revset expressions as their filtering logic applies at file
2158 2158 # level. For instance "-I a -X a" matches a revision touching
2159 2159 # "a" and "b" while "file(a) and not file(b)" does
2160 2160 # not. Besides, filesets are evaluated against the working
2161 2161 # directory.
2162 2162 matchargs = ['r:', 'd:relpath']
2163 2163 for p in pats:
2164 2164 matchargs.append('p:' + p)
2165 2165 for p in opts.get('include', []):
2166 2166 matchargs.append('i:' + p)
2167 2167 for p in opts.get('exclude', []):
2168 2168 matchargs.append('x:' + p)
2169 2169 matchargs = ','.join(('%r' % p) for p in matchargs)
2170 2170 opts['_matchfiles'] = matchargs
2171 2171 if follow:
2172 2172 opts[fnopats[0][followfirst]] = '.'
2173 2173 else:
2174 2174 if follow:
2175 2175 if pats:
2176 2176 # follow() revset interprets its file argument as a
2177 2177 # manifest entry, so use match.files(), not pats.
2178 2178 opts[fpats[followfirst]] = list(match.files())
2179 2179 else:
2180 2180 op = fnopats[followdescendants][followfirst]
2181 2181 opts[op] = 'rev(%d)' % startrev
2182 2182 else:
2183 2183 opts['_patslog'] = list(pats)
2184 2184
2185 2185 filematcher = None
2186 2186 if opts.get('patch') or opts.get('stat'):
2187 2187 # When following files, track renames via a special matcher.
2188 2188 # If we're forced to take the slowpath it means we're following
2189 2189 # at least one pattern/directory, so don't bother with rename tracking.
2190 2190 if follow and not match.always() and not slowpath:
2191 2191 # _makefollowlogfilematcher expects its files argument to be
2192 2192 # relative to the repo root, so use match.files(), not pats.
2193 2193 filematcher = _makefollowlogfilematcher(repo, match.files(),
2194 2194 followfirst)
2195 2195 else:
2196 2196 filematcher = _makenofollowlogfilematcher(repo, pats, opts)
2197 2197 if filematcher is None:
2198 2198 filematcher = lambda rev: match
2199 2199
2200 2200 expr = []
2201 2201 for op, val in sorted(opts.iteritems()):
2202 2202 if not val:
2203 2203 continue
2204 2204 if op not in opt2revset:
2205 2205 continue
2206 2206 revop, andor = opt2revset[op]
2207 2207 if '%(val)' not in revop:
2208 2208 expr.append(revop)
2209 2209 else:
2210 2210 if not isinstance(val, list):
2211 2211 e = revop % {'val': val}
2212 2212 else:
2213 2213 e = '(' + andor.join((revop % {'val': v}) for v in val) + ')'
2214 2214 expr.append(e)
2215 2215
2216 2216 if expr:
2217 2217 expr = '(' + ' and '.join(expr) + ')'
2218 2218 else:
2219 2219 expr = None
2220 2220 return expr, filematcher
2221 2221
2222 2222 def _logrevs(repo, opts):
2223 2223 # Default --rev value depends on --follow but --follow behavior
2224 2224 # depends on revisions resolved from --rev...
2225 2225 follow = opts.get('follow') or opts.get('follow_first')
2226 2226 if opts.get('rev'):
2227 2227 revs = scmutil.revrange(repo, opts['rev'])
2228 2228 elif follow and repo.dirstate.p1() == nullid:
2229 2229 revs = smartset.baseset()
2230 2230 elif follow:
2231 2231 revs = repo.revs('reverse(:.)')
2232 2232 else:
2233 2233 revs = smartset.spanset(repo)
2234 2234 revs.reverse()
2235 2235 return revs
2236 2236
2237 2237 def getgraphlogrevs(repo, pats, opts):
2238 2238 """Return (revs, expr, filematcher) where revs is an iterable of
2239 2239 revision numbers, expr is a revset string built from log options
2240 2240 and file patterns or None, and used to filter 'revs'. If --stat or
2241 2241 --patch are not passed filematcher is None. Otherwise it is a
2242 2242 callable taking a revision number and returning a match objects
2243 2243 filtering the files to be detailed when displaying the revision.
2244 2244 """
2245 2245 limit = loglimit(opts)
2246 2246 revs = _logrevs(repo, opts)
2247 2247 if not revs:
2248 2248 return smartset.baseset(), None, None
2249 2249 expr, filematcher = _makelogrevset(repo, pats, opts, revs)
2250 2250 if opts.get('rev'):
2251 2251 # User-specified revs might be unsorted, but don't sort before
2252 2252 # _makelogrevset because it might depend on the order of revs
2253 2253 if not (revs.isdescending() or revs.istopo()):
2254 2254 revs.sort(reverse=True)
2255 2255 if expr:
2256 2256 matcher = revset.match(repo.ui, expr, order=revset.followorder)
2257 2257 revs = matcher(repo, revs)
2258 2258 if limit is not None:
2259 2259 limitedrevs = []
2260 2260 for idx, rev in enumerate(revs):
2261 2261 if idx >= limit:
2262 2262 break
2263 2263 limitedrevs.append(rev)
2264 2264 revs = smartset.baseset(limitedrevs)
2265 2265
2266 2266 return revs, expr, filematcher
2267 2267
2268 2268 def getlogrevs(repo, pats, opts):
2269 2269 """Return (revs, expr, filematcher) where revs is an iterable of
2270 2270 revision numbers, expr is a revset string built from log options
2271 2271 and file patterns or None, and used to filter 'revs'. If --stat or
2272 2272 --patch are not passed filematcher is None. Otherwise it is a
2273 2273 callable taking a revision number and returning a match objects
2274 2274 filtering the files to be detailed when displaying the revision.
2275 2275 """
2276 2276 limit = loglimit(opts)
2277 2277 revs = _logrevs(repo, opts)
2278 2278 if not revs:
2279 2279 return smartset.baseset([]), None, None
2280 2280 expr, filematcher = _makelogrevset(repo, pats, opts, revs)
2281 2281 if expr:
2282 2282 matcher = revset.match(repo.ui, expr, order=revset.followorder)
2283 2283 revs = matcher(repo, revs)
2284 2284 if limit is not None:
2285 2285 limitedrevs = []
2286 2286 for idx, r in enumerate(revs):
2287 2287 if limit <= idx:
2288 2288 break
2289 2289 limitedrevs.append(r)
2290 2290 revs = smartset.baseset(limitedrevs)
2291 2291
2292 2292 return revs, expr, filematcher
2293 2293
2294 2294 def _graphnodeformatter(ui, displayer):
2295 2295 spec = ui.config('ui', 'graphnodetemplate')
2296 2296 if not spec:
2297 2297 return templatekw.showgraphnode # fast path for "{graphnode}"
2298 2298
2299 2299 spec = templater.unquotestring(spec)
2300 2300 templ = formatter.maketemplater(ui, 'graphnode', spec)
2301 2301 cache = {}
2302 2302 if isinstance(displayer, changeset_templater):
2303 2303 cache = displayer.cache # reuse cache of slow templates
2304 2304 props = templatekw.keywords.copy()
2305 2305 props['templ'] = templ
2306 2306 props['cache'] = cache
2307 2307 def formatnode(repo, ctx):
2308 2308 props['ctx'] = ctx
2309 2309 props['repo'] = repo
2310 2310 props['ui'] = repo.ui
2311 2311 props['revcache'] = {}
2312 2312 return templater.stringify(templ('graphnode', **props))
2313 2313 return formatnode
2314 2314
2315 2315 def displaygraph(ui, repo, dag, displayer, edgefn, getrenamed=None,
2316 2316 filematcher=None):
2317 2317 formatnode = _graphnodeformatter(ui, displayer)
2318 2318 state = graphmod.asciistate()
2319 2319 styles = state['styles']
2320 2320
2321 2321 # only set graph styling if HGPLAIN is not set.
2322 2322 if ui.plain('graph'):
2323 2323 # set all edge styles to |, the default pre-3.8 behaviour
2324 2324 styles.update(dict.fromkeys(styles, '|'))
2325 2325 else:
2326 2326 edgetypes = {
2327 2327 'parent': graphmod.PARENT,
2328 2328 'grandparent': graphmod.GRANDPARENT,
2329 2329 'missing': graphmod.MISSINGPARENT
2330 2330 }
2331 2331 for name, key in edgetypes.items():
2332 2332 # experimental config: experimental.graphstyle.*
2333 2333 styles[key] = ui.config('experimental', 'graphstyle.%s' % name,
2334 2334 styles[key])
2335 2335 if not styles[key]:
2336 2336 styles[key] = None
2337 2337
2338 2338 # experimental config: experimental.graphshorten
2339 2339 state['graphshorten'] = ui.configbool('experimental', 'graphshorten')
2340 2340
2341 2341 for rev, type, ctx, parents in dag:
2342 2342 char = formatnode(repo, ctx)
2343 2343 copies = None
2344 2344 if getrenamed and ctx.rev():
2345 2345 copies = []
2346 2346 for fn in ctx.files():
2347 2347 rename = getrenamed(fn, ctx.rev())
2348 2348 if rename:
2349 2349 copies.append((fn, rename[0]))
2350 2350 revmatchfn = None
2351 2351 if filematcher is not None:
2352 2352 revmatchfn = filematcher(ctx.rev())
2353 2353 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
2354 2354 lines = displayer.hunk.pop(rev).split('\n')
2355 2355 if not lines[-1]:
2356 2356 del lines[-1]
2357 2357 displayer.flush(ctx)
2358 2358 edges = edgefn(type, char, lines, state, rev, parents)
2359 2359 for type, char, lines, coldata in edges:
2360 2360 graphmod.ascii(ui, state, type, char, lines, coldata)
2361 2361 displayer.close()
2362 2362
2363 2363 def graphlog(ui, repo, pats, opts):
2364 2364 # Parameters are identical to log command ones
2365 2365 revs, expr, filematcher = getgraphlogrevs(repo, pats, opts)
2366 2366 revdag = graphmod.dagwalker(repo, revs)
2367 2367
2368 2368 getrenamed = None
2369 2369 if opts.get('copies'):
2370 2370 endrev = None
2371 2371 if opts.get('rev'):
2372 2372 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
2373 2373 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
2374 2374
2375 2375 ui.pager('log')
2376 2376 displayer = show_changeset(ui, repo, opts, buffered=True)
2377 2377 displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed,
2378 2378 filematcher)
2379 2379
2380 2380 def checkunsupportedgraphflags(pats, opts):
2381 2381 for op in ["newest_first"]:
2382 2382 if op in opts and opts[op]:
2383 2383 raise error.Abort(_("-G/--graph option is incompatible with --%s")
2384 2384 % op.replace("_", "-"))
2385 2385
2386 2386 def graphrevs(repo, nodes, opts):
2387 2387 limit = loglimit(opts)
2388 2388 nodes.reverse()
2389 2389 if limit is not None:
2390 2390 nodes = nodes[:limit]
2391 2391 return graphmod.nodes(repo, nodes)
2392 2392
2393 2393 def add(ui, repo, match, prefix, explicitonly, **opts):
2394 2394 join = lambda f: os.path.join(prefix, f)
2395 2395 bad = []
2396 2396
2397 2397 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
2398 2398 names = []
2399 2399 wctx = repo[None]
2400 2400 cca = None
2401 2401 abort, warn = scmutil.checkportabilityalert(ui)
2402 2402 if abort or warn:
2403 2403 cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
2404 2404
2405 2405 badmatch = matchmod.badmatch(match, badfn)
2406 2406 dirstate = repo.dirstate
2407 2407 # We don't want to just call wctx.walk here, since it would return a lot of
2408 2408 # clean files, which we aren't interested in and takes time.
2409 2409 for f in sorted(dirstate.walk(badmatch, sorted(wctx.substate),
2410 2410 True, False, full=False)):
2411 2411 exact = match.exact(f)
2412 2412 if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f):
2413 2413 if cca:
2414 2414 cca(f)
2415 2415 names.append(f)
2416 2416 if ui.verbose or not exact:
2417 2417 ui.status(_('adding %s\n') % match.rel(f))
2418 2418
2419 2419 for subpath in sorted(wctx.substate):
2420 2420 sub = wctx.sub(subpath)
2421 2421 try:
2422 2422 submatch = matchmod.subdirmatcher(subpath, match)
2423 2423 if opts.get(r'subrepos'):
2424 2424 bad.extend(sub.add(ui, submatch, prefix, False, **opts))
2425 2425 else:
2426 2426 bad.extend(sub.add(ui, submatch, prefix, True, **opts))
2427 2427 except error.LookupError:
2428 2428 ui.status(_("skipping missing subrepository: %s\n")
2429 2429 % join(subpath))
2430 2430
2431 2431 if not opts.get(r'dry_run'):
2432 2432 rejected = wctx.add(names, prefix)
2433 2433 bad.extend(f for f in rejected if f in match.files())
2434 2434 return bad
2435 2435
2436 2436 def addwebdirpath(repo, serverpath, webconf):
2437 2437 webconf[serverpath] = repo.root
2438 2438 repo.ui.debug('adding %s = %s\n' % (serverpath, repo.root))
2439 2439
2440 2440 for r in repo.revs('filelog("path:.hgsub")'):
2441 2441 ctx = repo[r]
2442 2442 for subpath in ctx.substate:
2443 2443 ctx.sub(subpath).addwebdirpath(serverpath, webconf)
2444 2444
2445 2445 def forget(ui, repo, match, prefix, explicitonly):
2446 2446 join = lambda f: os.path.join(prefix, f)
2447 2447 bad = []
2448 2448 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
2449 2449 wctx = repo[None]
2450 2450 forgot = []
2451 2451
2452 2452 s = repo.status(match=matchmod.badmatch(match, badfn), clean=True)
2453 2453 forget = sorted(s.modified + s.added + s.deleted + s.clean)
2454 2454 if explicitonly:
2455 2455 forget = [f for f in forget if match.exact(f)]
2456 2456
2457 2457 for subpath in sorted(wctx.substate):
2458 2458 sub = wctx.sub(subpath)
2459 2459 try:
2460 2460 submatch = matchmod.subdirmatcher(subpath, match)
2461 2461 subbad, subforgot = sub.forget(submatch, prefix)
2462 2462 bad.extend([subpath + '/' + f for f in subbad])
2463 2463 forgot.extend([subpath + '/' + f for f in subforgot])
2464 2464 except error.LookupError:
2465 2465 ui.status(_("skipping missing subrepository: %s\n")
2466 2466 % join(subpath))
2467 2467
2468 2468 if not explicitonly:
2469 2469 for f in match.files():
2470 2470 if f not in repo.dirstate and not repo.wvfs.isdir(f):
2471 2471 if f not in forgot:
2472 2472 if repo.wvfs.exists(f):
2473 2473 # Don't complain if the exact case match wasn't given.
2474 2474 # But don't do this until after checking 'forgot', so
2475 2475 # that subrepo files aren't normalized, and this op is
2476 2476 # purely from data cached by the status walk above.
2477 2477 if repo.dirstate.normalize(f) in repo.dirstate:
2478 2478 continue
2479 2479 ui.warn(_('not removing %s: '
2480 2480 'file is already untracked\n')
2481 2481 % match.rel(f))
2482 2482 bad.append(f)
2483 2483
2484 2484 for f in forget:
2485 2485 if ui.verbose or not match.exact(f):
2486 2486 ui.status(_('removing %s\n') % match.rel(f))
2487 2487
2488 2488 rejected = wctx.forget(forget, prefix)
2489 2489 bad.extend(f for f in rejected if f in match.files())
2490 2490 forgot.extend(f for f in forget if f not in rejected)
2491 2491 return bad, forgot
2492 2492
2493 2493 def files(ui, ctx, m, fm, fmt, subrepos):
2494 2494 rev = ctx.rev()
2495 2495 ret = 1
2496 2496 ds = ctx.repo().dirstate
2497 2497
2498 2498 for f in ctx.matches(m):
2499 2499 if rev is None and ds[f] == 'r':
2500 2500 continue
2501 2501 fm.startitem()
2502 2502 if ui.verbose:
2503 2503 fc = ctx[f]
2504 2504 fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags())
2505 2505 fm.data(abspath=f)
2506 2506 fm.write('path', fmt, m.rel(f))
2507 2507 ret = 0
2508 2508
2509 2509 for subpath in sorted(ctx.substate):
2510 2510 submatch = matchmod.subdirmatcher(subpath, m)
2511 2511 if (subrepos or m.exact(subpath) or any(submatch.files())):
2512 2512 sub = ctx.sub(subpath)
2513 2513 try:
2514 2514 recurse = m.exact(subpath) or subrepos
2515 2515 if sub.printfiles(ui, submatch, fm, fmt, recurse) == 0:
2516 2516 ret = 0
2517 2517 except error.LookupError:
2518 2518 ui.status(_("skipping missing subrepository: %s\n")
2519 2519 % m.abs(subpath))
2520 2520
2521 2521 return ret
2522 2522
2523 2523 def remove(ui, repo, m, prefix, after, force, subrepos, warnings=None):
2524 2524 join = lambda f: os.path.join(prefix, f)
2525 2525 ret = 0
2526 2526 s = repo.status(match=m, clean=True)
2527 2527 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
2528 2528
2529 2529 wctx = repo[None]
2530 2530
2531 2531 if warnings is None:
2532 2532 warnings = []
2533 2533 warn = True
2534 2534 else:
2535 2535 warn = False
2536 2536
2537 2537 subs = sorted(wctx.substate)
2538 2538 total = len(subs)
2539 2539 count = 0
2540 2540 for subpath in subs:
2541 2541 count += 1
2542 2542 submatch = matchmod.subdirmatcher(subpath, m)
2543 2543 if subrepos or m.exact(subpath) or any(submatch.files()):
2544 2544 ui.progress(_('searching'), count, total=total, unit=_('subrepos'))
2545 2545 sub = wctx.sub(subpath)
2546 2546 try:
2547 2547 if sub.removefiles(submatch, prefix, after, force, subrepos,
2548 2548 warnings):
2549 2549 ret = 1
2550 2550 except error.LookupError:
2551 2551 warnings.append(_("skipping missing subrepository: %s\n")
2552 2552 % join(subpath))
2553 2553 ui.progress(_('searching'), None)
2554 2554
2555 2555 # warn about failure to delete explicit files/dirs
2556 2556 deleteddirs = util.dirs(deleted)
2557 2557 files = m.files()
2558 2558 total = len(files)
2559 2559 count = 0
2560 2560 for f in files:
2561 2561 def insubrepo():
2562 2562 for subpath in wctx.substate:
2563 2563 if f.startswith(subpath + '/'):
2564 2564 return True
2565 2565 return False
2566 2566
2567 2567 count += 1
2568 2568 ui.progress(_('deleting'), count, total=total, unit=_('files'))
2569 2569 isdir = f in deleteddirs or wctx.hasdir(f)
2570 2570 if (f in repo.dirstate or isdir or f == '.'
2571 2571 or insubrepo() or f in subs):
2572 2572 continue
2573 2573
2574 2574 if repo.wvfs.exists(f):
2575 2575 if repo.wvfs.isdir(f):
2576 2576 warnings.append(_('not removing %s: no tracked files\n')
2577 2577 % m.rel(f))
2578 2578 else:
2579 2579 warnings.append(_('not removing %s: file is untracked\n')
2580 2580 % m.rel(f))
2581 2581 # missing files will generate a warning elsewhere
2582 2582 ret = 1
2583 2583 ui.progress(_('deleting'), None)
2584 2584
2585 2585 if force:
2586 2586 list = modified + deleted + clean + added
2587 2587 elif after:
2588 2588 list = deleted
2589 2589 remaining = modified + added + clean
2590 2590 total = len(remaining)
2591 2591 count = 0
2592 2592 for f in remaining:
2593 2593 count += 1
2594 2594 ui.progress(_('skipping'), count, total=total, unit=_('files'))
2595 2595 warnings.append(_('not removing %s: file still exists\n')
2596 2596 % m.rel(f))
2597 2597 ret = 1
2598 2598 ui.progress(_('skipping'), None)
2599 2599 else:
2600 2600 list = deleted + clean
2601 2601 total = len(modified) + len(added)
2602 2602 count = 0
2603 2603 for f in modified:
2604 2604 count += 1
2605 2605 ui.progress(_('skipping'), count, total=total, unit=_('files'))
2606 2606 warnings.append(_('not removing %s: file is modified (use -f'
2607 2607 ' to force removal)\n') % m.rel(f))
2608 2608 ret = 1
2609 2609 for f in added:
2610 2610 count += 1
2611 2611 ui.progress(_('skipping'), count, total=total, unit=_('files'))
2612 2612 warnings.append(_("not removing %s: file has been marked for add"
2613 2613 " (use 'hg forget' to undo add)\n") % m.rel(f))
2614 2614 ret = 1
2615 2615 ui.progress(_('skipping'), None)
2616 2616
2617 2617 list = sorted(list)
2618 2618 total = len(list)
2619 2619 count = 0
2620 2620 for f in list:
2621 2621 count += 1
2622 2622 if ui.verbose or not m.exact(f):
2623 2623 ui.progress(_('deleting'), count, total=total, unit=_('files'))
2624 2624 ui.status(_('removing %s\n') % m.rel(f))
2625 2625 ui.progress(_('deleting'), None)
2626 2626
2627 2627 with repo.wlock():
2628 2628 if not after:
2629 2629 for f in list:
2630 2630 if f in added:
2631 2631 continue # we never unlink added files on remove
2632 2632 repo.wvfs.unlinkpath(f, ignoremissing=True)
2633 2633 repo[None].forget(list)
2634 2634
2635 2635 if warn:
2636 2636 for warning in warnings:
2637 2637 ui.warn(warning)
2638 2638
2639 2639 return ret
2640 2640
2641 2641 def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts):
2642 2642 err = 1
2643 2643
2644 2644 def write(path):
2645 2645 filename = None
2646 2646 if fntemplate:
2647 2647 filename = makefilename(repo, fntemplate, ctx.node(),
2648 2648 pathname=os.path.join(prefix, path))
2649 2649 with formatter.maybereopen(basefm, filename, opts) as fm:
2650 2650 data = ctx[path].data()
2651 2651 if opts.get('decode'):
2652 2652 data = repo.wwritedata(path, data)
2653 2653 fm.startitem()
2654 2654 fm.write('data', '%s', data)
2655 2655 fm.data(abspath=path, path=matcher.rel(path))
2656 2656
2657 2657 # Automation often uses hg cat on single files, so special case it
2658 2658 # for performance to avoid the cost of parsing the manifest.
2659 2659 if len(matcher.files()) == 1 and not matcher.anypats():
2660 2660 file = matcher.files()[0]
2661 2661 mfl = repo.manifestlog
2662 2662 mfnode = ctx.manifestnode()
2663 2663 try:
2664 2664 if mfnode and mfl[mfnode].find(file)[0]:
2665 2665 write(file)
2666 2666 return 0
2667 2667 except KeyError:
2668 2668 pass
2669 2669
2670 2670 for abs in ctx.walk(matcher):
2671 2671 write(abs)
2672 2672 err = 0
2673 2673
2674 2674 for subpath in sorted(ctx.substate):
2675 2675 sub = ctx.sub(subpath)
2676 2676 try:
2677 2677 submatch = matchmod.subdirmatcher(subpath, matcher)
2678 2678
2679 2679 if not sub.cat(submatch, basefm, fntemplate,
2680 2680 os.path.join(prefix, sub._path), **opts):
2681 2681 err = 0
2682 2682 except error.RepoLookupError:
2683 2683 ui.status(_("skipping missing subrepository: %s\n")
2684 2684 % os.path.join(prefix, subpath))
2685 2685
2686 2686 return err
2687 2687
2688 2688 def commit(ui, repo, commitfunc, pats, opts):
2689 2689 '''commit the specified files or all outstanding changes'''
2690 2690 date = opts.get('date')
2691 2691 if date:
2692 2692 opts['date'] = util.parsedate(date)
2693 2693 message = logmessage(ui, opts)
2694 2694 matcher = scmutil.match(repo[None], pats, opts)
2695 2695
2696 2696 # extract addremove carefully -- this function can be called from a command
2697 2697 # that doesn't support addremove
2698 2698 if opts.get('addremove'):
2699 2699 if scmutil.addremove(repo, matcher, "", opts) != 0:
2700 2700 raise error.Abort(
2701 2701 _("failed to mark all new/missing files as added/removed"))
2702 2702
2703 2703 return commitfunc(ui, repo, message, matcher, opts)
2704 2704
2705 2705 def samefile(f, ctx1, ctx2):
2706 2706 if f in ctx1.manifest():
2707 2707 a = ctx1.filectx(f)
2708 2708 if f in ctx2.manifest():
2709 2709 b = ctx2.filectx(f)
2710 2710 return (not a.cmp(b)
2711 2711 and a.flags() == b.flags())
2712 2712 else:
2713 2713 return False
2714 2714 else:
2715 2715 return f not in ctx2.manifest()
2716 2716
2717 2717 def amend(ui, repo, commitfunc, old, extra, pats, opts):
2718 2718 # avoid cycle context -> subrepo -> cmdutil
2719 2719 from . import context
2720 2720
2721 2721 # amend will reuse the existing user if not specified, but the obsolete
2722 2722 # marker creation requires that the current user's name is specified.
2723 2723 if obsolete.isenabled(repo, obsolete.createmarkersopt):
2724 2724 ui.username() # raise exception if username not set
2725 2725
2726 2726 ui.note(_('amending changeset %s\n') % old)
2727 2727 base = old.p1()
2728 2728 createmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)
2729 2729
2730 2730 wlock = lock = newid = None
2731 2731 try:
2732 2732 wlock = repo.wlock()
2733 2733 lock = repo.lock()
2734 2734 with repo.transaction('amend') as tr:
2735 2735 # See if we got a message from -m or -l, if not, open the editor
2736 2736 # with the message of the changeset to amend
2737 2737 message = logmessage(ui, opts)
2738 2738 # ensure logfile does not conflict with later enforcement of the
2739 2739 # message. potential logfile content has been processed by
2740 2740 # `logmessage` anyway.
2741 2741 opts.pop('logfile')
2742 2742 # First, do a regular commit to record all changes in the working
2743 2743 # directory (if there are any)
2744 2744 ui.callhooks = False
2745 2745 activebookmark = repo._bookmarks.active
2746 2746 try:
2747 2747 repo._bookmarks.active = None
2748 2748 opts['message'] = 'temporary amend commit for %s' % old
2749 2749 node = commit(ui, repo, commitfunc, pats, opts)
2750 2750 finally:
2751 2751 repo._bookmarks.active = activebookmark
2752 2752 repo._bookmarks.recordchange(tr)
2753 2753 ui.callhooks = True
2754 2754 ctx = repo[node]
2755 2755
2756 2756 # Participating changesets:
2757 2757 #
2758 2758 # node/ctx o - new (intermediate) commit that contains changes
2759 2759 # | from working dir to go into amending commit
2760 2760 # | (or a workingctx if there were no changes)
2761 2761 # |
2762 2762 # old o - changeset to amend
2763 2763 # |
2764 2764 # base o - parent of amending changeset
2765 2765
2766 2766 # Update extra dict from amended commit (e.g. to preserve graft
2767 2767 # source)
2768 2768 extra.update(old.extra())
2769 2769
2770 2770 # Also update it from the intermediate commit or from the wctx
2771 2771 extra.update(ctx.extra())
2772 2772
2773 2773 if len(old.parents()) > 1:
2774 2774 # ctx.files() isn't reliable for merges, so fall back to the
2775 2775 # slower repo.status() method
2776 2776 files = set([fn for st in repo.status(base, old)[:3]
2777 2777 for fn in st])
2778 2778 else:
2779 2779 files = set(old.files())
2780 2780
2781 2781 # Second, we use either the commit we just did, or if there were no
2782 2782 # changes the parent of the working directory as the version of the
2783 2783 # files in the final amend commit
2784 2784 if node:
2785 2785 ui.note(_('copying changeset %s to %s\n') % (ctx, base))
2786 2786
2787 2787 user = ctx.user()
2788 2788 date = ctx.date()
2789 2789 # Recompute copies (avoid recording a -> b -> a)
2790 2790 copied = copies.pathcopies(base, ctx)
2791 2791 if old.p2:
2792 2792 copied.update(copies.pathcopies(old.p2(), ctx))
2793 2793
2794 2794 # Prune files which were reverted by the updates: if old
2795 2795 # introduced file X and our intermediate commit, node,
2796 2796 # renamed that file, then those two files are the same and
2797 2797 # we can discard X from our list of files. Likewise if X
2798 2798 # was deleted, it's no longer relevant
2799 2799 files.update(ctx.files())
2800 2800 files = [f for f in files if not samefile(f, ctx, base)]
2801 2801
2802 2802 def filectxfn(repo, ctx_, path):
2803 2803 try:
2804 2804 fctx = ctx[path]
2805 2805 flags = fctx.flags()
2806 2806 mctx = context.memfilectx(repo,
2807 2807 fctx.path(), fctx.data(),
2808 2808 islink='l' in flags,
2809 2809 isexec='x' in flags,
2810 2810 copied=copied.get(path))
2811 2811 return mctx
2812 2812 except KeyError:
2813 2813 return None
2814 2814 else:
2815 2815 ui.note(_('copying changeset %s to %s\n') % (old, base))
2816 2816
2817 2817 # Use version of files as in the old cset
2818 2818 def filectxfn(repo, ctx_, path):
2819 2819 try:
2820 2820 return old.filectx(path)
2821 2821 except KeyError:
2822 2822 return None
2823 2823
2824 2824 user = opts.get('user') or old.user()
2825 2825 date = opts.get('date') or old.date()
2826 2826 editform = mergeeditform(old, 'commit.amend')
2827 2827 editor = getcommiteditor(editform=editform, **opts)
2828 2828 if not message:
2829 2829 editor = getcommiteditor(edit=True, editform=editform)
2830 2830 message = old.description()
2831 2831
2832 2832 pureextra = extra.copy()
2833 2833 extra['amend_source'] = old.hex()
2834 2834
2835 2835 new = context.memctx(repo,
2836 2836 parents=[base.node(), old.p2().node()],
2837 2837 text=message,
2838 2838 files=files,
2839 2839 filectxfn=filectxfn,
2840 2840 user=user,
2841 2841 date=date,
2842 2842 extra=extra,
2843 2843 editor=editor)
2844 2844
2845 2845 newdesc = changelog.stripdesc(new.description())
2846 2846 if ((not node)
2847 2847 and newdesc == old.description()
2848 2848 and user == old.user()
2849 2849 and date == old.date()
2850 2850 and pureextra == old.extra()):
2851 2851 # nothing changed. continuing here would create a new node
2852 2852 # anyway because of the amend_source noise.
2853 2853 #
2854 2854 # This not what we expect from amend.
2855 2855 return old.node()
2856 2856
2857 2857 ph = repo.ui.config('phases', 'new-commit', phases.draft)
2858 2858 try:
2859 2859 if opts.get('secret'):
2860 2860 commitphase = 'secret'
2861 2861 else:
2862 2862 commitphase = old.phase()
2863 2863 repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend')
2864 2864 newid = repo.commitctx(new)
2865 2865 finally:
2866 2866 repo.ui.setconfig('phases', 'new-commit', ph, 'amend')
2867 2867 if newid != old.node():
2868 2868 # Reroute the working copy parent to the new changeset
2869 2869 repo.setparents(newid, nullid)
2870 2870
2871 2871 # Move bookmarks from old parent to amend commit
2872 2872 bms = repo.nodebookmarks(old.node())
2873 2873 if bms:
2874 2874 marks = repo._bookmarks
2875 2875 for bm in bms:
2876 2876 ui.debug('moving bookmarks %r from %s to %s\n' %
2877 2877 (marks, old.hex(), hex(newid)))
2878 2878 marks[bm] = newid
2879 2879 marks.recordchange(tr)
2880 2880 #commit the whole amend process
2881 2881 if createmarkers:
2882 2882 # mark the new changeset as successor of the rewritten one
2883 2883 new = repo[newid]
2884 2884 obs = [(old, (new,))]
2885 2885 if node:
2886 2886 obs.append((ctx, ()))
2887 2887
2888 2888 obsolete.createmarkers(repo, obs, operation='amend')
2889 2889 if not createmarkers and newid != old.node():
2890 2890 # Strip the intermediate commit (if there was one) and the amended
2891 2891 # commit
2892 2892 if node:
2893 2893 ui.note(_('stripping intermediate changeset %s\n') % ctx)
2894 2894 ui.note(_('stripping amended changeset %s\n') % old)
2895 2895 repair.strip(ui, repo, old.node(), topic='amend-backup')
2896 2896 finally:
2897 2897 lockmod.release(lock, wlock)
2898 2898 return newid
2899 2899
2900 2900 def commiteditor(repo, ctx, subs, editform=''):
2901 2901 if ctx.description():
2902 2902 return ctx.description()
2903 2903 return commitforceeditor(repo, ctx, subs, editform=editform,
2904 2904 unchangedmessagedetection=True)
2905 2905
2906 2906 def commitforceeditor(repo, ctx, subs, finishdesc=None, extramsg=None,
2907 2907 editform='', unchangedmessagedetection=False):
2908 2908 if not extramsg:
2909 2909 extramsg = _("Leave message empty to abort commit.")
2910 2910
2911 2911 forms = [e for e in editform.split('.') if e]
2912 2912 forms.insert(0, 'changeset')
2913 2913 templatetext = None
2914 2914 while forms:
2915 2915 tmpl = repo.ui.config('committemplate', '.'.join(forms))
2916 2916 if tmpl:
2917 2917 tmpl = templater.unquotestring(tmpl)
2918 2918 templatetext = committext = buildcommittemplate(
2919 2919 repo, ctx, subs, extramsg, tmpl)
2920 2920 break
2921 2921 forms.pop()
2922 2922 else:
2923 2923 committext = buildcommittext(repo, ctx, subs, extramsg)
2924 2924
2925 2925 # run editor in the repository root
2926 2926 olddir = pycompat.getcwd()
2927 2927 os.chdir(repo.root)
2928 2928
2929 2929 # make in-memory changes visible to external process
2930 2930 tr = repo.currenttransaction()
2931 2931 repo.dirstate.write(tr)
2932 2932 pending = tr and tr.writepending() and repo.root
2933 2933
2934 2934 editortext = repo.ui.edit(committext, ctx.user(), ctx.extra(),
2935 2935 editform=editform, pending=pending,
2936 2936 repopath=repo.path)
2937 2937 text = editortext
2938 2938
2939 2939 # strip away anything below this special string (used for editors that want
2940 2940 # to display the diff)
2941 2941 stripbelow = re.search(_linebelow, text, flags=re.MULTILINE)
2942 2942 if stripbelow:
2943 2943 text = text[:stripbelow.start()]
2944 2944
2945 2945 text = re.sub("(?m)^HG:.*(\n|$)", "", text)
2946 2946 os.chdir(olddir)
2947 2947
2948 2948 if finishdesc:
2949 2949 text = finishdesc(text)
2950 2950 if not text.strip():
2951 2951 raise error.Abort(_("empty commit message"))
2952 2952 if unchangedmessagedetection and editortext == templatetext:
2953 2953 raise error.Abort(_("commit message unchanged"))
2954 2954
2955 2955 return text
2956 2956
2957 2957 def buildcommittemplate(repo, ctx, subs, extramsg, tmpl):
2958 2958 ui = repo.ui
2959 2959 spec = _lookuplogtemplate(ui, tmpl, None)
2960 2960 t = changeset_templater(ui, repo, spec, None, {}, False)
2961 2961
2962 2962 for k, v in repo.ui.configitems('committemplate'):
2963 2963 if k != 'changeset':
2964 2964 t.t.cache[k] = v
2965 2965
2966 2966 if not extramsg:
2967 2967 extramsg = '' # ensure that extramsg is string
2968 2968
2969 2969 ui.pushbuffer()
2970 2970 t.show(ctx, extramsg=extramsg)
2971 2971 return ui.popbuffer()
2972 2972
2973 2973 def hgprefix(msg):
2974 2974 return "\n".join(["HG: %s" % a for a in msg.split("\n") if a])
2975 2975
2976 2976 def buildcommittext(repo, ctx, subs, extramsg):
2977 2977 edittext = []
2978 2978 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
2979 2979 if ctx.description():
2980 2980 edittext.append(ctx.description())
2981 2981 edittext.append("")
2982 2982 edittext.append("") # Empty line between message and comments.
2983 2983 edittext.append(hgprefix(_("Enter commit message."
2984 2984 " Lines beginning with 'HG:' are removed.")))
2985 2985 edittext.append(hgprefix(extramsg))
2986 2986 edittext.append("HG: --")
2987 2987 edittext.append(hgprefix(_("user: %s") % ctx.user()))
2988 2988 if ctx.p2():
2989 2989 edittext.append(hgprefix(_("branch merge")))
2990 2990 if ctx.branch():
2991 2991 edittext.append(hgprefix(_("branch '%s'") % ctx.branch()))
2992 2992 if bookmarks.isactivewdirparent(repo):
2993 2993 edittext.append(hgprefix(_("bookmark '%s'") % repo._activebookmark))
2994 2994 edittext.extend([hgprefix(_("subrepo %s") % s) for s in subs])
2995 2995 edittext.extend([hgprefix(_("added %s") % f) for f in added])
2996 2996 edittext.extend([hgprefix(_("changed %s") % f) for f in modified])
2997 2997 edittext.extend([hgprefix(_("removed %s") % f) for f in removed])
2998 2998 if not added and not modified and not removed:
2999 2999 edittext.append(hgprefix(_("no files changed")))
3000 3000 edittext.append("")
3001 3001
3002 3002 return "\n".join(edittext)
3003 3003
3004 3004 def commitstatus(repo, node, branch, bheads=None, opts=None):
3005 3005 if opts is None:
3006 3006 opts = {}
3007 3007 ctx = repo[node]
3008 3008 parents = ctx.parents()
3009 3009
3010 3010 if (not opts.get('amend') and bheads and node not in bheads and not
3011 3011 [x for x in parents if x.node() in bheads and x.branch() == branch]):
3012 3012 repo.ui.status(_('created new head\n'))
3013 3013 # The message is not printed for initial roots. For the other
3014 3014 # changesets, it is printed in the following situations:
3015 3015 #
3016 3016 # Par column: for the 2 parents with ...
3017 3017 # N: null or no parent
3018 3018 # B: parent is on another named branch
3019 3019 # C: parent is a regular non head changeset
3020 3020 # H: parent was a branch head of the current branch
3021 3021 # Msg column: whether we print "created new head" message
3022 3022 # In the following, it is assumed that there already exists some
3023 3023 # initial branch heads of the current branch, otherwise nothing is
3024 3024 # printed anyway.
3025 3025 #
3026 3026 # Par Msg Comment
3027 3027 # N N y additional topo root
3028 3028 #
3029 3029 # B N y additional branch root
3030 3030 # C N y additional topo head
3031 3031 # H N n usual case
3032 3032 #
3033 3033 # B B y weird additional branch root
3034 3034 # C B y branch merge
3035 3035 # H B n merge with named branch
3036 3036 #
3037 3037 # C C y additional head from merge
3038 3038 # C H n merge with a head
3039 3039 #
3040 3040 # H H n head merge: head count decreases
3041 3041
3042 3042 if not opts.get('close_branch'):
3043 3043 for r in parents:
3044 3044 if r.closesbranch() and r.branch() == branch:
3045 3045 repo.ui.status(_('reopening closed branch head %d\n') % r)
3046 3046
3047 3047 if repo.ui.debugflag:
3048 3048 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
3049 3049 elif repo.ui.verbose:
3050 3050 repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
3051 3051
3052 3052 def postcommitstatus(repo, pats, opts):
3053 3053 return repo.status(match=scmutil.match(repo[None], pats, opts))
3054 3054
3055 3055 def revert(ui, repo, ctx, parents, *pats, **opts):
3056 3056 parent, p2 = parents
3057 3057 node = ctx.node()
3058 3058
3059 3059 mf = ctx.manifest()
3060 3060 if node == p2:
3061 3061 parent = p2
3062 3062
3063 3063 # need all matching names in dirstate and manifest of target rev,
3064 3064 # so have to walk both. do not print errors if files exist in one
3065 3065 # but not other. in both cases, filesets should be evaluated against
3066 3066 # workingctx to get consistent result (issue4497). this means 'set:**'
3067 3067 # cannot be used to select missing files from target rev.
3068 3068
3069 3069 # `names` is a mapping for all elements in working copy and target revision
3070 3070 # The mapping is in the form:
3071 3071 # <asb path in repo> -> (<path from CWD>, <exactly specified by matcher?>)
3072 3072 names = {}
3073 3073
3074 3074 with repo.wlock():
3075 3075 ## filling of the `names` mapping
3076 3076 # walk dirstate to fill `names`
3077 3077
3078 3078 interactive = opts.get('interactive', False)
3079 3079 wctx = repo[None]
3080 3080 m = scmutil.match(wctx, pats, opts)
3081 3081
3082 3082 # we'll need this later
3083 3083 targetsubs = sorted(s for s in wctx.substate if m(s))
3084 3084
3085 3085 if not m.always():
3086 3086 matcher = matchmod.badmatch(m, lambda x, y: False)
3087 3087 for abs in wctx.walk(matcher):
3088 3088 names[abs] = m.rel(abs), m.exact(abs)
3089 3089
3090 3090 # walk target manifest to fill `names`
3091 3091
3092 3092 def badfn(path, msg):
3093 3093 if path in names:
3094 3094 return
3095 3095 if path in ctx.substate:
3096 3096 return
3097 3097 path_ = path + '/'
3098 3098 for f in names:
3099 3099 if f.startswith(path_):
3100 3100 return
3101 3101 ui.warn("%s: %s\n" % (m.rel(path), msg))
3102 3102
3103 3103 for abs in ctx.walk(matchmod.badmatch(m, badfn)):
3104 3104 if abs not in names:
3105 3105 names[abs] = m.rel(abs), m.exact(abs)
3106 3106
3107 3107 # Find status of all file in `names`.
3108 3108 m = scmutil.matchfiles(repo, names)
3109 3109
3110 3110 changes = repo.status(node1=node, match=m,
3111 3111 unknown=True, ignored=True, clean=True)
3112 3112 else:
3113 3113 changes = repo.status(node1=node, match=m)
3114 3114 for kind in changes:
3115 3115 for abs in kind:
3116 3116 names[abs] = m.rel(abs), m.exact(abs)
3117 3117
3118 3118 m = scmutil.matchfiles(repo, names)
3119 3119
3120 3120 modified = set(changes.modified)
3121 3121 added = set(changes.added)
3122 3122 removed = set(changes.removed)
3123 3123 _deleted = set(changes.deleted)
3124 3124 unknown = set(changes.unknown)
3125 3125 unknown.update(changes.ignored)
3126 3126 clean = set(changes.clean)
3127 3127 modadded = set()
3128 3128
3129 3129 # We need to account for the state of the file in the dirstate,
3130 3130 # even when we revert against something else than parent. This will
3131 3131 # slightly alter the behavior of revert (doing back up or not, delete
3132 3132 # or just forget etc).
3133 3133 if parent == node:
3134 3134 dsmodified = modified
3135 3135 dsadded = added
3136 3136 dsremoved = removed
3137 3137 # store all local modifications, useful later for rename detection
3138 3138 localchanges = dsmodified | dsadded
3139 3139 modified, added, removed = set(), set(), set()
3140 3140 else:
3141 3141 changes = repo.status(node1=parent, match=m)
3142 3142 dsmodified = set(changes.modified)
3143 3143 dsadded = set(changes.added)
3144 3144 dsremoved = set(changes.removed)
3145 3145 # store all local modifications, useful later for rename detection
3146 3146 localchanges = dsmodified | dsadded
3147 3147
3148 3148 # only take into account for removes between wc and target
3149 3149 clean |= dsremoved - removed
3150 3150 dsremoved &= removed
3151 3151 # distinct between dirstate remove and other
3152 3152 removed -= dsremoved
3153 3153
3154 3154 modadded = added & dsmodified
3155 3155 added -= modadded
3156 3156
3157 3157 # tell newly modified apart.
3158 3158 dsmodified &= modified
3159 3159 dsmodified |= modified & dsadded # dirstate added may need backup
3160 3160 modified -= dsmodified
3161 3161
3162 3162 # We need to wait for some post-processing to update this set
3163 3163 # before making the distinction. The dirstate will be used for
3164 3164 # that purpose.
3165 3165 dsadded = added
3166 3166
3167 3167 # in case of merge, files that are actually added can be reported as
3168 3168 # modified, we need to post process the result
3169 3169 if p2 != nullid:
3170 3170 mergeadd = set(dsmodified)
3171 3171 for path in dsmodified:
3172 3172 if path in mf:
3173 3173 mergeadd.remove(path)
3174 3174 dsadded |= mergeadd
3175 3175 dsmodified -= mergeadd
3176 3176
3177 3177 # if f is a rename, update `names` to also revert the source
3178 3178 cwd = repo.getcwd()
3179 3179 for f in localchanges:
3180 3180 src = repo.dirstate.copied(f)
3181 3181 # XXX should we check for rename down to target node?
3182 3182 if src and src not in names and repo.dirstate[src] == 'r':
3183 3183 dsremoved.add(src)
3184 3184 names[src] = (repo.pathto(src, cwd), True)
3185 3185
3186 3186 # determine the exact nature of the deleted changesets
3187 3187 deladded = set(_deleted)
3188 3188 for path in _deleted:
3189 3189 if path in mf:
3190 3190 deladded.remove(path)
3191 3191 deleted = _deleted - deladded
3192 3192
3193 3193 # distinguish between file to forget and the other
3194 3194 added = set()
3195 3195 for abs in dsadded:
3196 3196 if repo.dirstate[abs] != 'a':
3197 3197 added.add(abs)
3198 3198 dsadded -= added
3199 3199
3200 3200 for abs in deladded:
3201 3201 if repo.dirstate[abs] == 'a':
3202 3202 dsadded.add(abs)
3203 3203 deladded -= dsadded
3204 3204
3205 3205 # For files marked as removed, we check if an unknown file is present at
3206 3206 # the same path. If a such file exists it may need to be backed up.
3207 3207 # Making the distinction at this stage helps have simpler backup
3208 3208 # logic.
3209 3209 removunk = set()
3210 3210 for abs in removed:
3211 3211 target = repo.wjoin(abs)
3212 3212 if os.path.lexists(target):
3213 3213 removunk.add(abs)
3214 3214 removed -= removunk
3215 3215
3216 3216 dsremovunk = set()
3217 3217 for abs in dsremoved:
3218 3218 target = repo.wjoin(abs)
3219 3219 if os.path.lexists(target):
3220 3220 dsremovunk.add(abs)
3221 3221 dsremoved -= dsremovunk
3222 3222
3223 3223 # action to be actually performed by revert
3224 3224 # (<list of file>, message>) tuple
3225 3225 actions = {'revert': ([], _('reverting %s\n')),
3226 3226 'add': ([], _('adding %s\n')),
3227 3227 'remove': ([], _('removing %s\n')),
3228 3228 'drop': ([], _('removing %s\n')),
3229 3229 'forget': ([], _('forgetting %s\n')),
3230 3230 'undelete': ([], _('undeleting %s\n')),
3231 3231 'noop': (None, _('no changes needed to %s\n')),
3232 3232 'unknown': (None, _('file not managed: %s\n')),
3233 3233 }
3234 3234
3235 3235 # "constant" that convey the backup strategy.
3236 3236 # All set to `discard` if `no-backup` is set do avoid checking
3237 3237 # no_backup lower in the code.
3238 3238 # These values are ordered for comparison purposes
3239 3239 backupinteractive = 3 # do backup if interactively modified
3240 3240 backup = 2 # unconditionally do backup
3241 3241 check = 1 # check if the existing file differs from target
3242 3242 discard = 0 # never do backup
3243 3243 if opts.get('no_backup'):
3244 3244 backupinteractive = backup = check = discard
3245 3245 if interactive:
3246 3246 dsmodifiedbackup = backupinteractive
3247 3247 else:
3248 3248 dsmodifiedbackup = backup
3249 3249 tobackup = set()
3250 3250
3251 3251 backupanddel = actions['remove']
3252 3252 if not opts.get('no_backup'):
3253 3253 backupanddel = actions['drop']
3254 3254
3255 3255 disptable = (
3256 3256 # dispatch table:
3257 3257 # file state
3258 3258 # action
3259 3259 # make backup
3260 3260
3261 3261 ## Sets that results that will change file on disk
3262 3262 # Modified compared to target, no local change
3263 3263 (modified, actions['revert'], discard),
3264 3264 # Modified compared to target, but local file is deleted
3265 3265 (deleted, actions['revert'], discard),
3266 3266 # Modified compared to target, local change
3267 3267 (dsmodified, actions['revert'], dsmodifiedbackup),
3268 3268 # Added since target
3269 3269 (added, actions['remove'], discard),
3270 3270 # Added in working directory
3271 3271 (dsadded, actions['forget'], discard),
3272 3272 # Added since target, have local modification
3273 3273 (modadded, backupanddel, backup),
3274 3274 # Added since target but file is missing in working directory
3275 3275 (deladded, actions['drop'], discard),
3276 3276 # Removed since target, before working copy parent
3277 3277 (removed, actions['add'], discard),
3278 3278 # Same as `removed` but an unknown file exists at the same path
3279 3279 (removunk, actions['add'], check),
3280 3280 # Removed since targe, marked as such in working copy parent
3281 3281 (dsremoved, actions['undelete'], discard),
3282 3282 # Same as `dsremoved` but an unknown file exists at the same path
3283 3283 (dsremovunk, actions['undelete'], check),
3284 3284 ## the following sets does not result in any file changes
3285 3285 # File with no modification
3286 3286 (clean, actions['noop'], discard),
3287 3287 # Existing file, not tracked anywhere
3288 3288 (unknown, actions['unknown'], discard),
3289 3289 )
3290 3290
3291 3291 for abs, (rel, exact) in sorted(names.items()):
3292 3292 # target file to be touch on disk (relative to cwd)
3293 3293 target = repo.wjoin(abs)
3294 3294 # search the entry in the dispatch table.
3295 3295 # if the file is in any of these sets, it was touched in the working
3296 3296 # directory parent and we are sure it needs to be reverted.
3297 3297 for table, (xlist, msg), dobackup in disptable:
3298 3298 if abs not in table:
3299 3299 continue
3300 3300 if xlist is not None:
3301 3301 xlist.append(abs)
3302 3302 if dobackup:
3303 3303 # If in interactive mode, don't automatically create
3304 3304 # .orig files (issue4793)
3305 3305 if dobackup == backupinteractive:
3306 3306 tobackup.add(abs)
3307 3307 elif (backup <= dobackup or wctx[abs].cmp(ctx[abs])):
3308 3308 bakname = scmutil.origpath(ui, repo, rel)
3309 3309 ui.note(_('saving current version of %s as %s\n') %
3310 3310 (rel, bakname))
3311 3311 if not opts.get('dry_run'):
3312 3312 if interactive:
3313 3313 util.copyfile(target, bakname)
3314 3314 else:
3315 3315 util.rename(target, bakname)
3316 3316 if ui.verbose or not exact:
3317 3317 if not isinstance(msg, basestring):
3318 3318 msg = msg(abs)
3319 3319 ui.status(msg % rel)
3320 3320 elif exact:
3321 3321 ui.warn(msg % rel)
3322 3322 break
3323 3323
3324 3324 if not opts.get('dry_run'):
3325 3325 needdata = ('revert', 'add', 'undelete')
3326 3326 _revertprefetch(repo, ctx, *[actions[name][0] for name in needdata])
3327 3327 _performrevert(repo, parents, ctx, actions, interactive, tobackup)
3328 3328
3329 3329 if targetsubs:
3330 3330 # Revert the subrepos on the revert list
3331 3331 for sub in targetsubs:
3332 3332 try:
3333 3333 wctx.sub(sub).revert(ctx.substate[sub], *pats, **opts)
3334 3334 except KeyError:
3335 3335 raise error.Abort("subrepository '%s' does not exist in %s!"
3336 3336 % (sub, short(ctx.node())))
3337 3337
3338 3338 def _revertprefetch(repo, ctx, *files):
3339 3339 """Let extension changing the storage layer prefetch content"""
3340 3340 pass
3341 3341
3342 3342 def _performrevert(repo, parents, ctx, actions, interactive=False,
3343 3343 tobackup=None):
3344 3344 """function that actually perform all the actions computed for revert
3345 3345
3346 3346 This is an independent function to let extension to plug in and react to
3347 3347 the imminent revert.
3348 3348
3349 3349 Make sure you have the working directory locked when calling this function.
3350 3350 """
3351 3351 parent, p2 = parents
3352 3352 node = ctx.node()
3353 3353 excluded_files = []
3354 3354 matcher_opts = {"exclude": excluded_files}
3355 3355
3356 3356 def checkout(f):
3357 3357 fc = ctx[f]
3358 3358 repo.wwrite(f, fc.data(), fc.flags())
3359 3359
3360 3360 def doremove(f):
3361 3361 try:
3362 3362 repo.wvfs.unlinkpath(f)
3363 3363 except OSError:
3364 3364 pass
3365 3365 repo.dirstate.remove(f)
3366 3366
3367 3367 audit_path = pathutil.pathauditor(repo.root)
3368 3368 for f in actions['forget'][0]:
3369 3369 if interactive:
3370 3370 choice = repo.ui.promptchoice(
3371 3371 _("forget added file %s (Yn)?$$ &Yes $$ &No") % f)
3372 3372 if choice == 0:
3373 3373 repo.dirstate.drop(f)
3374 3374 else:
3375 3375 excluded_files.append(repo.wjoin(f))
3376 3376 else:
3377 3377 repo.dirstate.drop(f)
3378 3378 for f in actions['remove'][0]:
3379 3379 audit_path(f)
3380 3380 if interactive:
3381 3381 choice = repo.ui.promptchoice(
3382 3382 _("remove added file %s (Yn)?$$ &Yes $$ &No") % f)
3383 3383 if choice == 0:
3384 3384 doremove(f)
3385 3385 else:
3386 3386 excluded_files.append(repo.wjoin(f))
3387 3387 else:
3388 3388 doremove(f)
3389 3389 for f in actions['drop'][0]:
3390 3390 audit_path(f)
3391 3391 repo.dirstate.remove(f)
3392 3392
3393 3393 normal = None
3394 3394 if node == parent:
3395 3395 # We're reverting to our parent. If possible, we'd like status
3396 3396 # to report the file as clean. We have to use normallookup for
3397 3397 # merges to avoid losing information about merged/dirty files.
3398 3398 if p2 != nullid:
3399 3399 normal = repo.dirstate.normallookup
3400 3400 else:
3401 3401 normal = repo.dirstate.normal
3402 3402
3403 3403 newlyaddedandmodifiedfiles = set()
3404 3404 if interactive:
3405 3405 # Prompt the user for changes to revert
3406 3406 torevert = [repo.wjoin(f) for f in actions['revert'][0]]
3407 3407 m = scmutil.match(ctx, torevert, matcher_opts)
3408 3408 diffopts = patch.difffeatureopts(repo.ui, whitespace=True)
3409 3409 diffopts.nodates = True
3410 3410 diffopts.git = True
3411 3411 operation = 'discard'
3412 3412 reversehunks = True
3413 3413 if node != parent:
3414 3414 operation = 'revert'
3415 3415 reversehunks = repo.ui.configbool('experimental',
3416 3416 'revertalternateinteractivemode',
3417 3417 True)
3418 3418 if reversehunks:
3419 3419 diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts)
3420 3420 else:
3421 3421 diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts)
3422 3422 originalchunks = patch.parsepatch(diff)
3423 3423
3424 3424 try:
3425 3425
3426 3426 chunks, opts = recordfilter(repo.ui, originalchunks,
3427 3427 operation=operation)
3428 3428 if reversehunks:
3429 3429 chunks = patch.reversehunks(chunks)
3430 3430
3431 3431 except patch.PatchError as err:
3432 3432 raise error.Abort(_('error parsing patch: %s') % err)
3433 3433
3434 3434 newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks)
3435 3435 if tobackup is None:
3436 3436 tobackup = set()
3437 3437 # Apply changes
3438 3438 fp = stringio()
3439 3439 for c in chunks:
3440 3440 # Create a backup file only if this hunk should be backed up
3441 3441 if ishunk(c) and c.header.filename() in tobackup:
3442 3442 abs = c.header.filename()
3443 3443 target = repo.wjoin(abs)
3444 3444 bakname = scmutil.origpath(repo.ui, repo, m.rel(abs))
3445 3445 util.copyfile(target, bakname)
3446 3446 tobackup.remove(abs)
3447 3447 c.write(fp)
3448 3448 dopatch = fp.tell()
3449 3449 fp.seek(0)
3450 3450 if dopatch:
3451 3451 try:
3452 3452 patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)
3453 3453 except patch.PatchError as err:
3454 3454 raise error.Abort(str(err))
3455 3455 del fp
3456 3456 else:
3457 3457 for f in actions['revert'][0]:
3458 3458 checkout(f)
3459 3459 if normal:
3460 3460 normal(f)
3461 3461
3462 3462 for f in actions['add'][0]:
3463 3463 # Don't checkout modified files, they are already created by the diff
3464 3464 if f not in newlyaddedandmodifiedfiles:
3465 3465 checkout(f)
3466 3466 repo.dirstate.add(f)
3467 3467
3468 3468 normal = repo.dirstate.normallookup
3469 3469 if node == parent and p2 == nullid:
3470 3470 normal = repo.dirstate.normal
3471 3471 for f in actions['undelete'][0]:
3472 3472 checkout(f)
3473 3473 normal(f)
3474 3474
3475 3475 copied = copies.pathcopies(repo[parent], ctx)
3476 3476
3477 3477 for f in actions['add'][0] + actions['undelete'][0] + actions['revert'][0]:
3478 3478 if f in copied:
3479 3479 repo.dirstate.copy(copied[f], f)
3480 3480
3481 3481 class command(registrar.command):
3482 3482 def _doregister(self, func, name, *args, **kwargs):
3483 3483 func._deprecatedregistrar = True # flag for deprecwarn in extensions.py
3484 3484 return super(command, self)._doregister(func, name, *args, **kwargs)
3485 3485
3486 3486 # a list of (ui, repo, otherpeer, opts, missing) functions called by
3487 3487 # commands.outgoing. "missing" is "missing" of the result of
3488 3488 # "findcommonoutgoing()"
3489 3489 outgoinghooks = util.hooks()
3490 3490
3491 3491 # a list of (ui, repo) functions called by commands.summary
3492 3492 summaryhooks = util.hooks()
3493 3493
3494 3494 # a list of (ui, repo, opts, changes) functions called by commands.summary.
3495 3495 #
3496 3496 # functions should return tuple of booleans below, if 'changes' is None:
3497 3497 # (whether-incomings-are-needed, whether-outgoings-are-needed)
3498 3498 #
3499 3499 # otherwise, 'changes' is a tuple of tuples below:
3500 3500 # - (sourceurl, sourcebranch, sourcepeer, incoming)
3501 3501 # - (desturl, destbranch, destpeer, outgoing)
3502 3502 summaryremotehooks = util.hooks()
3503 3503
3504 3504 # A list of state files kept by multistep operations like graft.
3505 3505 # Since graft cannot be aborted, it is considered 'clearable' by update.
3506 3506 # note: bisect is intentionally excluded
3507 3507 # (state file, clearable, allowcommit, error, hint)
3508 3508 unfinishedstates = [
3509 3509 ('graftstate', True, False, _('graft in progress'),
3510 3510 _("use 'hg graft --continue' or 'hg update' to abort")),
3511 3511 ('updatestate', True, False, _('last update was interrupted'),
3512 3512 _("use 'hg update' to get a consistent checkout"))
3513 3513 ]
3514 3514
3515 3515 def checkunfinished(repo, commit=False):
3516 3516 '''Look for an unfinished multistep operation, like graft, and abort
3517 3517 if found. It's probably good to check this right before
3518 3518 bailifchanged().
3519 3519 '''
3520 3520 for f, clearable, allowcommit, msg, hint in unfinishedstates:
3521 3521 if commit and allowcommit:
3522 3522 continue
3523 3523 if repo.vfs.exists(f):
3524 3524 raise error.Abort(msg, hint=hint)
3525 3525
3526 3526 def clearunfinished(repo):
3527 3527 '''Check for unfinished operations (as above), and clear the ones
3528 3528 that are clearable.
3529 3529 '''
3530 3530 for f, clearable, allowcommit, msg, hint in unfinishedstates:
3531 3531 if not clearable and repo.vfs.exists(f):
3532 3532 raise error.Abort(msg, hint=hint)
3533 3533 for f, clearable, allowcommit, msg, hint in unfinishedstates:
3534 3534 if clearable and repo.vfs.exists(f):
3535 3535 util.unlink(repo.vfs.join(f))
3536 3536
3537 3537 afterresolvedstates = [
3538 3538 ('graftstate',
3539 3539 _('hg graft --continue')),
3540 3540 ]
3541 3541
3542 3542 def howtocontinue(repo):
3543 3543 '''Check for an unfinished operation and return the command to finish
3544 3544 it.
3545 3545
3546 3546 afterresolvedstates tuples define a .hg/{file} and the corresponding
3547 3547 command needed to finish it.
3548 3548
3549 3549 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
3550 3550 a boolean.
3551 3551 '''
3552 3552 contmsg = _("continue: %s")
3553 3553 for f, msg in afterresolvedstates:
3554 3554 if repo.vfs.exists(f):
3555 3555 return contmsg % msg, True
3556 3556 workingctx = repo[None]
3557 3557 dirty = any(repo.status()) or any(workingctx.sub(s).dirty()
3558 3558 for s in workingctx.substate)
3559 3559 if dirty:
3560 3560 return contmsg % _("hg commit"), False
3561 3561 return None, None
3562 3562
3563 3563 def checkafterresolved(repo):
3564 3564 '''Inform the user about the next action after completing hg resolve
3565 3565
3566 3566 If there's a matching afterresolvedstates, howtocontinue will yield
3567 3567 repo.ui.warn as the reporter.
3568 3568
3569 3569 Otherwise, it will yield repo.ui.note.
3570 3570 '''
3571 3571 msg, warning = howtocontinue(repo)
3572 3572 if msg is not None:
3573 3573 if warning:
3574 3574 repo.ui.warn("%s\n" % msg)
3575 3575 else:
3576 3576 repo.ui.note("%s\n" % msg)
3577 3577
3578 3578 def wrongtooltocontinue(repo, task):
3579 3579 '''Raise an abort suggesting how to properly continue if there is an
3580 3580 active task.
3581 3581
3582 3582 Uses howtocontinue() to find the active task.
3583 3583
3584 3584 If there's no task (repo.ui.note for 'hg commit'), it does not offer
3585 3585 a hint.
3586 3586 '''
3587 3587 after = howtocontinue(repo)
3588 3588 hint = None
3589 3589 if after[1]:
3590 3590 hint = after[0]
3591 3591 raise error.Abort(_('no %s in progress') % task, hint=hint)
General Comments 0
You need to be logged in to leave comments. Login now