# HG changeset patch # User Thomas Arendsen Hein # Date 1161187772 -7200 # Node ID fab28100ea88495c6441031e08e49527cb4f3ca6 # Parent 451ec905625b56dfc42f7e829e55bf611b7dfda9 Added extra changeset info to templater and map-cmdline.default. diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -310,6 +310,7 @@ common_filters = { "strip": lambda x: x.strip(), "urlescape": lambda x: urllib.quote(x), "user": lambda x: util.shortuser(x), + "stringescape": lambda x: x.encode('string_escape'), } def templatepath(name=None): @@ -464,6 +465,14 @@ class changeset_templater(object): for x in showlist('tag', self.repo.nodetags(changenode), **args): yield x + def showextras(**args): + extras = changes[5].items() + extras.sort() + for key, value in extras: + args = args.copy() + args.update(dict(key=key, value=value)) + yield self.t('extra', **args) + if self.ui.debugflag: files = self.repo.status(log.parents(changenode)[0], changenode)[:3] def showfiles(**args): @@ -499,6 +508,7 @@ class changeset_templater(object): 'parents': showparents, 'rev': rev, 'tags': showtags, + 'extras': showextras, } props = props.copy() props.update(defprops) diff --git a/templates/map-cmdline.default b/templates/map-cmdline.default --- a/templates/map-cmdline.default +++ b/templates/map-cmdline.default @@ -1,7 +1,7 @@ changeset = 'changeset: {rev}:{node|short}\n{branches}{tags}{short_parents}user: {author}\ndate: {date|date}\nsummary: {desc|firstline}\n\n' changeset_quiet = '{rev}:{node|short}\n' changeset_verbose = 'changeset: {rev}:{node|short}\n{branches}{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{files}{file_adds}{file_dels}{file_copies}description:\n{desc|strip}\n\n\n' -changeset_debug = 'changeset: {rev}:{node}\n{branches}{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{files}{file_adds}{file_dels}{file_copies}description:\n{desc|strip}\n\n\n' +changeset_debug = 'changeset: {rev}:{node}\n{branches}{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{files}{file_adds}{file_dels}{file_copies}{extras}description:\n{desc|strip}\n\n\n' start_files = 'files: ' file = ' {file}' end_files = '\n' @@ -19,3 +19,4 @@ parent = 'parent: {rev}:{node}\n' manifest = 'manifest: {rev}:{node}\n' branch = 'branch: {branch}\n' tag = 'tag: {tag}\n' +extra = 'extra: {key}={value|stringescape}\n'