Mercurial > hg
changeset 3461:451ec905625b
Add new branch info to templater and use it in map-cmdline.default.
The template currently shows old (hg log -b style) branch tags, too,
but not in the same way as the built in changeset_printer.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 18 Oct 2006 17:58:51 +0200 |
| parents | 10b6fc51f672 |
| children | fab28100ea88 |
| files | mercurial/templater.py templates/map-cmdline.default |
| diffstat | 2 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templater.py Wed Oct 18 12:26:12 2006 +0200 +++ b/mercurial/templater.py Wed Oct 18 17:58:51 2006 +0200 @@ -431,14 +431,15 @@ if endname in self.t: yield self.t(endname, **args) - if brinfo: - def showbranches(**args): - if changenode in brinfo: - for x in showlist('branch', brinfo[changenode], - plural='branches', **args): - yield x - else: - showbranches = '' + def showbranches(**args): + branch = changes[5].get("branch") + if branch: + yield showlist('branch', [branch], plural='branches', **args) + # add old style branches if requested + if brinfo and changenode in brinfo: + for x in showlist('branch', brinfo[changenode], + plural='branches', **args): + yield x if self.ui.debugflag: def showmanifest(**args):
--- a/templates/map-cmdline.default Wed Oct 18 12:26:12 2006 +0200 +++ b/templates/map-cmdline.default Wed Oct 18 17:58:51 2006 +0200 @@ -1,7 +1,7 @@ -changeset = 'changeset: {rev}:{node|short}\n{tags}{short_parents}user: {author}\ndate: {date|date}\nsummary: {desc|firstline}\n\n' +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{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{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{files}{file_adds}{file_dels}{file_copies}description:\n{desc|strip}\n\n\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' start_files = 'files: ' file = ' {file}' end_files = '\n' @@ -17,4 +17,5 @@ short_parent = 'parent: {rev}:{node|short}\n' parent = 'parent: {rev}:{node}\n' manifest = 'manifest: {rev}:{node}\n' +branch = 'branch: {branch}\n' tag = 'tag: {tag}\n'