diff -r eb1b964b354b -r eb24f1d1b50b mercurial/templates/map-cmdline.show --- a/mercurial/templates/map-cmdline.show Wed Oct 18 12:19:53 2017 -0500 +++ b/mercurial/templates/map-cmdline.show Tue Oct 17 20:25:43 2017 +0200 @@ -1,8 +1,8 @@ # TODO there are a few deficiencies in this file: # * The "namespace" of the labels needs to be worked out. We currently # piggyback on existing values so color works. -# * Obsolescence isn't considered for node labels. See _cset_labels in -# map-cmdline.default. + +%include map-cmdline.default [templates] showbookmarks = '{if(active, "*", " ")} {pad(bookmark, longestbookmarklen + 4)}{shortest(node, nodelen)}\n' @@ -10,7 +10,7 @@ showwork = '{cset_shortnode}{namespaces % cset_namespace} {cset_shortdesc}' showstack = '{showwork}' -cset_shortnode = '{label("log.changeset changeset.{phase}", shortest(node, nodelen))}' +cset_shortnode = '{labelcset(shortest(node, nodelen))}' # Treat branch and tags specially so we don't display "default" or "tip" cset_namespace = '{ifeq(namespace, "branches", names_branches, ifeq(namespace, "tags", names_tags, names_others))}'