( )⚙ D4829 narrow: avoid looking up dirstate again when editing dirstate

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4829

narrow: avoid looking up dirstate again when editing dirstate
ClosedPublic

Authored by martinvonz on Oct 1 2018, 6:48 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG1a7d901a0a0c: narrow: avoid looking up dirstate again when editing dirstate
rHGe29d83d9599d: narrow: avoid looking up dirstate again when editing dirstate
Summary

The narrow extension overrides the dirstate editing functions to
restrict paths outside the narrowspec. These overrides access the
dirstate from repo.dirstate instead of using the "self" reference
passed to the overridden functions. I don't see a reason for this and
it caused me problems with a later patch (it caused infinite recursion
when I modified localrepo.dirstate()), so let's change it.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Oct 1 2018, 6:48 PM
Closed by commit rHGe29d83d9599d: narrow: avoid looking up dirstate again when editing dirstate (authored by martinvonz). · Explain WhyOct 2 2018, 8:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowdirstate.py (3 lines)

Diff 11539

hgext/narrow/narrowdirstate.py

match as matchmod, match as matchmod,
) )
def wrapdirstate(repo, dirstate): def wrapdirstate(repo, dirstate):
"""Add narrow spec dirstate ignore, block changes outside narrow spec.""" """Add narrow spec dirstate ignore, block changes outside narrow spec."""
def _editfunc(fn): def _editfunc(fn):
def _wrapper(self, *args): def _wrapper(self, *args):
dirstate = repo.dirstate
narrowmatch = repo.narrowmatch() narrowmatch = repo.narrowmatch()
for f in args: for f in args:
if f is not None and not narrowmatch(f) and f not in dirstate: if f is not None and not narrowmatch(f) and f not in self:
raise error.Abort(_("cannot track '%s' - it is outside " + raise error.Abort(_("cannot track '%s' - it is outside " +
"the narrow clone") % f) "the narrow clone") % f)
return fn(self, *args) return fn(self, *args)
return _wrapper return _wrapper
class narrowdirstate(dirstate.__class__): class narrowdirstate(dirstate.__class__):
def walk(self, match, subrepos, unknown, ignored, full=True, def walk(self, match, subrepos, unknown, ignored, full=True,
narrowonly=True): narrowonly=True):