This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2046

py3: add b'' to literals in check-config.py
ClosedPublic

Authored by pulkit on Feb 5 2018, 3:23 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG2912bed9b0c7: py3: add b'' to literals in check-config.py
Summary
  1. skip-blame because we are just adding b''

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Feb 5 2018, 3:23 AM
yuja accepted this revision.Feb 5 2018, 9:07 AM
This revision is now accepted and ready to land.Feb 5 2018, 9:07 AM
Closed by commit rHG2912bed9b0c7: py3: add b'' to literals in check-config.py (authored by pulkit). · Explain WhyFeb 5 2018, 9:27 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/check-config.py (38 lines)

Diff 5217

contrib/check-config.py

from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import re import re
import sys import sys
foundopts = {} foundopts = {}
documented = {} documented = {}
allowinconsistent = set() allowinconsistent = set()
configre = re.compile(r''' configre = re.compile(br'''
# Function call # Function call
ui\.config(?P<ctype>|int|bool|list)\( ui\.config(?P<ctype>|int|bool|list)\(
# First argument. # First argument.
['"](?P<section>\S+)['"],\s* ['"](?P<section>\S+)['"],\s*
# Second argument # Second argument
['"](?P<option>\S+)['"](,\s+ ['"](?P<option>\S+)['"](,\s+
(?:default=)?(?P<default>\S+?))? (?:default=)?(?P<default>\S+?))?
\)''', re.VERBOSE | re.MULTILINE) \)''', re.VERBOSE | re.MULTILINE)
configwithre = re.compile(''' configwithre = re.compile(b'''
ui\.config(?P<ctype>with)\( ui\.config(?P<ctype>with)\(
# First argument is callback function. This doesn't parse robustly # First argument is callback function. This doesn't parse robustly
# if it is e.g. a function call. # if it is e.g. a function call.
[^,]+,\s* [^,]+,\s*
['"](?P<section>\S+)['"],\s* ['"](?P<section>\S+)['"],\s*
['"](?P<option>\S+)['"](,\s+ ['"](?P<option>\S+)['"](,\s+
(?:default=)?(?P<default>\S+?))? (?:default=)?(?P<default>\S+?))?
\)''', re.VERBOSE | re.MULTILINE) \)''', re.VERBOSE | re.MULTILINE)
configpartialre = (r"""ui\.config""") configpartialre = (br"""ui\.config""")
ignorere = re.compile(r''' 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)
def main(args): def main(args):
for f in args: for f in args:
sect = '' sect = b''
prevname = '' prevname = b''
confsect = '' confsect = b''
carryover = '' carryover = b''
linenum = 0 linenum = 0
for l in open(f, 'rb'): for l in open(f, 'rb'):
linenum += 1 linenum += 1
# check topic-like bits # check topic-like bits
m = re.match('\s*``(\S+)``', l) m = re.match(b'\s*``(\S+)``', l)
if m: if m:
prevname = m.group(1) prevname = m.group(1)
if re.match('^\s*-+$', l): if re.match(b'^\s*-+$', l):
sect = prevname sect = prevname
prevname = '' prevname = b''
if sect and prevname: if sect and prevname:
name = sect + '.' + prevname name = sect + b'.' + prevname
documented[name] = 1 documented[name] = 1
# check docstring bits # check docstring bits
m = re.match(r'^\s+\[(\S+)\]', l) m = re.match(br'^\s+\[(\S+)\]', l)
if m: if m:
confsect = m.group(1) confsect = m.group(1)
continue continue
m = re.match(r'^\s+(?:#\s*)?(\S+) = ', l) m = re.match(br'^\s+(?:#\s*)?(\S+) = ', l)
if m: if m:
name = confsect + '.' + m.group(1) name = confsect + b'.' + m.group(1)
documented[name] = 1 documented[name] = 1
# like the bugzilla extension # like the bugzilla extension
m = re.match(r'^\s*(\S+\.\S+)$', l) m = re.match(br'^\s*(\S+\.\S+)$', l)
if m: if m:
documented[m.group(1)] = 1 documented[m.group(1)] = 1
# like convert # like convert
m = re.match(r'^\s*:(\S+\.\S+):\s+', l) m = re.match(br'^\s*:(\S+\.\S+):\s+', l)
if m: if m:
documented[m.group(1)] = 1 documented[m.group(1)] = 1
# quoted in help or docstrings # quoted in help or docstrings
m = re.match(r'.*?``(\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') == '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') + "." + m.group('option') name = m.group('section') + "." + m.group('option')
default = m.group('default') default = m.group('default')
if default in (None, 'False', 'None', '0', '[]', '""', "''"): if default in (None, 'False', 'None', '0', '[]', '""', "''"):
default = '' default = ''
if re.match('[a-z.]+$', default): if re.match(b'[a-z.]+$', default):
default = '<variable>' default = '<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(l.rstrip())
print("conflict on %s: %r != %r" % (name, (ctype, default), print("conflict on %s: %r != %r" % (name, (ctype, default),
foundopts[name])) foundopts[name]))
print("at %s:%d:" % (f, linenum)) print("at %s:%d:" % (f, linenum))
foundopts[name] = (ctype, default) foundopts[name] = (ctype, default)