diff --git a/mercurial/templates/map-cmdline.phases b/mercurial/templates/map-cmdline.phases --- a/mercurial/templates/map-cmdline.phases +++ b/mercurial/templates/map-cmdline.phases @@ -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 @@ fullcset = '{label("log.changeset change 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 --git a/tests/test-log.t b/tests/test-log.t --- a/tests/test-log.t +++ b/tests/test-log.t @@ -150,6 +150,9 @@ log on directory summary: e + $ hg log -f -l1 --style phases -q + 4:7e4639b4691b + -f, but no args $ hg log -f