( )⚙ D6726 fix: correctly parse the :metadata subconfig

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6726

fix: correctly parse the :metadata subconfig
ClosedPublic

Authored by hooper on Aug 14 2019, 4:17 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2d70b1118af2: fix: correctly parse the :metadata subconfig
rHGd82e9f7e7440: fix: correctly parse the :metadata subconfig
Summary

It's being handled as a string instead of a bool, though the thruthiness of the
string makes the feature still essentially work. Added a regression test.

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

hooper created this revision.Aug 14 2019, 4:17 PM
hooper added a commit: rHGd82e9f7e7440: fix: correctly parse the :metadata subconfig.Aug 14 2019, 4:42 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd82e9f7e7440: fix: correctly parse the :metadata subconfig (authored by hooper). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (3 lines)
Mtests/test-fix-metadata.t (11 lines)

Diff 16206

hgext/fix.py

configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
# Register the suboptions allowed for each configured fixer, and default values. # Register the suboptions allowed for each configured fixer, and default values.
FIXER_ATTRS = { FIXER_ATTRS = {
'command': None, 'command': None,
'linerange': None, 'linerange': None,
'pattern': None, 'pattern': None,
'priority': 0, 'priority': 0,
'metadata': False, 'metadata': 'false',
'skipclean': 'true', 'skipclean': 'true',
} }
for key, default in FIXER_ATTRS.items(): for key, default in FIXER_ATTRS.items():
configitem('fix', '.*(:%s)?' % key, default=default, generic=True) configitem('fix', '.*(:%s)?' % key, default=default, generic=True)
# A good default size allows most source code files to be fixed, but avoids # A good default size allows most source code files to be fixed, but avoids
# letting fixer tools choke on huge inputs, which could be surprising to the # letting fixer tools choke on huge inputs, which could be surprising to the
fixers = {} fixers = {}
for name in fixernames(ui): for name in fixernames(ui):
fixers[name] = Fixer() fixers[name] = Fixer()
attrs = ui.configsuboptions('fix', name)[1] attrs = ui.configsuboptions('fix', name)[1]
for key, default in FIXER_ATTRS.items(): for key, default in FIXER_ATTRS.items():
setattr(fixers[name], pycompat.sysstr('_' + key), setattr(fixers[name], pycompat.sysstr('_' + key),
attrs.get(key, default)) attrs.get(key, default))
fixers[name]._priority = int(fixers[name]._priority) fixers[name]._priority = int(fixers[name]._priority)
fixers[name]._metadata = stringutil.parsebool(fixers[name]._metadata)
fixers[name]._skipclean = stringutil.parsebool(fixers[name]._skipclean) fixers[name]._skipclean = stringutil.parsebool(fixers[name]._skipclean)
# Don't use a fixer if it has no pattern configured. It would be # Don't use a fixer if it has no pattern configured. It would be
# dangerous to let it affect all files. It would be pointless to let it # dangerous to let it affect all files. It would be pointless to let it
# affect no files. There is no reasonable subset of files to use as the # affect no files. There is no reasonable subset of files to use as the
# default. # default.
if fixers[name]._pattern is None: if fixers[name]._pattern is None:
ui.warn( ui.warn(
_('fixer tool has no pattern configuration: %s\n') % (name,)) _('fixer tool has no pattern configuration: %s\n') % (name,))

tests/test-fix-metadata.t

Configure some fixer tools based on the output defined above, and enable the Configure some fixer tools based on the output defined above, and enable the
hooks defined above. Disable parallelism to make output of the parallel file hooks defined above. Disable parallelism to make output of the parallel file
processing phase stable. processing phase stable.
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> fix = > fix =
> [fix] > [fix]
> metadatafalse:command=cat $TESTTMP/missing
> metadatafalse:pattern=metadatafalse
> metadatafalse:metadata=false
> missing:command=cat $TESTTMP/missing > missing:command=cat $TESTTMP/missing
> missing:pattern=missing > missing:pattern=missing
> missing:metadata=true > missing:metadata=true
> invalid:command=cat $TESTTMP/invalid > invalid:command=cat $TESTTMP/invalid
> invalid:pattern=invalid > invalid:pattern=invalid
> invalid:metadata=true > invalid:metadata=true
> valid:command=cat $TESTTMP/valid > valid:command=cat $TESTTMP/valid
> valid:pattern=valid > valid:pattern=valid
> valid:metadata=true > valid:metadata=true
> [hooks] > [hooks]
> postfixfile = python:$TESTTMP/postfixhook.py:file > postfixfile = python:$TESTTMP/postfixhook.py:file
> postfix = python:$TESTTMP/postfixhook.py:summarize > postfix = python:$TESTTMP/postfixhook.py:summarize
> [worker] > [worker]
> enabled=false > enabled=false
> EOF > EOF
See what happens when we execute each of the fixer tools. Some print warnings, See what happens when we execute each of the fixer tools. Some print warnings,
some write back to the file. some write back to the file.
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ printf "old content\n" > metadatafalse
$ printf "old content\n" > invalid $ printf "old content\n" > invalid
$ printf "old content\n" > missing $ printf "old content\n" > missing
$ printf "old content\n" > valid $ printf "old content\n" > valid
$ hg add -q $ hg add -q
$ hg fix -w $ hg fix -w
ignored invalid output from fixer tool: invalid ignored invalid output from fixer tool: invalid
fixed metadatafalse in revision 2147483647 using metadatafalse
ignored invalid output from fixer tool: missing ignored invalid output from fixer tool: missing
fixed valid in revision 2147483647 using valid fixed valid in revision 2147483647 using valid
saw "key" 1 times saw "key" 1 times
fixed 1 files with valid fixed 1 files with valid
fixed the working copy fixed the working copy
$ cat missing invalid valid $ cat metadatafalse
new content
$ cat missing
old content old content
$ cat invalid
old content old content
$ cat valid
new content new content
$ cd .. $ cd ..