templatekw: replace currentbookmark with activebookmark keyword
Today, the terms 'active' and 'current' are interchangeably used throughout the
codebase in reference to the active bookmark (the bookmark that will be updated
with the next commit). This leads to confusion among developers and users.
This patch is part of a series to standardize the usage to 'active' throughout
the mercurial codebase and user interface.
--- a/mercurial/help/config.txt Wed Apr 15 08:12:04 2015 -0700
+++ b/mercurial/help/config.txt Wed Apr 15 08:19:36 2015 -0700
@@ -376,8 +376,8 @@
HG: --
HG: user: {author}\n{ifeq(p2rev, "-1", "",
"HG: branch merge\n")
- }HG: branch '{branch}'\n{if(currentbookmark,
- "HG: bookmark '{currentbookmark}'\n") }{subrepos %
+ }HG: branch '{branch}'\n{if(activebookmark,
+ "HG: bookmark '{activebookmark}'\n") }{subrepos %
"HG: subrepo {subrepo}\n" }{file_adds %
"HG: added {file}\n" }{file_mods %
"HG: changed {file}\n" }{file_dels %
--- a/tests/test-command-template.t Wed Apr 15 08:12:04 2015 -0700
+++ b/tests/test-command-template.t Wed Apr 15 08:19:36 2015 -0700
@@ -3090,12 +3090,12 @@
2 bar* foo
1
0
- $ hg log --template "{rev} {currentbookmark}\n"
+ $ hg log --template "{rev} {activebookmark}\n"
2 bar
1
0
$ hg bookmarks --inactive bar
- $ hg log --template "{rev} {currentbookmark}\n"
+ $ hg log --template "{rev} {activebookmark}\n"
2
1
0
--- a/tests/test-commit.t Wed Apr 15 08:12:04 2015 -0700
+++ b/tests/test-commit.t Wed Apr 15 08:19:36 2015 -0700
@@ -302,7 +302,7 @@
$ cd commitmsg
$ echo changed > changed
$ echo removed > removed
- $ hg book currentbookmark
+ $ hg book activebookmark
$ hg ci -qAm init
$ hg rm removed
@@ -317,7 +317,7 @@
HG: --
HG: user: test
HG: branch 'default'
- HG: bookmark 'currentbookmark'
+ HG: bookmark 'activebookmark'
HG: added added
HG: changed changed
HG: removed removed
@@ -354,7 +354,7 @@
HG: --
HG: user: test
HG: branch 'default'
- HG: bookmark 'currentbookmark'
+ HG: bookmark 'activebookmark'
HG: subrepo sub
HG: added .hgsub
HG: added added
@@ -376,22 +376,22 @@
> [committemplate]
> changeset.commit.normal = HG: this is "commit.normal" template
> HG: {extramsg}
- > {if(currentbookmark,
- > "HG: bookmark '{currentbookmark}' is activated\n",
+ > {if(activebookmark,
+ > "HG: bookmark '{activebookmark}' is activated\n",
> "HG: no bookmark is activated\n")}{subrepos %
> "HG: subrepo '{subrepo}' is changed\n"}
>
> changeset.commit = HG: this is "commit" template
> HG: {extramsg}
- > {if(currentbookmark,
- > "HG: bookmark '{currentbookmark}' is activated\n",
+ > {if(activebookmark,
+ > "HG: bookmark '{activebookmark}' is activated\n",
> "HG: no bookmark is activated\n")}{subrepos %
> "HG: subrepo '{subrepo}' is changed\n"}
>
> changeset = HG: this is customized commit template
> HG: {extramsg}
- > {if(currentbookmark,
- > "HG: bookmark '{currentbookmark}' is activated\n",
+ > {if(activebookmark,
+ > "HG: bookmark '{activebookmark}' is activated\n",
> "HG: no bookmark is activated\n")}{subrepos %
> "HG: subrepo '{subrepo}' is changed\n"}
> EOF
@@ -404,7 +404,7 @@
$ HGEDITOR=cat hg commit -S -q
HG: this is "commit.normal" template
HG: Leave message empty to abort commit.
- HG: bookmark 'currentbookmark' is activated
+ HG: bookmark 'activebookmark' is activated
HG: subrepo 'sub' is changed
HG: subrepo 'sub2' is changed
abort: empty commit message
@@ -416,7 +416,7 @@
> # now, "changeset.commit" should be chosen for "hg commit"
> EOF
- $ hg bookmark --inactive currentbookmark
+ $ hg bookmark --inactive activebookmark
$ hg forget .hgsub
$ HGEDITOR=cat hg commit -q
HG: this is "commit" template