# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1426531305 18000
# Node ID 6ff513495a8b0b01268254c384572b07cc9b2ae8
# Parent  8d55286fe5e230040ab2e0edaec1cb18e5c8ceeb# Parent  6136704b975df292819647ba8ac46209487fbc46
merge with stable

diff -r 8d55286fe5e2 -r 6ff513495a8b mercurial/templates/map-cmdline.default
--- a/mercurial/templates/map-cmdline.default	Mon Mar 16 13:32:28 2015 -0500
+++ b/mercurial/templates/map-cmdline.default	Mon Mar 16 13:41:45 2015 -0500
@@ -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",
diff -r 8d55286fe5e2 -r 6ff513495a8b tests/test-command-template.t
--- a/tests/test-command-template.t	Mon Mar 16 13:32:28 2015 -0500
+++ b/tests/test-command-template.t	Mon Mar 16 13:41:45 2015 -0500
@@ -104,6 +104,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
@@ -122,6 +126,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