Mercurial > hg

changeset 24304:6136704b975d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates: fix "log -q" output of default style It was changed at 0ded0f0b1c04 unintentionally due to name conflicts.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 14 Mar 2015 22:34:27 +0900
parents b73a22d1d9bf
children 6ff513495a8b dd01834a696f
files mercurial/templates/map-cmdline.default tests/test-command-template.t
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/templates/map-cmdline.default	Fri Mar 13 21:18:59 2015 +0900
+++ b/mercurial/templates/map-cmdline.default	Sat Mar 14 22:34:27 2015 +0900
@@ -1,7 +1,7 @@
 # Base templates. Due to name clashes with existing keywords, we have
 # to replace some keywords with 'lkeyword', for 'labelled keyword'
 changeset = '{cset}{branches}{bookmarks}{tags}{parents}{user}{ldate}{summary}\n'
-changeset_quiet = '{node}'
+changeset_quiet = '{lnode}'
 changeset_verbose = '{cset}{branches}{bookmarks}{tags}{parents}{user}{ldate}{lfiles}{lfile_copies_switch}{description}\n'
 changeset_debug = '{fullcset}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{user}{ldate}{lfile_mods}{lfile_adds}{lfile_dels}{lfile_copies_switch}{extras}{description}\n'
 
@@ -40,7 +40,7 @@
 parent = '{label("log.parent changeset.{phase}",
                   "parent:      {rev}:{node|formatnode}")}\n'
 
-node = '{label("log.node",
+lnode = '{label("log.node",
                 "{rev}:{node|short}")}\n'
 
 manifest = '{label("ui.debug log.manifest",
--- a/tests/test-command-template.t	Fri Mar 13 21:18:59 2015 +0900
+++ b/tests/test-command-template.t	Sat Mar 14 22:34:27 2015 +0900
@@ -101,6 +101,10 @@
   $ hg log -v --style default > style.out
   $ cmp log.out style.out || diff -u log.out style.out
 
+  $ hg log -q > log.out
+  $ hg log -q --style default > style.out
+  $ cmp log.out style.out || diff -u log.out style.out
+
   $ hg log --debug > log.out
   $ hg log --debug --style default > style.out
   $ cmp log.out style.out || diff -u log.out style.out
@@ -119,6 +123,9 @@
   $ hg --color=debug -v log > log.out
   $ hg --color=debug -v log --style default > style.out
   $ cmp log.out style.out || diff -u log.out style.out
+  $ hg --color=debug -q log > log.out
+  $ hg --color=debug -q log --style default > style.out
+  $ cmp log.out style.out || diff -u log.out style.out
   $ hg --color=debug --debug log > log.out
   $ hg --color=debug --debug log --style default > style.out
   $ cmp log.out style.out || diff -u log.out style.out