This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6468

narrowspec: replace one recursion-avoidance hack with another
ClosedPublic

Authored by martinvonz on May 31 2019, 7:34 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4738c292a520: narrowspec: replace one recursion-avoidance hack with another
Summary

When updating the working copy narrowspec, we call context.walk() in
order to find which files to update the working copy
with. context.walk() calls repo.narrowmatch(). In order to avoid
infinite recursion in this case, we have a hack that assigns the new
values for repo.narrowpats and repo._narrowmatch. However, doing that
of course breaks future invalidation of those properties (they're
@storecache'd). Let's instead avoid the infinite recursion by setting
a flag on the repo instance when we're updating the working copy.

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

martinvonz created this revision.May 31 2019, 7:34 PM
Closed by commit rHG4738c292a520: narrowspec: replace one recursion-avoidance hack with another (authored by martinvonz). · Explain WhyJun 3 2019, 1:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/narrowspec.py (7 lines)

Diff 15331

mercurial/narrowspec.py

mf = repo['.'].manifest() mf = repo['.'].manifest()
for f in files: for f in files:
if not repo.wvfs.exists(f): if not repo.wvfs.exists(f):
addgaction((f, (mf.flags(f), False), "narrowspec updated")) addgaction((f, (mf.flags(f), False), "narrowspec updated"))
merge.applyupdates(repo, actions, wctx=repo[None], merge.applyupdates(repo, actions, wctx=repo[None],
mctx=repo['.'], overwrite=False) mctx=repo['.'], overwrite=False)
def checkworkingcopynarrowspec(repo): def checkworkingcopynarrowspec(repo):
# Avoid infinite recursion when updating the working copy
if getattr(repo, '_updatingnarrowspec', False):
return
storespec = repo.svfs.tryread(FILENAME) storespec = repo.svfs.tryread(FILENAME)
wcspec = repo.vfs.tryread(DIRSTATE_FILENAME) wcspec = repo.vfs.tryread(DIRSTATE_FILENAME)
if wcspec != storespec: if wcspec != storespec:
raise error.Abort(_("working copy's narrowspec is stale"), raise error.Abort(_("working copy's narrowspec is stale"),
hint=_("run 'hg tracked --update-working-copy'")) hint=_("run 'hg tracked --update-working-copy'"))
def updateworkingcopy(repo, assumeclean=False): def updateworkingcopy(repo, assumeclean=False):
"""updates the working copy and dirstate from the store narrowspec """updates the working copy and dirstate from the store narrowspec
When assumeclean=True, files that are not known to be clean will also When assumeclean=True, files that are not known to be clean will also
be deleted. It is then up to the caller to make sure they are clean. be deleted. It is then up to the caller to make sure they are clean.
""" """
oldspec = repo.vfs.tryread(DIRSTATE_FILENAME) oldspec = repo.vfs.tryread(DIRSTATE_FILENAME)
newspec = repo.svfs.tryread(FILENAME) newspec = repo.svfs.tryread(FILENAME)
repo._updatingnarrowspec = True
oldincludes, oldexcludes = parseconfig(repo.ui, oldspec) oldincludes, oldexcludes = parseconfig(repo.ui, oldspec)
newincludes, newexcludes = parseconfig(repo.ui, newspec) newincludes, newexcludes = parseconfig(repo.ui, newspec)
oldmatch = match(repo.root, include=oldincludes, exclude=oldexcludes) oldmatch = match(repo.root, include=oldincludes, exclude=oldexcludes)
newmatch = match(repo.root, include=newincludes, exclude=newexcludes) newmatch = match(repo.root, include=newincludes, exclude=newexcludes)
addedmatch = matchmod.differencematcher(newmatch, oldmatch) addedmatch = matchmod.differencematcher(newmatch, oldmatch)
removedmatch = matchmod.differencematcher(oldmatch, newmatch) removedmatch = matchmod.differencematcher(oldmatch, newmatch)
repo.ui.status(_('not deleting possibly dirty file %s\n') % uipathfn(f)) repo.ui.status(_('not deleting possibly dirty file %s\n') % uipathfn(f))
for f in sorted(status.unknown): for f in sorted(status.unknown):
repo.ui.status(_('not deleting unknown file %s\n') % uipathfn(f)) repo.ui.status(_('not deleting unknown file %s\n') % uipathfn(f))
for f in sorted(status.ignored): for f in sorted(status.ignored):
repo.ui.status(_('not deleting ignored file %s\n') % uipathfn(f)) repo.ui.status(_('not deleting ignored file %s\n') % uipathfn(f))
for f in clean + trackeddirty: for f in clean + trackeddirty:
ds.drop(f) ds.drop(f)
repo.narrowpats = newincludes, newexcludes
repo._narrowmatch = newmatch
pctx = repo['.'] pctx = repo['.']
newfiles = [f for f in pctx.manifest().walk(addedmatch) if f not in ds] newfiles = [f for f in pctx.manifest().walk(addedmatch) if f not in ds]
for f in newfiles: for f in newfiles:
ds.normallookup(f) ds.normallookup(f)
_writeaddedfiles(repo, pctx, newfiles) _writeaddedfiles(repo, pctx, newfiles)
repo._updatingnarrowspec = False