[PATCH] commit: show active bookmark in commit editor helper text

Pierre-Yves David pierre-yves.david at ens-lyon.org
Sun Feb 3 04:09:12 CST 2013


On Fri, Feb 01, 2013 at 09:30:59PM -0200, Antonio Zanardo wrote:
> # HG changeset patch
> # User Antonio Zanardo <zanardo at gmail.com>
> # Date 1359333800 7200
> # Node ID c9d1310d1bfe5769f2e7006125586c68660db531
> # Parent  7068089c95a2ff3c1b536bbb52ca6bc1f06fc06e
> commit: show active bookmark in commit editor helper text
> 
> If there is an active bookmark while committing, the bookmark name
> will be visible inside the commit message helper, below the branch
> name.
> 
> This should make easier for the user to detect a mistaken commit
> parent, while working for example with a bookmark centric workflow
> like topic branches.

The feature makes a lot of sense and code looks good.  However your patch lack
test. We need a simple test making a bookmark appear in the editor to make sure
the feature won't be broken in the future.

For details see: http://mercurial.selenic.com/wiki/WritingTests

> 
> diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> --- a/mercurial/cmdutil.py
> +++ b/mercurial/cmdutil.py
> @@ -1793,6 +1793,8 @@
>          edittext.append(_("HG: branch merge"))
>      if ctx.branch():
>          edittext.append(_("HG: branch '%s'") % ctx.branch())
> +    if repo._bookmarkcurrent:
> +        edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent)
>      edittext.extend([_("HG: subrepo %s") % s for s in subs])
>      edittext.extend([_("HG: added %s") % f for f in added])
>      edittext.extend([_("HG: changed %s") % f for f in modified])


More information about the Mercurial-devel mailing list