[PATCH 5 of 5 resolve-ux] resolve: print message when no unresolved files remain (issue4214)
mads at kiilerich.com
Sun May 4 15:49:10 CDT 2014
On 05/03/2014 11:27 PM, Gregory Szorc wrote:
> # HG changeset patch
> # User Gregory Szorc <gregory.szorc at gmail.com>
> # Date 1397884765 25200
> # Fri Apr 18 22:19:25 2014 -0700
> # Branch stable
> # Node ID 28236115c82eda8e347f29739e6f56ae6299dce7
> # Parent e6e8c42fe1c8d6bb71779466ae633771e046ac69
> resolve: print message when no unresolved files remain (issue4214)
> When using resolve, users often have to consult with the output of |hg
> resolve -l| to see if any unresolved files remain. This step is tedious
> and adds overhead to resolving.
> This patch will notify a user if there are no unresolved files remaining
> after executing |hg resolve|. The printed message is tailored to reflect
> whether the executing command influenced the result.
That could be convenient ... but not really in the unix "mysteriously
quiet" tradition ...
I use an alias
unres = !hg resolve -l | sed -n 's/^U //p'
I guess I still will need that. I guess it is a feature request for a
resolve filtering option ... perhaps -lU ...
> + newunresolved = set(ms.unresolved())
> + # Nudge users into finishing an unfinished operation. We don't print
> + # this with the list/show operation because we want list/show to remain
> + # machine readable.
> + if not newunresolved and not show:
> + if oldunresolved:
> + ui.write(_('no more unresolved files'))
> + else:
> + ui.write(_('no unresolved files'))
> + ui.write(_('; you may continue your unfinished operation\n'))
To help translation this should be two full strings. But I am not
convinced it is relevant show a message in both cases and to use
More information about the Mercurial-devel