Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
chgserver: do not copy configs set by environment variables
authorJun Wu <quark@fb.com>
Tue, 28 Mar 2017 08:40:12 -0700
changeset 31695 d73490957d61
parent 31694 10d88dc7c010
child 31696 9d3d56aa1a9f
chgserver: do not copy configs set by environment variables Config set by environment variables have a source like "$ENVNAME". They should not be copied because they will be recalculated by rcutil.rccomponents.
mercurial/chgserver.py file | annotate | diff | comparison | revisions 
--- a/mercurial/chgserver.py	Tue Mar 28 07:57:56 2017 -0700
+++ b/mercurial/chgserver.py	Tue Mar 28 08:40:12 2017 -0700
@@ -213,8 +213,8 @@
     # stolen from tortoisehg.util.copydynamicconfig()
     for section, name, value in srcui.walkconfig():
         source = srcui.configsource(section, name)
-        if ':' in source or source == '--config':
-            # path:line or command line
+        if ':' in source or source == '--config' or source.startswith('$'):
+            # path:line or command line, or environ
             continue
         newui.setconfig(section, name, value, source)
mercurial