This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4421

tests: use {rev} instead of {node|short} and (glob) in narrow tests
ClosedPublic

Authored by martinvonz on Aug 29 2018, 7:58 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG5ebfb7cc6f2c: tests: use {rev} instead of {node|short} and (glob) in narrow tests
Summary

I think we used {node|short} because they were first written for only
flat manifests and we didn't think to change the format when we
started testing tree manifests.

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 29 2018, 7:58 PM
Closed by commit rHG5ebfb7cc6f2c: tests: use {rev} instead of {node|short} and (glob) in narrow tests (authored by martinvonz). · Explain WhyAug 30 2018, 8:07 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 10672

tests/test-narrow-widen-non-ellipsis.t

$ mkdir outside2 $ mkdir outside2
$ echo 'outside2' > outside2/f $ echo 'outside2' > outside2/f
$ hg add outside2/f $ hg add outside2/f
$ hg commit -m 'add outside2' $ hg commit -m 'add outside2'
$ echo 'widest v4' > widest/f $ echo 'widest v4' > widest/f
$ hg commit -m 'update widest v4' $ hg commit -m 'update widest v4'
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
*: update widest v4 (glob) 7: update widest v4
*: add outside2 (glob) 6: add outside2
*: update inside (glob) 5: update inside
*: update widest v3 (glob) 4: update widest v3
*: add wider, update widest (glob) 3: add wider, update widest
*: add outside (glob) 2: add outside
*: add widest (glob) 1: add widest
*: add inside (glob) 0: add inside
$ cd .. $ cd ..
Widen the narrow spec to see the wider file. This should not get the newly Widen the narrow spec to see the wider file. This should not get the newly
added upstream revisions. added upstream revisions.
$ cd narrow $ cd narrow
$ hg tracked --addinclude wider/f $ hg tracked --addinclude wider/f
$ hg update -r 'desc("update inside")' $ hg update -r 'desc("update inside")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat wider/f $ cat wider/f
wider wider
$ cat inside/f $ cat inside/f
inside v2 inside v2
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
*: update widest v4 (glob) 7: update widest v4
*: add outside2 (glob) 6: add outside2
*: update inside (glob) 5: update inside
*: update widest v3 (glob) 4: update widest v3
*: add wider, update widest (glob) 3: add wider, update widest
*: add outside (glob) 2: add outside
*: add widest (glob) 1: add widest
*: add inside (glob) 0: add inside
Check that widening with a newline fails Check that widening with a newline fails
$ hg tracked --addinclude 'widest $ hg tracked --addinclude 'widest
> ' > '
abort: newlines are not allowed in narrowspec paths abort: newlines are not allowed in narrowspec paths
[255] [255]
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat widest/f $ cat widest/f
widest v3 widest v3
$ hg update 'desc("update widest v4")' $ hg update 'desc("update widest v4")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat widest/f $ cat widest/f
widest v4 widest v4
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
*: update widest v4 (glob) 7: update widest v4
*: add outside2 (glob) 6: add outside2
*: update inside (glob) 5: update inside
*: update widest v3 (glob) 4: update widest v3
*: add wider, update widest (glob) 3: add wider, update widest
*: add outside (glob) 2: add outside
*: add widest (glob) 1: add widest
*: add inside (glob) 0: add inside
separate suite of tests: files from 0-10 modified in changes 0-10. This allows separate suite of tests: files from 0-10 modified in changes 0-10. This allows
more obvious precise tests tickling particular corner cases. more obvious precise tests tickling particular corner cases.
$ cd .. $ cd ..
$ hg init upstream $ hg init upstream
$ cd upstream $ cd upstream
$ for x in `$TESTDIR/seq.py 0 10` $ for x in `$TESTDIR/seq.py 0 10`
> do > do
> mkdir d$x > mkdir d$x
> echo $x > d$x/f > echo $x > d$x/f
> hg add d$x/f > hg add d$x/f
> hg commit -m "add d$x/f" > hg commit -m "add d$x/f"
> done > done
$ hg log -T "{node|short}: {desc}\n" $ hg log -T "{rev}: {desc}\n"
*: add d10/f (glob) 10: add d10/f
*: add d9/f (glob) 9: add d9/f
*: add d8/f (glob) 8: add d8/f
*: add d7/f (glob) 7: add d7/f
*: add d6/f (glob) 6: add d6/f
*: add d5/f (glob) 5: add d5/f
*: add d4/f (glob) 4: add d4/f
*: add d3/f (glob) 3: add d3/f
*: add d2/f (glob) 2: add d2/f
*: add d1/f (glob) 1: add d1/f
*: add d0/f (glob) 0: add d0/f
make narrow clone with every third node. make narrow clone with every third node.
$ cd .. $ cd ..
$ hg clone --narrow ssh://user@dummy/upstream narrow2 --include d0 --include d3 --include d6 --include d9 $ hg clone --narrow ssh://user@dummy/upstream narrow2 --include d0 --include d3 --include d6 --include d9
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
I path:d9 I path:d9
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
checking directory manifests (tree !) checking directory manifests (tree !)
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
4 files, 11 changesets, 4 total revisions 4 files, 11 changesets, 4 total revisions
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
*: add d10/f (glob) 10: add d10/f
*: add d9/f (glob) 9: add d9/f
*: add d8/f (glob) 8: add d8/f
*: add d7/f (glob) 7: add d7/f
*: add d6/f (glob) 6: add d6/f
*: add d5/f (glob) 5: add d5/f
*: add d4/f (glob) 4: add d4/f
*: add d3/f (glob) 3: add d3/f
*: add d2/f (glob) 2: add d2/f
*: add d1/f (glob) 1: add d1/f
*: add d0/f (glob) 0: add d0/f
$ hg tracked --addinclude d1 $ hg tracked --addinclude d1
comparing with ssh://user@dummy/upstream comparing with ssh://user@dummy/upstream
searching for changes searching for changes
no changes found no changes found
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 0 changesets with 1 changes to 5 files added 0 changesets with 1 changes to 5 files
11 local changesets published 11 local changesets published
$ hg tracked $ hg tracked
I path:d0 I path:d0
I path:d1 I path:d1
I path:d3 I path:d3
I path:d6 I path:d6
I path:d9 I path:d9
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
*: add d10/f (glob) 10: add d10/f
*: add d9/f (glob) 9: add d9/f
*: add d8/f (glob) 8: add d8/f
*: add d7/f (glob) 7: add d7/f
*: add d6/f (glob) 6: add d6/f
*: add d5/f (glob) 5: add d5/f
*: add d4/f (glob) 4: add d4/f
*: add d3/f (glob) 3: add d3/f
*: add d2/f (glob) 2: add d2/f
*: add d1/f (glob) 1: add d1/f
*: add d0/f (glob) 0: add d0/f
Verify shouldn't claim the repo is corrupt after a widen. Verify shouldn't claim the repo is corrupt after a widen.
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
checking directory manifests (tree !) checking directory manifests (tree !)
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
5 files, 11 changesets, 5 total revisions 5 files, 11 changesets, 5 total revisions
Widening preserves parent of local commit Widening preserves parent of local commit
$ cd .. $ cd ..
$ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2 $ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2
$ cd narrow3 $ cd narrow3
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
*: add d2/f (glob) 2: add d2/f
*: add d1/f (glob) 1: add d1/f
*: add d0/f (glob) 0: add d0/f
$ hg pull -q -r 3 $ hg pull -q -r 3
$ hg co -q tip $ hg co -q tip
$ hg pull -q -r 4 $ hg pull -q -r 4
$ echo local > d2/f $ echo local > d2/f
$ hg ci -m local $ hg ci -m local
created new head created new head
$ hg tracked -q --addinclude d0 --addinclude d9 $ hg tracked -q --addinclude d0 --addinclude d9

