# HG changeset patch # User Patrick Mezard # Date 1259616189 -3600 # Node ID 0aa1a632262be8a29c08a1e159239f7857d43be9 # Parent ad44e1f8b3f3fa2f0728deb55623ad444a753ed5 cmdutil: fix missing default 'extra' template diff -r ad44e1f8b3f3 -r 0aa1a632262b mercurial/cmdutil.py --- a/mercurial/cmdutil.py Mon Nov 30 19:52:03 2009 +0100 +++ b/mercurial/cmdutil.py Mon Nov 30 22:23:09 2009 +0100 @@ -755,7 +755,8 @@ cache={ 'parent': '{rev}:{node|formatnode} ', 'manifest': '{rev}:{node|formatnode}', - 'filecopy': '{name} ({source})'}) + 'filecopy': '{name} ({source})', + 'extra': '{key}={value|stringescape}'}) # Cache mapping from rev to a tuple with tag date, tag # distance and tag name self._latesttagcache = {-1: (0, 0, 'null')} diff -r ad44e1f8b3f3 -r 0aa1a632262b tests/test-command-template --- a/tests/test-command-template Mon Nov 30 19:52:03 2009 +0100 +++ b/tests/test-command-template Mon Nov 30 22:23:09 2009 +0100 @@ -93,7 +93,7 @@ echo "# keys work" for key in author branches date desc file_adds file_dels file_mods \ - files manifest node parents rev tags diffstat; do + files manifest node parents rev tags diffstat extras; do for mode in '' --verbose --debug; do hg log $mode --template "$key$mode: {$key}\n" done diff -r ad44e1f8b3f3 -r 0aa1a632262b tests/test-command-template.out --- a/tests/test-command-template.out Mon Nov 30 19:52:03 2009 +0100 +++ b/tests/test-command-template.out Mon Nov 30 22:23:09 2009 +0100 @@ -569,6 +569,33 @@ diffstat--debug: 1: +4/-0 diffstat--debug: 1: +2/-0 diffstat--debug: 1: +1/-0 +extras: branch=default +extras: branch=default +extras: branch=default +extras: branch=default +extras: branch=foo +extras: branch=default +extras: branch=default +extras: branch=default +extras: branch=default +extras--verbose: branch=default +extras--verbose: branch=default +extras--verbose: branch=default +extras--verbose: branch=default +extras--verbose: branch=foo +extras--verbose: branch=default +extras--verbose: branch=default +extras--verbose: branch=default +extras--verbose: branch=default +extras--debug: branch=default +extras--debug: branch=default +extras--debug: branch=default +extras--debug: branch=default +extras--debug: branch=foo +extras--debug: branch=default +extras--debug: branch=default +extras--debug: branch=default +extras--debug: branch=default # filters work hostname