This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6371

record: avoid modifying the matcher passed as a method parameter
ClosedPublic

Authored by mharbison72 on May 11 2019, 10:56 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG19b95afb0c01: record: avoid modifying the matcher passed as a method parameter
Summary

No problem observed, but I remember the previous pattern causing problems with
largefiles and/or subrepos. This special matcher was added in 419ac63fe29c, so
directly modifying the fail callback was probably an oversight in
44611ad4fbd9.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mharbison72 created this revision.May 11 2019, 10:56 PM
Closed by commit rHG19b95afb0c01: record: avoid modifying the matcher passed as a method parameter (authored by mharbison72). · Explain WhyMay 13 2019, 7:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)

Diff 15065

mercurial/cmdutil.py

'(use "hg commit" instead)')) '(use "hg commit" instead)'))
def fail(f, msg): def fail(f, msg):
raise error.Abort('%s: %s' % (f, msg)) raise error.Abort('%s: %s' % (f, msg))
force = opts.get('force') force = opts.get('force')
if not force: if not force:
vdirs = [] vdirs = []
match = matchmod.badmatch(match, fail)
match.explicitdir = vdirs.append match.explicitdir = vdirs.append
match.bad = fail
status = repo.status(match=match) status = repo.status(match=match)
overrides = {(b'ui', b'commitsubrepos'): True} overrides = {(b'ui', b'commitsubrepos'): True}
with repo.ui.configoverride(overrides, b'record'): with repo.ui.configoverride(overrides, b'record'):
# subrepoutil.precommit() modifies the status # subrepoutil.precommit() modifies the status
tmpstatus = scmutil.status(copymod.copy(status[0]), tmpstatus = scmutil.status(copymod.copy(status[0]),