##// END OF EJS Templates
tests: update narrowspec when narrowspec, not dirstate, is accessed...
tests: update narrowspec when narrowspec, not dirstate, is accessed 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 no 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. Differential Revision: https://phab.mercurial-scm.org/D5275

File last commit:

r41069:92fde288 default
r41069:92fde288 default
Show More
test-narrow-expanddirstate.t
158 lines | 4.9 KiB | text/troff | Tads3Lexer
/ tests / test-narrow-expanddirstate.t
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 $ . "$TESTDIR/narrow-library.sh"
$ hg init master
$ cd master
$ mkdir inside
$ echo inside > inside/f1
$ mkdir outside
$ echo outside > outside/f2
$ mkdir patchdir
$ echo patch_this > patchdir/f3
$ hg ci -Aqm 'initial'
$ cd ..
$ hg clone --narrow ssh://user@dummy/master narrow --include inside
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
new changesets dff6a2a6d433
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow
$ mkdir outside
$ echo other_contents > outside/f2
Martin von Zweigbergk
tests: avoid unnecessarily looking inside .hg/ in test-narrow*...
r38873 $ hg tracked | grep outside
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 [1]
Martin von Zweigbergk
tests: avoid unnecessarily looking inside .hg/ in test-narrow*...
r38873 $ hg files | grep outside
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 [1]
$ hg status
`hg status` did not add outside.
Martin von Zweigbergk
tests: avoid unnecessarily looking inside .hg/ in test-narrow*...
r38873 $ hg tracked | grep outside
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 [1]
Martin von Zweigbergk
tests: avoid unnecessarily looking inside .hg/ in test-narrow*...
r38873 $ hg files | grep outside
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 [1]
Unfortunately this is not really a candidate for adding to narrowhg proper,
since it depends on some other source for providing the manifests (when using
treemanifests) and file contents. Something like a virtual filesystem and/or
remotefilelog. We want to be useful when not using those systems, so we do not
have this method available in narrowhg proper at the moment.
$ cat > "$TESTTMP/expand_extension.py" <<EOF
> import os
> import sys
>
Augie Fackler
tests: port extension in test-narrow-expanddirstate.t to Python 3...
r36365 > from mercurial import encoding
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 > from mercurial import extensions
> from mercurial import localrepo
> from mercurial import match as matchmod
Gregory Szorc
narrowspec: move module into core...
r36178 > from mercurial import narrowspec
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 > from mercurial import patch
> from mercurial import util as hgutil
>
Martin von Zweigbergk
tests: update narrowspec when narrowspec, not dirstate, is accessed...
r41069 > narrowspecexpanded = False
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 > def expandnarrowspec(ui, repo, newincludes=None):
> if not newincludes:
> return
Martin von Zweigbergk
tests: update narrowspec when narrowspec, not dirstate, is accessed...
r41069 > if getattr(repo, '_narrowspecexpanded', False):
> return
> repo._narrowspecexpanded = True
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 > import sys
> newincludes = set([newincludes])
> includes, excludes = repo.narrowpats
Gregory Szorc
narrowspec: move module into core...
r36178 > currentmatcher = narrowspec.match(repo.root, includes, excludes)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 > includes = includes | newincludes
> if not repo.currenttransaction():
Augie Fackler
tests: port extension in test-narrow-expanddirstate.t to Python 3...
r36365 > ui.develwarn(b'expandnarrowspec called outside of transaction!')
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 > repo.setnarrowpats(includes, excludes)
Gregory Szorc
narrowspec: move module into core...
r36178 > newmatcher = narrowspec.match(repo.root, includes, excludes)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 > added = matchmod.differencematcher(newmatcher, currentmatcher)
Augie Fackler
tests: port extension in test-narrow-expanddirstate.t to Python 3...
r36365 > for f in repo[b'.'].manifest().walk(added):
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 > repo.dirstate.normallookup(f)
>
Martin von Zweigbergk
tests: update narrowspec when narrowspec, not dirstate, is accessed...
r41069 > def reposetup(ui, repo):
> class expandingrepo(repo.__class__):
> def narrowmatch(self, *args, **kwargs):
Kyle Lippincott
narrow: only wrap dirstate functions once, instead of per-reposetup...
r38142 > with repo.wlock(), repo.lock(), repo.transaction(
> b'expandnarrowspec'):
> expandnarrowspec(ui, repo,
> encoding.environ.get(b'DIRSTATEINCLUDES'))
Martin von Zweigbergk
tests: update narrowspec when narrowspec, not dirstate, is accessed...
r41069 > return super(expandingrepo, self).narrowmatch(*args, **kwargs)
Kyle Lippincott
narrow: only wrap dirstate functions once, instead of per-reposetup...
r38142 > repo.__class__ = expandingrepo
>
> def extsetup(unused_ui):
> def overridepatch(orig, ui, repo, *args, **kwargs):
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 > with repo.wlock():
Augie Fackler
tests: port extension in test-narrow-expanddirstate.t to Python 3...
r36365 > expandnarrowspec(ui, repo, encoding.environ.get(b'PATCHINCLUDES'))
Kyle Lippincott
narrow: only wrap dirstate functions once, instead of per-reposetup...
r38142 > return orig(ui, repo, *args, **kwargs)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 >
Augie Fackler
tests: port extension in test-narrow-expanddirstate.t to Python 3...
r36365 > extensions.wrapfunction(patch, b'patch', overridepatch)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 > EOF
$ cat >> ".hg/hgrc" <<EOF
> [extensions]
> expand_extension = $TESTTMP/expand_extension.py
> EOF
Since we do not have the ability to rely on a virtual filesystem or
remotefilelog in the test, we just fake it by copying the data from the 'master'
repo.
$ cp -a ../master/.hg/store/data/* .hg/store/data
Do that for patchdir as well.
$ cp -a ../master/patchdir .
`hg status` will now add outside, but not patchdir.
$ DIRSTATEINCLUDES=path:outside hg status
M outside/f2
Martin von Zweigbergk
tests: avoid unnecessarily looking inside .hg/ in test-narrow*...
r38873 $ hg tracked | grep outside
I path:outside
$ hg files | grep outside > /dev/null
$ hg tracked | grep patchdir
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 [1]
Martin von Zweigbergk
tests: avoid unnecessarily looking inside .hg/ in test-narrow*...
r38873 $ hg files | grep patchdir
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 [1]
Get rid of the modification to outside/f2.
$ hg update -C .
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
This patch will not apply cleanly at the moment, so `hg import` will break
$ cat > "$TESTTMP/foo.patch" <<EOF
> --- patchdir/f3
> +++ patchdir/f3
> @@ -1,1 +1,1 @@
> -this should be "patch_this", but its not, so patch fails
> +this text is irrelevant
> EOF
$ PATCHINCLUDES=path:patchdir hg import -p0 -e "$TESTTMP/foo.patch" -m ignored
applying $TESTTMP/foo.patch
patching file patchdir/f3
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file patchdir/f3.rej
abort: patch failed to apply
[255]
Martin von Zweigbergk
tests: avoid unnecessarily looking inside .hg/ in test-narrow*...
r38873 $ hg tracked | grep patchdir
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 [1]
Martin von Zweigbergk
tests: avoid unnecessarily looking inside .hg/ in test-narrow*...
r38873 $ hg files | grep patchdir > /dev/null
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 [1]
Let's make it apply cleanly and see that it *did* expand properly
$ cat > "$TESTTMP/foo.patch" <<EOF
> --- patchdir/f3
> +++ patchdir/f3
> @@ -1,1 +1,1 @@
> -patch_this
> +patched_this
> EOF
$ PATCHINCLUDES=path:patchdir hg import -p0 -e "$TESTTMP/foo.patch" -m message
applying $TESTTMP/foo.patch
$ cat patchdir/f3
patched_this
Martin von Zweigbergk
tests: avoid unnecessarily looking inside .hg/ in test-narrow*...
r38873 $ hg tracked | grep patchdir
I path:patchdir
$ hg files | grep patchdir > /dev/null