Patchwork filemerge: tag merge tool for blocked times

login
register
mail settings
Submitter Simon Farnsworth
Date March 6, 2017, 11:19 a.m.
Message ID <bca31954883ec7ffd16e.1488799196@devvm022.lla2.facebook.com>
Download mbox | patch
Permalink /patch/18934/
State Accepted
Headers show

Comments

Simon Farnsworth - March 6, 2017, 11:19 a.m.
# HG changeset patch
# User Simon Farnsworth <simonfar@fb.com>
# Date 1488799180 28800
#      Mon Mar 06 03:19:40 2017 -0800
# Node ID bca31954883ec7ffd16ee940bb84f12f60d286c8
# Parent  b4cd912d7704cd976e1bee3a3c927e0e578ec88f
filemerge: tag merge tool for blocked times

Merge tools can take a while - let's ensure that they're appropriately tagged
Augie Fackler - March 7, 2017, 5:27 p.m.
On Mon, Mar 06, 2017 at 03:19:56AM -0800, Simon Farnsworth wrote:
> # HG changeset patch
> # User Simon Farnsworth <simonfar@fb.com>
> # Date 1488799180 28800
> #      Mon Mar 06 03:19:40 2017 -0800
> # Node ID bca31954883ec7ffd16ee940bb84f12f60d286c8
> # Parent  b4cd912d7704cd976e1bee3a3c927e0e578ec88f
> filemerge: tag merge tool for blocked times

Queued, thanks.

>
> Merge tools can take a while - let's ensure that they're appropriately tagged
>
> diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
> --- a/mercurial/filemerge.py
> +++ b/mercurial/filemerge.py
> @@ -493,7 +493,7 @@
>          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)
> +    r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool')
>      repo.ui.debug('merge tool returned: %s\n' % r)
>      return True, r, False
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -493,7 +493,7 @@ 
         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)
+    r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool')
     repo.ui.debug('merge tool returned: %s\n' % r)
     return True, r, False