# HG changeset patch
# User Brodie Rao <me+hg@dackz.net>
# Date 2010-02-18 21:50:49
# Node ID 42afde35e9f7ad2e169c44df87509cad13a39548
# Parent  b3311e26f94f69eeb0e7df4fc3d7b743f3d86969

ui: suppress aliases when HGPLAIN is set

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -84,6 +84,8 @@ class ui(object):
                       'verbose'):
                 if k in cfg['ui']:
                     del cfg['ui'][k]
+            for k, v in cfg.items('alias'):
+                del cfg['alias'][k]
             for k, v in cfg.items('defaults'):
                 del cfg['defaults'][k]
 
diff --git a/tests/test-hgrc b/tests/test-hgrc
--- a/tests/test-hgrc
+++ b/tests/test-hgrc
@@ -37,6 +37,8 @@ echo "traceback=true" >> $HGRCPATH
 echo "verbose=true" >> $HGRCPATH
 echo "[defaults]" >> $HGRCPATH
 echo "identify=-n" >> $HGRCPATH
+echo "[alias]" >> $HGRCPATH
+echo "log=log -g" >> $HGRCPATH
 
 echo '% customized hgrc'
 hg showconfig | sed -e "s:$p:...:"
diff --git a/tests/test-hgrc.out b/tests/test-hgrc.out
--- a/tests/test-hgrc.out
+++ b/tests/test-hgrc.out
@@ -11,6 +11,7 @@ foo.bar=a\nb\nc\nde\nfg
 foo.baz=bif cb
 hg: config error at $HGRCPATH:1: cannot include /no-such-file (No such file or directory)
 % customized hgrc
+.../.hgrc:10: alias.log=log -g
 .../.hgrc:8: defaults.identify=-n
 .../.hgrc:2: ui.debug=true
 .../.hgrc:3: ui.fallbackencoding=ASCII