Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 26609:47681e77e484

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: only print out "merging f" output at premerge step We're soon going to call this function twice, once for premerge and once for merge. This makes sure the "merging" output only gets printed during the premerge step.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 20:02:53 -0700
parents ae5b60d3294f
children f9f82c444ff7
comparison
equal deleted inserted replaced
26608:ae5b60d3294f 26609:47681e77e484
485 toolconf = tool, toolpath, binary, symlink 485 toolconf = tool, toolpath, binary, symlink
486 486
487 if mergetype == nomerge: 487 if mergetype == nomerge:
488 return True, func(repo, mynode, orig, fcd, fco, fca, toolconf) 488 return True, func(repo, mynode, orig, fcd, fco, fca, toolconf)
489 489
490 if orig != fco.path(): 490 if premerge:
491 ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd)) 491 if orig != fco.path():
492 else: 492 ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
493 ui.status(_("merging %s\n") % fd) 493 else:
494 ui.status(_("merging %s\n") % fd)
494 495
495 ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) 496 ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
496 497
497 if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, 498 if precheck and not precheck(repo, mynode, orig, fcd, fco, fca,
498 toolconf): 499 toolconf):