Mercurial > hg

changeset 10570:fb20362f9782 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hg-i18n
author Martin Geisler <mg@lazybytes.net>
date Tue, 02 Mar 2010 20:58:58 +0100
parents 992723445a29 (diff) c4b321baf4a4 (current diff)
children d6c1279468ca
files
diffstat 3 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/ui.py	Tue Mar 02 18:36:37 2010 +0100
+++ b/mercurial/ui.py	Tue Mar 02 20:58:58 2010 +0100
@@ -81,6 +81,7 @@
 
         if self.plain():
             for k in ('debug', 'fallbackencoding', 'quiet', 'slash',
+                      'logtemplate', 'style',
                       'traceback', 'verbose'):
                 if k in cfg['ui']:
                     del cfg['ui'][k]
--- a/tests/test-hgrc	Tue Mar 02 18:36:37 2010 +0100
+++ b/tests/test-hgrc	Tue Mar 02 20:58:58 2010 +0100
@@ -36,6 +36,8 @@
 echo "slash=true" >> $HGRCPATH
 echo "traceback=true" >> $HGRCPATH
 echo "verbose=true" >> $HGRCPATH
+echo "style=~/.hgstyle" >> $HGRCPATH
+echo "logtemplate={node}" >> $HGRCPATH
 echo "[defaults]" >> $HGRCPATH
 echo "identify=-n" >> $HGRCPATH
 echo "[alias]" >> $HGRCPATH
--- a/tests/test-hgrc.out	Tue Mar 02 18:36:37 2010 +0100
+++ b/tests/test-hgrc.out	Tue Mar 02 20:58:58 2010 +0100
@@ -11,14 +11,16 @@
 foo.baz=bif cb
 hg: config error at $HGRCPATH:1: cannot include /no-such-file (No such file or directory)
 % customized hgrc
-.../.hgrc:11: alias.log=log -g
-.../.hgrc:9: defaults.identify=-n
+.../.hgrc:13: alias.log=log -g
+.../.hgrc:11: defaults.identify=-n
 .../.hgrc:2: ui.debug=true
 .../.hgrc:3: ui.fallbackencoding=ASCII
 .../.hgrc:4: ui.quiet=true
 .../.hgrc:5: ui.slash=true
 .../.hgrc:6: ui.traceback=true
 .../.hgrc:7: ui.verbose=true
+.../.hgrc:8: ui.style=~/.hgstyle
+.../.hgrc:9: ui.logtemplate={node}
 % plain hgrc
 none: ui.traceback=True
 none: ui.verbose=False