From patchwork Fri Feb  1 23:30:59 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: commit: show active bookmark in commit editor helper text
From: Antonio Zanardo <zanardo@gmail.com>
X-Patchwork-Id: 795
Message-Id: <510C5033.6040309@gmail.com>
To: mercurial-devel@selenic.com
Date: Fri, 01 Feb 2013 21:30:59 -0200

# HG changeset patch
# User Antonio Zanardo <zanardo@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.

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])