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