Mercurial > hg-stable
changeset 31700:d73490957d61
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.
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Tue, 28 Mar 2017 08:40:12 -0700 |
| parents | 10d88dc7c010 |
| children | 9d3d56aa1a9f |
| files | mercurial/chgserver.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)