This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4093

tests: avoid unnecessarily looking inside .hg/ in test-narrow*
ClosedPublic

Authored by martinvonz on Aug 3 2018, 5:23 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfa64a229f24b: tests: avoid unnecessarily looking inside .hg/ in test-narrow*
Summary

Many of the narrow tests were looking at .hg/narrowspec. I think most
of them were written before we added hg tracked, but now that we
have that command, we should fix the tests. There were also a few
instances of tests looking at .hg/dirstate. I fixed those to use `hg
files` instead.

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.Aug 3 2018, 5:23 PM
pulkit added a subscriber: pulkit.Aug 3 2018, 5:29 PM

The commit message says you used hg debugdirstate but looking at changes, you used hg files. I think the commit message needs to be updated.

tests/test-narrow-expanddirstate.t
32

This should be hg files.

martinvonz added a comment.Aug 3 2018, 5:30 PM
In D4093#63407, @pulkit wrote:

The commit message says you used hg debugdirstate but looking at changes, you used hg files. I think the commit message needs to be updated.

Oops, good catch. Will fix.

martinvonz edited the summary of this revision. (Show Details)Aug 3 2018, 5:31 PM
pulkit added inline comments.Aug 3 2018, 5:37 PM
tests/test-narrow-expanddirstate.t
32

Looks like you missed this comment.

martinvonz marked 2 inline comments as done.Aug 3 2018, 5:47 PM
martinvonz added inline comments.
tests/test-narrow-expanddirstate.t
32

Yes, I didn't notice that. Sorry about that, and thanks for careful review.

martinvonz marked an inline comment as done.Aug 3 2018, 5:47 PM
martinvonz updated this revision to Diff 9862.
pulkit accepted this revision.Aug 3 2018, 5:50 PM
Closed by commit rHGfa64a229f24b: tests: avoid unnecessarily looking inside .hg/ in test-narrow* (authored by martinvonz). · Explain WhyAug 3 2018, 6:01 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9865

tests/test-narrow-clone-no-ellipsis.t

$ cat .hg/requires | grep -v generaldelta $ cat .hg/requires | grep -v generaldelta
dotencode dotencode
fncache fncache
narrowhg-experimental narrowhg-experimental
revlogv1 revlogv1
store store
testonly-simplestore (reposimplestore !) testonly-simplestore (reposimplestore !)
$ cat .hg/narrowspec $ hg tracked
[includes] I path:dir/src/f10
path:dir/src/f10
[excludes]
$ hg update $ hg update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ find * | sort $ find * | sort
dir dir
dir/src dir/src
dir/src/f10 dir/src/f10
$ cat dir/src/f10 $ cat dir/src/f10
10 10
$ cd .. $ cd ..
narrow clone a directory, tests/, except tests/t19 narrow clone a directory, tests/, except tests/t19
$ hg clone --narrow ssh://user@dummy/master narrowdir --noupdate --include "dir/tests/" --exclude "dir/tests/t19" $ hg clone --narrow ssh://user@dummy/master narrowdir --noupdate --include "dir/tests/" --exclude "dir/tests/t19"
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 40 changesets with 19 changes to 19 files added 40 changesets with 19 changes to 19 files
new changesets *:* (glob) new changesets *:* (glob)
$ cd narrowdir $ cd narrowdir
$ cat .hg/narrowspec $ hg tracked
[includes] I path:dir/tests
path:dir/tests X path:dir/tests/t19
[excludes]
path:dir/tests/t19
$ hg update $ hg update
19 files updated, 0 files merged, 0 files removed, 0 files unresolved 19 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ find * | sort $ find * | sort
dir dir
dir/tests dir/tests
dir/tests/t1 dir/tests/t1
dir/tests/t10 dir/tests/t10
dir/tests/t11 dir/tests/t11
$ hg clone --narrow ssh://user@dummy/master narrowroot --noupdate --exclude "dir/tests" $ hg clone --narrow ssh://user@dummy/master narrowroot --noupdate --exclude "dir/tests"
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 40 changesets with 20 changes to 20 files added 40 changesets with 20 changes to 20 files
new changesets *:* (glob) new changesets *:* (glob)
$ cd narrowroot $ cd narrowroot
$ cat .hg/narrowspec $ hg tracked
[includes] I path:.
path:. X path:dir/tests
[excludes]
path:dir/tests
$ hg update $ hg update
20 files updated, 0 files merged, 0 files removed, 0 files unresolved 20 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ find * | sort $ find * | sort
dir dir
dir/src dir/src
dir/src/f1 dir/src/f1
dir/src/f10 dir/src/f10
dir/src/f11 dir/src/f11

