Mercurial > python-hglib
changeset 195:7c37f08d303d
config: un-break showconfig wrapper when environment variables are used
This was broken when hg was picking up $EDITOR etc and showing that in
the showconfig --debug output. No test because I can't figure out how
to thread the environment variable down into the executed hg binary,
but this fixes the failure on my laptop.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Sun, 10 Dec 2017 12:37:36 -0500 |
| parents | 22767a1e61ac |
| children | c586d02f7cda |
| files | hglib/client.py |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hglib/client.py Sat Nov 11 20:35:55 2017 +0900 +++ b/hglib/client.py Sun Dec 10 12:37:36 2017 -0500 @@ -681,7 +681,8 @@ conf = [] if showsource: - out = util.skiplines(out, b('read config from: ')) + out = util.skiplines(out, (b('read config from: '), + b('set config by: '))) for line in out.splitlines(): m = re.match(b(r"(.+?:(?:\d+:)?) (.*)"), line) t = splitline(m.group(2))