Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 27042:30b919bc49bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: don't try using external tools on change/delete conflicts This is mostly for completeness' sake -- the current code shouldn't get to this point.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 13 Nov 2015 23:57:43 -0800
parents 0e330f59ef68
children e1458049dca5
comparison
equal deleted inserted replaced
27041:0e330f59ef68 27042:30b919bc49bf
445 repo.wwrite(fd + ".base", fca.data(), fca.flags()) 445 repo.wwrite(fd + ".base", fca.data(), fca.flags())
446 return False, 1, False 446 return False, 1, False
447 447
448 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): 448 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
449 tool, toolpath, binary, symlink = toolconf 449 tool, toolpath, binary, symlink = toolconf
450 if fcd.isabsent() or fco.isabsent():
451 repo.ui.warn(_('warning: %s cannot merge change/delete conflict '
452 'for %s\n') % (tool, fcd.path()))
453 return False, 1, None
450 a, b, c, back = files 454 a, b, c, back = files
451 out = "" 455 out = ""
452 env = {'HG_FILE': fcd.path(), 456 env = {'HG_FILE': fcd.path(),
453 'HG_MY_NODE': short(mynode), 457 'HG_MY_NODE': short(mynode),
454 'HG_OTHER_NODE': str(fco.changectx()), 458 'HG_OTHER_NODE': str(fco.changectx()),