10 import os, sys, errno, re, tempfile |
10 import os, sys, errno, re, tempfile |
11 import util, scmutil, templater, patch, error, templatekw, revlog, copies |
11 import util, scmutil, templater, patch, error, templatekw, revlog, copies |
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): |
18 return cmd.lstrip("^").split("|") |
19 return cmd.lstrip("^").split("|") |
19 |
20 |
1791 edittext.append(_("HG: user: %s") % ctx.user()) |
1792 edittext.append(_("HG: user: %s") % ctx.user()) |
1792 if ctx.p2(): |
1793 if ctx.p2(): |
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]) |
1799 edittext.extend([_("HG: removed %s") % f for f in removed]) |
1802 edittext.extend([_("HG: removed %s") % f for f in removed]) |
1800 if not added and not modified and not removed: |
1803 if not added and not modified and not removed: |