# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1267559938 -3600
# Node ID fb20362f97820bb353dd3851745506ce9c46264d
# Parent  992723445a29aede17a5ce6e741c0a35be36bb1d# Parent  c4b321baf4a4306da5217c3ea06f1d807f504b66
Merge with hg-i18n

diff -r c4b321baf4a4 -r fb20362f9782 mercurial/ui.py
--- 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]
diff -r c4b321baf4a4 -r fb20362f9782 tests/test-hgrc
--- 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
diff -r c4b321baf4a4 -r fb20362f9782 tests/test-hgrc.out
--- 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