# HG changeset patch # User Augie Fackler # Date 1512927456 18000 # Node ID 7c37f08d303d7657269a39feeacc08607e2949eb # Parent 22767a1e61acff3521c0b84589546906274cdbcf 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. diff -r 22767a1e61ac -r 7c37f08d303d hglib/client.py --- 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))