ui: suppress aliases when HGPLAIN is set

mercurial/ui.py

@@ -84,6 +84,8 b' 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]
 

tests/test-hgrc

@@ -37,6 +37,8 b' 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:...:"

tests/test-hgrc.out

@@ -11,6 +11,7 b' 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