tests/test-narrow-widen.t

$ mkdir outside2 $ mkdir outside2
$ echo 'outside2' > outside2/f $ echo 'outside2' > outside2/f
$ hg add outside2/f $ hg add outside2/f
$ hg commit -m 'add outside2' $ hg commit -m 'add outside2'
$ echo 'widest v4' > widest/f $ echo 'widest v4' > widest/f
$ hg commit -m 'update widest v4' $ hg commit -m 'update widest v4'
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
*: update widest v4 (glob) 7: update widest v4
*: add outside2 (glob) 6: add outside2
*: update inside (glob) 5: update inside
*: update widest v3 (glob) 4: update widest v3
*: add wider, update widest (glob) 3: add wider, update widest
*: add outside (glob) 2: add outside
*: add widest (glob) 1: add widest
*: add inside (glob) 0: add inside
$ cd .. $ cd ..
Widen the narrow spec to see the wider file. This should not get the newly Widen the narrow spec to see the wider file. This should not get the newly
added upstream revisions. added upstream revisions.
$ cd narrow $ cd narrow
$ hg tracked --addinclude wider/f $ hg tracked --addinclude wider/f
$ hg update -r 'desc("update inside")' $ hg update -r 'desc("update inside")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat wider/f $ cat wider/f
wider wider
$ cat inside/f $ cat inside/f
inside v2 inside v2
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
...*: update widest v4 (glob) ...5: update widest v4
*: update inside (glob) 4: update inside
...*: update widest v3 (glob) ...3: update widest v3
*: add wider, update widest (glob) 2: add wider, update widest
...*: add outside (glob) ...1: add outside
*: add inside (glob) 0: add inside
Check that widening with a newline fails Check that widening with a newline fails
$ hg tracked --addinclude 'widest $ hg tracked --addinclude 'widest
> ' > '
abort: newlines are not allowed in narrowspec paths abort: newlines are not allowed in narrowspec paths
[255] [255]
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat widest/f $ cat widest/f
widest v3 widest v3
$ hg update 'desc("update widest v4")' $ hg update 'desc("update widest v4")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat widest/f $ cat widest/f
widest v4 widest v4
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
*: update widest v4 (glob) 7: update widest v4
...*: add outside2 (glob) ...6: add outside2
*: update inside (glob) 5: update inside
*: update widest v3 (glob) 4: update widest v3
*: add wider, update widest (glob) 3: add wider, update widest
...*: add outside (glob) ...2: add outside
*: add widest (glob) 1: add widest
*: add inside (glob) 0: add inside
separate suite of tests: files from 0-10 modified in changes 0-10. This allows separate suite of tests: files from 0-10 modified in changes 0-10. This allows
more obvious precise tests tickling particular corner cases. more obvious precise tests tickling particular corner cases.
$ cd .. $ cd ..
$ hg init upstream $ hg init upstream
$ cd upstream $ cd upstream
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [narrow] > [narrow]
> serveellipses=True > serveellipses=True
> EOF > EOF
$ for x in `$TESTDIR/seq.py 0 10` $ for x in `$TESTDIR/seq.py 0 10`
> do > do
> mkdir d$x > mkdir d$x
> echo $x > d$x/f > echo $x > d$x/f
> hg add d$x/f > hg add d$x/f
> hg commit -m "add d$x/f" > hg commit -m "add d$x/f"
> done > done
$ hg log -T "{node|short}: {desc}\n" $ hg log -T "{rev}: {desc}\n"
*: add d10/f (glob) 10: add d10/f
*: add d9/f (glob) 9: add d9/f
*: add d8/f (glob) 8: add d8/f
*: add d7/f (glob) 7: add d7/f
*: add d6/f (glob) 6: add d6/f
*: add d5/f (glob) 5: add d5/f
*: add d4/f (glob) 4: add d4/f
*: add d3/f (glob) 3: add d3/f
*: add d2/f (glob) 2: add d2/f
*: add d1/f (glob) 1: add d1/f
*: add d0/f (glob) 0: add d0/f
make narrow clone with every third node. make narrow clone with every third node.
$ cd .. $ cd ..
$ hg clone --narrow ssh://user@dummy/upstream narrow2 --include d0 --include d3 --include d6 --include d9 $ hg clone --narrow ssh://user@dummy/upstream narrow2 --include d0 --include d3 --include d6 --include d9
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
I path:d9 I path:d9
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
checking directory manifests (tree !) checking directory manifests (tree !)
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
4 files, 8 changesets, 4 total revisions 4 files, 8 changesets, 4 total revisions
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
...*: add d10/f (glob) ...7: add d10/f
*: add d9/f (glob) 6: add d9/f
...*: add d8/f (glob) ...5: add d8/f
*: add d6/f (glob) 4: add d6/f
...*: add d5/f (glob) ...3: add d5/f
*: add d3/f (glob) 2: add d3/f
...*: add d2/f (glob) ...1: add d2/f
*: add d0/f (glob) 0: add d0/f
$ hg tracked --addinclude d1 $ hg tracked --addinclude d1
comparing with ssh://user@dummy/upstream comparing with ssh://user@dummy/upstream
searching for changes searching for changes
no changes found no changes found
saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 9 changesets with 5 changes to 5 files added 9 changesets with 5 changes to 5 files
new changesets *:* (glob) new changesets *:* (glob)
$ hg tracked $ hg tracked
I path:d0 I path:d0
I path:d1 I path:d1
I path:d3 I path:d3
I path:d6 I path:d6
I path:d9 I path:d9
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
...*: add d10/f (glob) ...8: add d10/f
*: add d9/f (glob) 7: add d9/f
...*: add d8/f (glob) ...6: add d8/f
*: add d6/f (glob) 5: add d6/f
...*: add d5/f (glob) ...4: add d5/f
*: add d3/f (glob) 3: add d3/f
...*: add d2/f (glob) ...2: add d2/f
*: add d1/f (glob) 1: add d1/f
*: add d0/f (glob) 0: add d0/f
Verify shouldn't claim the repo is corrupt after a widen. Verify shouldn't claim the repo is corrupt after a widen.
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
checking directory manifests (tree !) checking directory manifests (tree !)
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
5 files, 9 changesets, 5 total revisions 5 files, 9 changesets, 5 total revisions
Widening preserves parent of local commit Widening preserves parent of local commit
$ cd .. $ cd ..
$ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2 $ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2
$ cd narrow3 $ cd narrow3
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
*: add d2/f (glob) 1: add d2/f
...*: add d1/f (glob) ...0: add d1/f
$ hg pull -q -r 3 $ hg pull -q -r 3
$ hg co -q tip $ hg co -q tip
$ hg pull -q -r 4 $ hg pull -q -r 4
$ echo local > d2/f $ echo local > d2/f
$ hg ci -m local $ hg ci -m local
created new head created new head
$ hg tracked -q --addinclude d0 --addinclude d9 $ hg tracked -q --addinclude d0 --addinclude d9

