##// END OF EJS Templates
commit: show active bookmark in commit editor helper text...
Antonio Zanardo -
r18538:94317c2d default
parent child Browse files
Show More
@@ -12,6 +12,7 b' import util, scmutil, templater, patch, '
12 import match as matchmod
12 import match as matchmod
13 import subrepo, context, repair, graphmod, revset, phases, obsolete
13 import subrepo, context, repair, graphmod, revset, phases, obsolete
14 import changelog
14 import changelog
15 import bookmarks
15 import lock as lockmod
16 import lock as lockmod
16
17
17 def parsealiases(cmd):
18 def parsealiases(cmd):
@@ -1793,6 +1794,8 b' def commitforceeditor(repo, ctx, subs):'
1793 edittext.append(_("HG: branch merge"))
1794 edittext.append(_("HG: branch merge"))
1794 if ctx.branch():
1795 if ctx.branch():
1795 edittext.append(_("HG: branch '%s'") % ctx.branch())
1796 edittext.append(_("HG: branch '%s'") % ctx.branch())
1797 if bookmarks.iscurrent(repo):
1798 edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent)
1796 edittext.extend([_("HG: subrepo %s") % s for s in subs])
1799 edittext.extend([_("HG: subrepo %s") % s for s in subs])
1797 edittext.extend([_("HG: added %s") % f for f in added])
1800 edittext.extend([_("HG: added %s") % f for f in added])
1798 edittext.extend([_("HG: changed %s") % f for f in modified])
1801 edittext.extend([_("HG: changed %s") % f for f in modified])
@@ -263,6 +263,7 b' test commit message content'
263 $ cd commitmsg
263 $ cd commitmsg
264 $ echo changed > changed
264 $ echo changed > changed
265 $ echo removed > removed
265 $ echo removed > removed
266 $ hg book currentbookmark
266 $ hg ci -qAm init
267 $ hg ci -qAm init
267
268
268 $ hg rm removed
269 $ hg rm removed
@@ -277,6 +278,7 b' test commit message content'
277 HG: --
278 HG: --
278 HG: user: test
279 HG: user: test
279 HG: branch 'default'
280 HG: branch 'default'
281 HG: bookmark 'currentbookmark'
280 HG: added added
282 HG: added added
281 HG: changed changed
283 HG: changed changed
282 HG: removed removed
284 HG: removed removed
General Comments 0
You need to be logged in to leave comments. Login now