This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5059

contrib: fix up output in check-config.py to use strs to avoid b prefixes
ClosedPublic

Authored by durin42 on Oct 13 2018, 5:40 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5519697b71b3: contrib: fix up output in check-config.py to use strs to avoid b prefixes

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Oct 13 2018, 5:40 AM
durin42 updated this revision to Diff 12049.Oct 13 2018, 7:57 AM
pulkit accepted this revision.Oct 13 2018, 9:21 AM
Closed by commit rHG5519697b71b3: contrib: fix up output in check-config.py to use strs to avoid b prefixes (authored by durin42). · Explain WhyOct 13 2018, 10:05 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/check-config.py (31 lines)
Mcontrib/python3-whitelist (1 line)

Diff 12027

contrib/check-config.py

configpartialre = (br"""ui\.config""") configpartialre = (br"""ui\.config""")
ignorere = re.compile(br''' ignorere = re.compile(br'''
\#\s(?P<reason>internal|experimental|deprecated|developer|inconsistent)\s \#\s(?P<reason>internal|experimental|deprecated|developer|inconsistent)\s
config:\s(?P<config>\S+\.\S+)$ config:\s(?P<config>\S+\.\S+)$
''', re.VERBOSE | re.MULTILINE) ''', re.VERBOSE | re.MULTILINE)
if sys.version_info[0] > 2:
def mkstr(b):
if isinstance(b, str):
return b
return b.decode('utf8')
else:
mkstr = lambda x: x
def main(args): def main(args):
for f in args: for f in args:
sect = b'' sect = b''
prevname = b'' prevname = b''
confsect = b'' confsect = b''
carryover = b'' carryover = b''
linenum = 0 linenum = 0
for l in open(f, 'rb'): for l in open(f, 'rb'):
# quoted in help or docstrings # quoted in help or docstrings
m = re.match(br'.*?``(\S+\.\S+)``', l) m = re.match(br'.*?``(\S+\.\S+)``', l)
if m: if m:
documented[m.group(1)] = 1 documented[m.group(1)] = 1
# look for ignore markers # look for ignore markers
m = ignorere.search(l) m = ignorere.search(l)
if m: if m:
if m.group('reason') == 'inconsistent': if m.group('reason') == b'inconsistent':
allowinconsistent.add(m.group('config')) allowinconsistent.add(m.group('config'))
else: else:
documented[m.group('config')] = 1 documented[m.group('config')] = 1
# look for code-like bits # look for code-like bits
line = carryover + l line = carryover + l
m = configre.search(line) or configwithre.search(line) m = configre.search(line) or configwithre.search(line)
if m: if m:
ctype = m.group('ctype') ctype = m.group('ctype')
if not ctype: if not ctype:
ctype = 'str' ctype = 'str'
name = m.group('section') + b"." + m.group('option') name = m.group('section') + b"." + m.group('option')
default = m.group('default') default = m.group('default')
if default in (None, 'False', 'None', '0', '[]', '""', "''"): if default in (
None, b'False', b'None', b'0', b'[]', b'""', b"''"):
default = b'' default = b''
if re.match(b'[a-z.]+$', default): if re.match(b'[a-z.]+$', default):
default = b'<variable>' default = b'<variable>'
if (name in foundopts and (ctype, default) != foundopts[name] if (name in foundopts and (ctype, default) != foundopts[name]
and name not in allowinconsistent): and name not in allowinconsistent):
print(l.rstrip()) print(mkstr(l.rstrip()))
print("conflict on %s: %r != %r" % (name, (ctype, default), fctype, fdefault = foundopts[name]
foundopts[name])) print("conflict on %s: %r != %r" % (
print("at %s:%d:" % (f, linenum)) mkstr(name),
(mkstr(ctype), mkstr(default)),
(mkstr(fctype), mkstr(fdefault))))
print("at %s:%d:" % (mkstr(f), linenum))
foundopts[name] = (ctype, default) foundopts[name] = (ctype, default)
carryover = b'' carryover = b''
else: else:
m = re.search(configpartialre, line) m = re.search(configpartialre, line)
if m: if m:
carryover = line carryover = line
else: else:
carryover = b'' carryover = b''
for name in sorted(foundopts): for name in sorted(foundopts):
if name not in documented: if name not in documented:
if not (name.startswith(b"devel.") or if not (name.startswith(b"devel.") or
name.startswith(b"experimental.") or name.startswith(b"experimental.") or
name.startswith(b"debug.")): name.startswith(b"debug.")):
ctype, default = foundopts[name] ctype, default = foundopts[name]
if default: if default:
if isinstance(default, bytes):
default = mkstr(default)
default = ' [%s]' % default default = ' [%s]' % default
print("undocumented: %s (%s)%s" % (name, ctype, default)) elif isinstance(default, bytes):
default = mkstr(default)
print("undocumented: %s (%s)%s" % (
mkstr(name), mkstr(ctype), default))
if __name__ == "__main__": if __name__ == "__main__":
if len(sys.argv) > 1: if len(sys.argv) > 1:
sys.exit(main(sys.argv[1:])) sys.exit(main(sys.argv[1:]))
else: else:
sys.exit(main([l.rstrip() for l in sys.stdin])) sys.exit(main([l.rstrip() for l in sys.stdin]))

contrib/python3-whitelist

test-cappedreader.py test-cappedreader.py
test-casecollision.t test-casecollision.t
test-cat.t test-cat.t
test-cbor.py test-cbor.py
test-censor.t test-censor.t
test-changelog-exec.t test-changelog-exec.t
test-check-code.t test-check-code.t
test-check-commit.t test-check-commit.t
test-check-config.py
test-check-execute.t test-check-execute.t
test-check-interfaces.py test-check-interfaces.py
test-check-module-imports.t test-check-module-imports.t
test-check-py3-compat.t test-check-py3-compat.t
test-check-pyflakes.t test-check-pyflakes.t
test-check-pylint.t test-check-pylint.t
test-check-shbang.t test-check-shbang.t
test-children.t test-children.t