Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 26528:8bfef5737321

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: move 'merging' output to before file creation This has no visible impact but makes some future work simpler.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 22:58:52 -0700
parents b4aab4223102
children 7833b13b001f
comparison
equal deleted inserted replaced
26527:b4aab4223102 26528:8bfef5737321
491 toolconf = tool, toolpath, binary, symlink 491 toolconf = tool, toolpath, binary, symlink
492 492
493 if mergetype == nomerge: 493 if mergetype == nomerge:
494 return func(repo, mynode, orig, fcd, fco, fca, toolconf) 494 return func(repo, mynode, orig, fcd, fco, fca, toolconf)
495 495
496 if orig != fco.path():
497 ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
498 else:
499 ui.status(_("merging %s\n") % fd)
500
501 ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
502
496 a = repo.wjoin(fd) 503 a = repo.wjoin(fd)
497 b = temp("base", fca) 504 b = temp("base", fca)
498 c = temp("other", fco) 505 c = temp("other", fco)
499 back = a + ".orig" 506 back = a + ".orig"
500 util.copyfile(a, back) 507 util.copyfile(a, back)
501 files = (a, b, c, back) 508 files = (a, b, c, back)
502
503 if orig != fco.path():
504 ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
505 else:
506 ui.status(_("merging %s\n") % fd)
507
508 ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
509 509
510 r = 0 510 r = 0
511 if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, 511 if precheck and not precheck(repo, mynode, orig, fcd, fco, fca,
512 toolconf): 512 toolconf):
513 r = 1 513 r = 1