Mercurial > hg-stable
comparison mercurial/help/config.txt @ 25014:7e5d5160073b
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.
author | Ryan McElroy <rmcelroy@fb.com> |
---|---|
date | Wed, 15 Apr 2015 08:19:36 -0700 |
parents | abe835fc4a79 |
children | 19fa0cb71cd3 |
comparison
equal
deleted
inserted
replaced
25013:277aba2c151a | 25014:7e5d5160073b |
---|---|
374 HG: Enter commit message. Lines beginning with 'HG:' are removed. | 374 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
375 HG: {extramsg} | 375 HG: {extramsg} |
376 HG: -- | 376 HG: -- |
377 HG: user: {author}\n{ifeq(p2rev, "-1", "", | 377 HG: user: {author}\n{ifeq(p2rev, "-1", "", |
378 "HG: branch merge\n") | 378 "HG: branch merge\n") |
379 }HG: branch '{branch}'\n{if(currentbookmark, | 379 }HG: branch '{branch}'\n{if(activebookmark, |
380 "HG: bookmark '{currentbookmark}'\n") }{subrepos % | 380 "HG: bookmark '{activebookmark}'\n") }{subrepos % |
381 "HG: subrepo {subrepo}\n" }{file_adds % | 381 "HG: subrepo {subrepo}\n" }{file_adds % |
382 "HG: added {file}\n" }{file_mods % | 382 "HG: added {file}\n" }{file_mods % |
383 "HG: changed {file}\n" }{file_dels % | 383 "HG: changed {file}\n" }{file_dels % |
384 "HG: removed {file}\n" }{if(files, "", | 384 "HG: removed {file}\n" }{if(files, "", |
385 "HG: no files changed\n")} | 385 "HG: no files changed\n")} |