This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5275

tests: update narrowspec when narrowspec, not dirstate, is accessed
ClosedPublic

Authored by martinvonz on Nov 14 2018, 3:21 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG92fde28860bb: tests: update narrowspec when narrowspec, not dirstate, is accessed
Summary

test-narrow-expanddirstate.t mimics a Google-internal extension that
updates the narrowspec whenever the dirstate is accessed. Since
1d09ba0d2ed3 (narrow: move remaining narrow-limited dirstate walks to
core, 2018-10-01) and a few commits before it, we now longer restrict
repo.dirstate.walk() to the narrowspec. It is instead done at a higher
level (e.g. context.status()). We were running into problems with the
Google-internal extension when importing those commits. The issue was
that the narrowspec was read before the first dirstate access. I
believe the right fix is to instead update the narrowspec when trying
to read it (not when reading the dirstate), so that's what this patch
does.

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.Nov 14 2018, 3:21 PM
durin42 added inline comments.Dec 10 2018, 4:28 PM
tests/test-narrow-expanddirstate.t
59

dead assignment?

martinvonz planned changes to this revision.Dec 10 2018, 4:59 PM

I had forgotten that I had even sent this for review. I have some changes in my repo that I will share in a while (after I've address Yuya's comments on D5278).

martinvonz retitled this revision from tests: update store narrowspec when narrowspec, not dirstate, is accessed to tests: update narrowspec when narrowspec, not dirstate, is accessed.Dec 20 2018, 1:11 PM
martinvonz added a child revision: D5470: narrow: keep narrowspec backup in store.
Closed by commit rHG92fde28860bb: tests: update narrowspec when narrowspec, not dirstate, is accessed (authored by martinvonz). · Explain WhyDec 22 2018, 9:14 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-narrow-expanddirstate.t (22 lines)

Diff 12957

tests/test-narrow-expanddirstate.t

> from mercurial import encoding > from mercurial import encoding
> from mercurial import extensions > from mercurial import extensions
> from mercurial import localrepo > from mercurial import localrepo
> from mercurial import match as matchmod > from mercurial import match as matchmod
> from mercurial import narrowspec > from mercurial import narrowspec
> from mercurial import patch > from mercurial import patch
> from mercurial import util as hgutil > from mercurial import util as hgutil
> >
> narrowspecexpanded = False
durin42Unsubmitted
Not Done

dead assignment?

durin42: dead assignment?
> def expandnarrowspec(ui, repo, newincludes=None): > def expandnarrowspec(ui, repo, newincludes=None):
> if not newincludes: > if not newincludes:
> return > return
> if getattr(repo, '_narrowspecexpanded', False):
> return
> repo._narrowspecexpanded = True
> import sys > import sys
> newincludes = set([newincludes]) > newincludes = set([newincludes])
> includes, excludes = repo.narrowpats > includes, excludes = repo.narrowpats
> currentmatcher = narrowspec.match(repo.root, includes, excludes) > currentmatcher = narrowspec.match(repo.root, includes, excludes)
> includes = includes | newincludes > includes = includes | newincludes
> if not repo.currenttransaction(): > if not repo.currenttransaction():
> ui.develwarn(b'expandnarrowspec called outside of transaction!') > ui.develwarn(b'expandnarrowspec called outside of transaction!')
> repo.setnarrowpats(includes, excludes) > repo.setnarrowpats(includes, excludes)
> newmatcher = narrowspec.match(repo.root, includes, excludes) > newmatcher = narrowspec.match(repo.root, includes, excludes)
> added = matchmod.differencematcher(newmatcher, currentmatcher) > added = matchmod.differencematcher(newmatcher, currentmatcher)
> for f in repo[b'.'].manifest().walk(added): > for f in repo[b'.'].manifest().walk(added):
> repo.dirstate.normallookup(f) > repo.dirstate.normallookup(f)
> >
> def wrapds(ui, repo, ds): > def reposetup(ui, repo):
> class expandingdirstate(ds.__class__): > class expandingrepo(repo.__class__):
> @hgutil.propertycache > def narrowmatch(self, *args, **kwargs):
> def _map(self):
> ret = super(expandingdirstate, self)._map
> with repo.wlock(), repo.lock(), repo.transaction( > with repo.wlock(), repo.lock(), repo.transaction(
> b'expandnarrowspec'): > b'expandnarrowspec'):
> expandnarrowspec(ui, repo, > expandnarrowspec(ui, repo,
> encoding.environ.get(b'DIRSTATEINCLUDES')) > encoding.environ.get(b'DIRSTATEINCLUDES'))
> return ret > return super(expandingrepo, self).narrowmatch(*args, **kwargs)
> ds.__class__ = expandingdirstate
> return ds
>
> def reposetup(ui, repo):
> class expandingrepo(repo.__class__):
> def _makedirstate(self):
> dirstate = super(expandingrepo, self)._makedirstate()
> return wrapds(ui, repo, dirstate)
> repo.__class__ = expandingrepo > repo.__class__ = expandingrepo
> >
> def extsetup(unused_ui): > def extsetup(unused_ui):
> def overridepatch(orig, ui, repo, *args, **kwargs): > def overridepatch(orig, ui, repo, *args, **kwargs):
> with repo.wlock(): > with repo.wlock():
> expandnarrowspec(ui, repo, encoding.environ.get(b'PATCHINCLUDES')) > expandnarrowspec(ui, repo, encoding.environ.get(b'PATCHINCLUDES'))
> return orig(ui, repo, *args, **kwargs) > return orig(ui, repo, *args, **kwargs)
> >