# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1427808702 18000
# Node ID 888dcab69ca3fe817786a7078bb1f66afa203c8b
# Parent  f5de208a635cd1b65d13df180d0c638edc53c55b# Parent  e810c7da1caef95ac7bfb115f4da3e6edeb3c24f
merge with stable

diff -r f5de208a635c -r 888dcab69ca3 mercurial/templates/map-cmdline.phases
--- a/mercurial/templates/map-cmdline.phases	Tue Mar 31 08:04:42 2015 -0500
+++ b/mercurial/templates/map-cmdline.phases	Tue Mar 31 08:31:42 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}{lphase}{parents}{user}{ldate}{summary}\n'
-changeset_quiet = '{node}'
+changeset_quiet = '{lnode}'
 changeset_verbose = '{cset}{branches}{bookmarks}{tags}{lphase}{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 f5de208a635c -r 888dcab69ca3 tests/test-log.t
--- a/tests/test-log.t	Tue Mar 31 08:04:42 2015 -0500
+++ b/tests/test-log.t	Tue Mar 31 08:31:42 2015 -0500
@@ -163,6 +163,9 @@
   summary:     e
   
 
+  $ hg log -f -l1 --style phases -q
+  4:7e4639b4691b
+
 -f, but no args
 
   $ hg log -f