Re: [PATCH] filemerge: tag merge tool for blocked times

2017-03-07 Thread Augie Fackler 
On Mon, Mar 06, 2017 at 03:19:56AM -0800, Simon Farnsworth wrote:
> # HG changeset patch
> # User Simon Farnsworth 
> # 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
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH] filemerge: tag merge tool for blocked times

2017-03-06 Thread Simon Farnsworth 
# HG changeset patch
# User Simon Farnsworth 
# 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

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