diff mercurial/commands.py @ 31685:d83e51654c8a

rcutil: let environ override system configs (BC) This is BC because system configs won't be able to override $EDITOR, $PAGER. The new behavior is arguably more rational.
author Jun Wu <quark@fb.com>
date Sun, 26 Mar 2017 21:33:37 -0700
parents 00e569a2da97
children fbc4eb8e2433
line wrap: on
line diff
--- a/mercurial/commands.py	Sun Mar 26 21:27:02 2017 -0700
+++ b/mercurial/commands.py	Sun Mar 26 21:33:37 2017 -0700
@@ -1807,6 +1807,8 @@
     for t, f in rcutil.rccomponents():
         if t == 'path':
             ui.debug('read config from: %s\n' % f)
+        elif t == 'items':
+            pass
         else:
             raise error.ProgrammingError('unknown rctype: %s' % t)
     untrusted = bool(opts.get('untrusted'))