diff --git a/mercurial/templates/map-cmdline.default b/mercurial/templates/map-cmdline.default --- a/mercurial/templates/map-cmdline.default +++ b/mercurial/templates/map-cmdline.default @@ -30,7 +30,8 @@ lfile_copies_switch = '{if(file_copies_s # General templates _trouble_label = 'trouble.{trouble}' _troubles_labels = '{if(troubles, "changeset.troubled {troubles%_trouble_label}")}' -_cset_labels = '{separate(" ", "log.changeset", "changeset.{phase}", "{_troubles_labels}")}' +_obsolete_label = '{if(obsolete, "changeset.obsolete")}' +_cset_labels = '{separate(" ", "log.changeset", "changeset.{phase}", "{_obsolete_label}", "{_troubles_labels}")}' cset = '{label("{_cset_labels}", "changeset: {rev}:{node|short}")}\n' diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -830,6 +830,13 @@ test the default cmdline template trouble: unstable, bumped summary: add babar + $ hg log -T default -r 'obsolete()' + changeset: 6:3de5eca88c00 + parent: 3:6f9641995072 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: add obsolete_e + test summary output