tests/test-narrow-clone.t

$ cat .hg/requires | grep -v generaldelta $ cat .hg/requires | grep -v generaldelta
dotencode dotencode
fncache fncache
narrowhg-experimental narrowhg-experimental
revlogv1 revlogv1
store store
testonly-simplestore (reposimplestore !) testonly-simplestore (reposimplestore !)
$ cat .hg/narrowspec $ hg tracked
[includes] I path:dir/src/f10
path:dir/src/f10
[excludes]
$ hg tracked $ hg tracked
I path:dir/src/f10 I path:dir/src/f10
$ hg update $ hg update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ find * | sort $ find * | sort
dir dir
dir/src dir/src
dir/src/f10 dir/src/f10
$ hg clone --narrow ssh://user@dummy/master narrowdir --noupdate --include "dir/tests/" --exclude "dir/tests/t19" $ hg clone --narrow ssh://user@dummy/master narrowdir --noupdate --include "dir/tests/" --exclude "dir/tests/t19"
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 21 changesets with 19 changes to 19 files added 21 changesets with 19 changes to 19 files
new changesets *:* (glob) new changesets *:* (glob)
$ cd narrowdir $ cd narrowdir
$ cat .hg/narrowspec $ hg tracked
[includes] I path:dir/tests
path:dir/tests X path:dir/tests/t19
[excludes]
path:dir/tests/t19
$ hg tracked $ hg tracked
I path:dir/tests I path:dir/tests
X path:dir/tests/t19 X path:dir/tests/t19
$ hg update $ hg update
19 files updated, 0 files merged, 0 files removed, 0 files unresolved 19 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ find * | sort $ find * | sort
dir dir
dir/tests dir/tests
$ hg clone --narrow ssh://user@dummy/master narrowroot --noupdate --exclude "dir/tests" $ hg clone --narrow ssh://user@dummy/master narrowroot --noupdate --exclude "dir/tests"
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 21 changesets with 20 changes to 20 files added 21 changesets with 20 changes to 20 files
new changesets *:* (glob) new changesets *:* (glob)
$ cd narrowroot $ cd narrowroot
$ cat .hg/narrowspec $ hg tracked
[includes] I path:.
path:. X path:dir/tests
[excludes]
path:dir/tests
$ hg tracked $ hg tracked
I path:. I path:.
X path:dir/tests X path:dir/tests
$ hg update $ hg update
20 files updated, 0 files merged, 0 files removed, 0 files unresolved 20 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ find * | sort $ find * | sort
dir dir
dir/src dir/src

tests/test-narrow-expanddirstate.t

new changesets dff6a2a6d433 new changesets dff6a2a6d433
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow $ cd narrow
$ mkdir outside $ mkdir outside
$ echo other_contents > outside/f2 $ echo other_contents > outside/f2
$ grep outside .hg/narrowspec $ hg tracked | grep outside
[1] [1]
$ grep outside .hg/dirstate $ hg files | grep outside
pulkitUnsubmitted
Done

This should be hg files.

pulkit: This should be `hg files`.
pulkitUnsubmitted
Done

Looks like you missed this comment.

pulkit: Looks like you missed this comment.
martinvonzAuthorUnsubmitted
Not Done

Yes, I didn't notice that. Sorry about that, and thanks for careful review.

