[PATCH V2] merge: print status message before launching external merge tool

Martin von Zweigbergk martinvonz at google.com
Fri Feb 10 00:24:27 UTC 2017


# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1486661545 28800
#      Thu Feb 09 09:32:25 2017 -0800
# Node ID a5615bea1858aca891fcd3d7da6a477fc183f478
# Parent  1f51b4658f21bbb797e922d155c1046eddccf91d
merge: print status message before launching external merge tool

It seems somewhat common that people run into a merge conflict and
don't notice the launched merge tool, and instead they think hg just
hung. Let's print a message for each file that we launch a GUI merge
tool for.

diff -r 1f51b4658f21 -r a5615bea1858 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Thu Feb 02 14:19:48 2017 +0100
+++ b/mercurial/filemerge.py	Thu Feb 09 09:32:25 2017 -0800
@@ -489,6 +489,9 @@
     args = util.interpolate(r'\$', replace, args,
                             lambda s: util.shellquote(util.localpath(s)))
     cmd = toolpath + ' ' + args
+    if _toolbool(ui, tool, "gui"):
+        repo.ui.status(_('running merge tool %s for file %s\n') %
+                       (tool, fcd.path()))
     repo.ui.debug('launching merge tool: %s\n' % cmd)
     r = ui.system(cmd, cwd=repo.root, environ=env)
     repo.ui.debug('merge tool returned: %s\n' % r)


More information about the Mercurial-devel mailing list