tests/test-narrow.t

> EOF > EOF
$ for x in `$TESTDIR/seq.py 0 10` $ for x in `$TESTDIR/seq.py 0 10`
> do > do
> mkdir d$x > mkdir d$x
> echo $x > d$x/f > echo $x > d$x/f
> hg add d$x/f > hg add d$x/f
> hg commit -m "add d$x/f" > hg commit -m "add d$x/f"
> done > done
$ hg log -T "{node|short}: {desc}\n" $ hg log -T "{rev}: {desc}\n"
*: add d10/f (glob) 10: add d10/f
*: add d9/f (glob) 9: add d9/f
*: add d8/f (glob) 8: add d8/f
*: add d7/f (glob) 7: add d7/f
*: add d6/f (glob) 6: add d6/f
*: add d5/f (glob) 5: add d5/f
*: add d4/f (glob) 4: add d4/f
*: add d3/f (glob) 3: add d3/f
*: add d2/f (glob) 2: add d2/f
*: add d1/f (glob) 1: add d1/f
*: add d0/f (glob) 0: add d0/f
$ cd .. $ cd ..
Error if '.' or '..' are in the directory to track. Error if '.' or '..' are in the directory to track.
$ hg clone --narrow ssh://user@dummy/master foo --include ./asdf $ hg clone --narrow ssh://user@dummy/master foo --include ./asdf
requesting all changes requesting all changes
abort: "." and ".." are not allowed in narrowspec paths abort: "." and ".." are not allowed in narrowspec paths
[255] [255]
$ hg clone --narrow ssh://user@dummy/master foo --include asdf/.. $ hg clone --narrow ssh://user@dummy/master foo --include asdf/..
d0 d0
d0/f d0/f
d3 d3
d3/f d3/f
d6 d6
d6/f d6/f
$ hg verify -q $ hg verify -q
Force deletion of local changes Force deletion of local changes
$ hg log -T "{node|short}: {desc} {outsidenarrow}\n" $ hg log -T "{rev}: {desc} {outsidenarrow}\n"
*: local change to d3 (glob) 8: local change to d3
*: local change to d0 (glob) 6: local change to d0
*: add d10/f outsidenarrow (glob) 5: add d10/f outsidenarrow
*: add d6/f (glob) 4: add d6/f
*: add d5/f outsidenarrow (glob) 3: add d5/f outsidenarrow
*: add d3/f (glob) 2: add d3/f
*: add d2/f outsidenarrow (glob) 1: add d2/f outsidenarrow
*: add d0/f (glob) 0: add d0/f
$ hg tracked --removeinclude d0 --force-delete-local-changes $ hg tracked --removeinclude d0 --force-delete-local-changes
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
looking for local changes to affected paths looking for local changes to affected paths
The following changeset(s) or their ancestors have local changes not on the remote: The following changeset(s) or their ancestors have local changes not on the remote:
* (glob) * (glob)
saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
deleting data/d0/f.i (reporevlogstore !) deleting data/d0/f.i (reporevlogstore !)
deleting meta/d0/00manifest.i (tree !) deleting meta/d0/00manifest.i (tree !)
deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !) deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !) deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !)
deleting data/d0/f/index (reposimplestore !) deleting data/d0/f/index (reposimplestore !)
$ hg log -T "{node|short}: {desc} {outsidenarrow}\n" $ hg log -T "{rev}: {desc} {outsidenarrow}\n"
*: local change to d3 (glob) 7: local change to d3
*: add d10/f outsidenarrow (glob) 5: add d10/f outsidenarrow
*: add d6/f (glob) 4: add d6/f
*: add d5/f outsidenarrow (glob) 3: add d5/f outsidenarrow
*: add d3/f (glob) 2: add d3/f
*: add d2/f outsidenarrow (glob) 1: add d2/f outsidenarrow
*: add d0/f outsidenarrow (glob) 0: add d0/f outsidenarrow
Can restore stripped local changes after widening Can restore stripped local changes after widening
$ hg tracked --addinclude d0 -q $ hg tracked --addinclude d0 -q
$ hg unbundle .hg/strip-backup/*-narrow.hg -q $ hg unbundle .hg/strip-backup/*-narrow.hg -q
$ hg --hidden co -r 'desc("local change to d0")' -q $ hg --hidden co -r 'desc("local change to d0")' -q
$ cat d0/f $ cat d0/f
0 0
local change local change
Pruned commits affecting removed paths should not prevent narrowing Pruned commits affecting removed paths should not prevent narrowing