Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 31204:84e8a6834223

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: tag merge tool for blocked times Merge tools can take a while - let's ensure that they're appropriately tagged
author Simon Farnsworth <simonfar@fb.com>
date Mon, 06 Mar 2017 03:19:40 -0800
parents 48dea083f66d
children 758526333dec
comparison
equal deleted inserted replaced
31203:a8e4322f64c1 31204:84e8a6834223
491 cmd = toolpath + ' ' + args 491 cmd = toolpath + ' ' + args
492 if _toolbool(ui, tool, "gui"): 492 if _toolbool(ui, tool, "gui"):
493 repo.ui.status(_('running merge tool %s for file %s\n') % 493 repo.ui.status(_('running merge tool %s for file %s\n') %
494 (tool, fcd.path())) 494 (tool, fcd.path()))
495 repo.ui.debug('launching merge tool: %s\n' % cmd) 495 repo.ui.debug('launching merge tool: %s\n' % cmd)
496 r = ui.system(cmd, cwd=repo.root, environ=env) 496 r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool')
497 repo.ui.debug('merge tool returned: %s\n' % r) 497 repo.ui.debug('merge tool returned: %s\n' % r)
498 return True, r, False 498 return True, r, False
499 499
500 def _formatconflictmarker(repo, ctx, template, label, pad): 500 def _formatconflictmarker(repo, ctx, template, label, pad):
501 """Applies the given template to the ctx, prefixed by the label. 501 """Applies the given template to the ctx, prefixed by the label.