martinvonz: Yes, I didn't notice that. Sorry about that, and thanks for careful review.
[1] [1]
$ hg status $ hg status
`hg status` did not add outside. `hg status` did not add outside.
$ grep outside .hg/narrowspec $ hg tracked | grep outside
[1] [1]
$ grep outside .hg/dirstate $ hg files | grep outside
[1] [1]
Unfortunately this is not really a candidate for adding to narrowhg proper, 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 since it depends on some other source for providing the manifests (when using
treemanifests) and file contents. Something like a virtual filesystem and/or 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 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. have this method available in narrowhg proper at the moment.
$ cat > "$TESTTMP/expand_extension.py" <<EOF $ cat > "$TESTTMP/expand_extension.py" <<EOF
repo. repo.
$ cp -a ../master/.hg/store/data/* .hg/store/data $ cp -a ../master/.hg/store/data/* .hg/store/data
Do that for patchdir as well. Do that for patchdir as well.
$ cp -a ../master/patchdir . $ cp -a ../master/patchdir .
`hg status` will now add outside, but not patchdir. `hg status` will now add outside, but not patchdir.
$ DIRSTATEINCLUDES=path:outside hg status $ DIRSTATEINCLUDES=path:outside hg status
M outside/f2 M outside/f2
$ grep outside .hg/narrowspec $ hg tracked | grep outside
path:outside I path:outside
$ grep outside .hg/dirstate > /dev/null $ hg files | grep outside > /dev/null
$ grep patchdir .hg/narrowspec $ hg tracked | grep patchdir
[1] [1]
$ grep patchdir .hg/dirstate $ hg files | grep patchdir
[1] [1]
Get rid of the modification to outside/f2. Get rid of the modification to outside/f2.
$ hg update -C . $ hg update -C .
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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 This patch will not apply cleanly at the moment, so `hg import` will break
$ cat > "$TESTTMP/foo.patch" <<EOF $ cat > "$TESTTMP/foo.patch" <<EOF
> --- patchdir/f3 > --- patchdir/f3
> +++ patchdir/f3 > +++ patchdir/f3
> @@ -1,1 +1,1 @@ > @@ -1,1 +1,1 @@
> -this should be "patch_this", but its not, so patch fails > -this should be "patch_this", but its not, so patch fails
> +this text is irrelevant > +this text is irrelevant
> EOF > EOF
$ PATCHINCLUDES=path:patchdir hg import -p0 -e "$TESTTMP/foo.patch" -m ignored $ PATCHINCLUDES=path:patchdir hg import -p0 -e "$TESTTMP/foo.patch" -m ignored
applying $TESTTMP/foo.patch applying $TESTTMP/foo.patch
patching file patchdir/f3 patching file patchdir/f3
Hunk #1 FAILED at 0 Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file patchdir/f3.rej 1 out of 1 hunks FAILED -- saving rejects to file patchdir/f3.rej
abort: patch failed to apply abort: patch failed to apply
[255] [255]
$ grep patchdir .hg/narrowspec $ hg tracked | grep patchdir
[1] [1]
$ grep patchdir .hg/dirstate > /dev/null $ hg files | grep patchdir > /dev/null
[1] [1]
Let's make it apply cleanly and see that it *did* expand properly Let's make it apply cleanly and see that it *did* expand properly
$ cat > "$TESTTMP/foo.patch" <<EOF $ cat > "$TESTTMP/foo.patch" <<EOF
> --- patchdir/f3 > --- patchdir/f3
> +++ patchdir/f3 > +++ patchdir/f3
> @@ -1,1 +1,1 @@ > @@ -1,1 +1,1 @@
> -patch_this > -patch_this
> +patched_this > +patched_this
> EOF > EOF
$ PATCHINCLUDES=path:patchdir hg import -p0 -e "$TESTTMP/foo.patch" -m message $ PATCHINCLUDES=path:patchdir hg import -p0 -e "$TESTTMP/foo.patch" -m message
applying $TESTTMP/foo.patch applying $TESTTMP/foo.patch
$ cat patchdir/f3 $ cat patchdir/f3
patched_this patched_this
$ grep patchdir .hg/narrowspec $ hg tracked | grep patchdir
path:patchdir I path:patchdir
$ grep patchdir .hg/dirstate > /dev/null $ hg files | grep patchdir > /dev/null

tests/test-narrow-patterns.t

adding manifests adding manifests
adding file changes adding file changes
added 6 changesets with 4 changes to 4 files added 6 changesets with 4 changes to 4 files
new changesets *:* (glob) new changesets *:* (glob)
updating to branch default updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow $ cd narrow
$ cat .hg/narrowspec $ hg tracked
[includes] I path:dir1
path:dir1 I path:dir2
path:dir2 X path:dir1/dirA
[excludes] X path:dir1/dirB
path:dir1/dirA X path:dir2/dirA
path:dir1/dirB X path:dir2/dirB
path:dir2/dirA
path:dir2/dirB
$ hg manifest -r tip $ hg manifest -r tip
dir1/bar dir1/bar
dir1/dirA/bar dir1/dirA/bar
dir1/dirA/foo dir1/dirA/foo
dir1/dirB/bar dir1/dirB/bar
dir1/dirB/foo dir1/dirB/foo
dir1/foo dir1/foo
dir2/bar dir2/bar
searching for changes searching for changes
no changes found no changes found
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 9 changesets with 6 changes to 6 files added 9 changesets with 6 changes to 6 files
new changesets *:* (glob) new changesets *:* (glob)
$ cat .hg/narrowspec $ hg tracked
[includes] I path:dir1
path:dir1 I path:dir2
path:dir2 X path:dir1/dirB
[excludes] X path:dir2/dirA
path:dir1/dirB X path:dir2/dirB
path:dir2/dirA
path:dir2/dirB
$ find * | sort $ find * | sort
dir1 dir1
dir1/bar dir1/bar
dir1/dirA dir1/dirA
dir1/dirA/bar dir1/dirA/bar
dir1/dirA/foo dir1/dirA/foo
dir1/foo dir1/foo
dir2 dir2
deleting data/dir1/dirA/bar/index (reposimplestore !) deleting data/dir1/dirA/bar/index (reposimplestore !)
no changes found no changes found
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 11 changesets with 7 changes to 7 files added 11 changesets with 7 changes to 7 files
new changesets *:* (glob) new changesets *:* (glob)
$ cat .hg/narrowspec $ hg tracked
[includes] I path:dir1
path:dir1 I path:dir2
path:dir2 X path:dir1/dirA/bar
[excludes] X path:dir1/dirB
path:dir1/dirA/bar X path:dir2/dirA
path:dir1/dirB
path:dir2/dirA
$ find * | sort $ find * | sort
dir1 dir1
dir1/bar dir1/bar
dir1/dirA dir1/dirA
dir1/dirA/foo dir1/dirA/foo
dir1/foo dir1/foo
dir2 dir2
dir2/bar dir2/bar
deleting data/dir1/dirA/foo/index (reposimplestore !) deleting data/dir1/dirA/foo/index (reposimplestore !)
no changes found no changes found
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 13 changesets with 8 changes to 8 files added 13 changesets with 8 changes to 8 files
new changesets *:* (glob) new changesets *:* (glob)
$ cat .hg/narrowspec $ hg tracked
[includes] I path:dir1
path:dir1 I path:dir2
path:dir2 X path:dir1/dirA
[excludes] X path:dir1/dirA/bar
path:dir1/dirA X path:dir1/dirB
path:dir1/dirA/bar
path:dir1/dirB
$ find * | sort $ find * | sort
dir1 dir1
dir1/bar dir1/bar
dir1/foo dir1/foo
dir2 dir2
dir2/bar dir2/bar
dir2/dirA dir2/dirA
dir2/dirA/bar dir2/dirA/bar
searching for changes searching for changes
no changes found no changes found
saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 13 changesets with 9 changes to 9 files added 13 changesets with 9 changes to 9 files
new changesets *:* (glob) new changesets *:* (glob)
$ cat .hg/narrowspec $ hg tracked
[includes] I path:dir1
path:dir1 I path:dir2
path:dir2 X path:dir1/dirA/bar
[excludes] X path:dir1/dirB
path:dir1/dirA/bar
path:dir1/dirB
$ find * | sort $ find * | sort
dir1 dir1
dir1/bar dir1/bar
dir1/dirA dir1/dirA
dir1/dirA/foo dir1/dirA/foo
dir1/foo dir1/foo
dir2 dir2
dir2/bar dir2/bar