This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6727

fix: pass line ranges as value instead of callback
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe9f503074044: fix: pass line ranges as value instead of callback
rHG64a0cb2d4692: fix: pass line ranges as value instead of callback
Summary

The callback no longer takes any arguments from the inner function, so we might
as well call it sooner and pass the value instead. Note the value still needs
to be recomputed every iteration to account for the previous iteration's
changes to the file content.

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:29 PM
hooper added a commit: rHG64a0cb2d4692: fix: pass line ranges as value instead of callback.Aug 14 2019, 4:43 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG64a0cb2d4692: fix: pass line ranges as value instead of callback (authored by hooper). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (7 lines)

Diff 16207

hgext/fix.py

A fixer tool's stdout will become the file's new content if and only if it A fixer tool's stdout will become the file's new content if and only if it
exits with code zero. The fixer tool's working directory is the repository's exits with code zero. The fixer tool's working directory is the repository's
root. root.
""" """
metadata = {} metadata = {}
newdata = fixctx[path].data() newdata = fixctx[path].data()
for fixername, fixer in fixers.iteritems(): for fixername, fixer in fixers.iteritems():
if fixer.affects(opts, fixctx, path): if fixer.affects(opts, fixctx, path):
rangesfn = lambda: lineranges(opts, path, basectxs, fixctx, newdata) ranges = lineranges(opts, path, basectxs, fixctx, newdata)
command = fixer.command(ui, path, rangesfn) command = fixer.command(ui, path, ranges)
if command is None: if command is None:
continue continue
ui.debug('subprocess: %s\n' % (command,)) ui.debug('subprocess: %s\n' % (command,))
proc = subprocess.Popen( proc = subprocess.Popen(
procutil.tonativestr(command), procutil.tonativestr(command),
shell=True, shell=True,
cwd=repo.root, cwd=repo.root,
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
"""Should this fixer run on the file at the given path and context?""" """Should this fixer run on the file at the given path and context?"""
return (self._pattern is not None and return (self._pattern is not None and
scmutil.match(fixctx, [self._pattern], opts)(path)) scmutil.match(fixctx, [self._pattern], opts)(path))
def shouldoutputmetadata(self): def shouldoutputmetadata(self):
"""Should the stdout of this fixer start with JSON and a null byte?""" """Should the stdout of this fixer start with JSON and a null byte?"""
return self._metadata return self._metadata
def command(self, ui, path, rangesfn): def command(self, ui, path, ranges):
"""A shell command to use to invoke this fixer on the given file/lines """A shell command to use to invoke this fixer on the given file/lines
May return None if there is no appropriate command to run for the given May return None if there is no appropriate command to run for the given
parameters. parameters.
""" """
expand = cmdutil.rendercommandtemplate expand = cmdutil.rendercommandtemplate
parts = [expand(ui, self._command, parts = [expand(ui, self._command,
{'rootpath': path, 'basename': os.path.basename(path)})] {'rootpath': path, 'basename': os.path.basename(path)})]
if self._linerange: if self._linerange:
ranges = rangesfn()
if self._skipclean and not ranges: if self._skipclean and not ranges:
# No line ranges to fix, so don't run the fixer. # No line ranges to fix, so don't run the fixer.
return None return None
for first, last in ranges: for first, last in ranges:
parts.append(expand(ui, self._linerange, parts.append(expand(ui, self._linerange,
{'first': first, 'last': last})) {'first': first, 'last': last}))
return ' '.join(parts) return ' '.join(parts)