This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4452

tests: improve the widening testing in test-narrow-widen*
ClosedPublic

Authored by pulkit on Sep 4 2018, 9:01 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG83dd656586b1: tests: improve the widening testing in test-narrow-widen*
Summary

Before this patch, we are testing hg tracked --addinclude by adding a command
which is not introduced in the changesets till now.

If you closely look at the tests, wider/f was introduced on the server after the
narrow clone was done and extending the existing clone to include wider/f does
not make sense. We should test extending a file which exists.

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

pulkit created this revision.Sep 4 2018, 9:01 AM
Closed by commit rHG83dd656586b1: tests: improve the widening testing in test-narrow-widen* (authored by pulkit). · Explain WhySep 7 2018, 8:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 10830

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

4: update widest v3 4: update widest v3
3: add wider, update widest 3: add wider, update widest
2: add outside 2: add outside
1: add widest 1: add widest
0: add inside 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 widest 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 widest/f
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
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 0 changes to 1 files added 0 changesets with 1 changes to 2 files
3 local changesets published 3 local changesets published
$ hg tracked $ hg tracked
I path:inside I path:inside
I path:wider/f I path:widest/f
$ cat widest/f
widest
Pull down the newly added upstream revision. Pull down the newly added upstream revision.
$ hg pull $ hg pull
pulling from ssh://user@dummy/master pulling from ssh://user@dummy/master
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 5 changesets with 2 changes to 2 files added 5 changesets with 4 changes to 2 files
new changesets *:* (glob) new changesets *:* (glob)
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg update -r 'desc("add wider")' $ hg update -r 'desc("add wider")'
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
wider $ cat widest/f
widest v2
$ hg update -r 'desc("update inside")' $ hg update -r 'desc("update inside")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat wider/f $ cat widest/f
wider widest v3
$ cat inside/f $ cat inside/f
inside v2 inside v2
$ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
7: update widest v4 7: update widest v4
6: add outside2 6: add outside2
5: update inside 5: update inside
4: update widest v3 4: update widest v3
3: add wider, update widest 3: add wider, update widest
2: add outside 2: add outside
1: add widest 1: add widest
0: add inside 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]
widen the narrow spec to include the widest file widen the narrow spec to include the wider file
$ hg tracked --addinclude widest $ hg tracked --addinclude wider
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
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 4 changes to 3 files added 0 changesets with 1 changes to 3 files
5 local changesets published 5 local changesets published
$ hg tracked $ hg tracked
I path:inside I path:inside
I path:wider/f I path:wider
I path:widest I path:widest/f
$ hg update 'desc("add widest")' $ hg update 'desc("add widest")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ cat widest/f $ cat widest/f
widest widest
$ hg update 'desc("add wider, update widest")' $ hg update 'desc("add wider, update widest")'
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 wider/f $ cat wider/f
wider wider

tests/test-narrow-widen.t

4: update widest v3 4: update widest v3
3: add wider, update widest 3: add wider, update widest
2: add outside 2: add outside
1: add widest 1: add widest
0: add inside 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 widest 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 widest/f
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
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 2 changesets with 1 changes to 1 files added 3 changesets with 2 changes to 2 files
new changesets *:* (glob) new changesets *:* (glob)
$ hg tracked $ hg tracked
I path:inside I path:inside
I path:wider/f I path:widest/f
$ cat widest/f
widest
Pull down the newly added upstream revision. Pull down the newly added upstream revision.
$ hg pull $ hg pull
pulling from ssh://user@dummy/master pulling from ssh://user@dummy/master
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 4 changesets with 2 changes to 2 files added 5 changesets with 4 changes to 2 files
new changesets *:* (glob) new changesets *:* (glob)
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg update -r 'desc("add wider")' $ hg update -r 'desc("add wider")'
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 widest/f
wider widest v2
$ hg update -r 'desc("update inside")' $ hg update -r 'desc("update inside")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat wider/f $ cat widest/f
wider widest v3
$ cat inside/f $ cat inside/f
inside v2 inside v2
$ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
...5: update widest v4 7: update widest v4
4: update inside ...6: add outside2
...3: update widest v3 5: update inside
2: add wider, update widest 4: update widest v3
...1: add outside 3: add wider, update widest
...2: add outside
1: add widest
0: add inside 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]
widen the narrow spec to include the widest file widen the narrow spec to include the wider file
$ hg tracked --addinclude widest $ hg tracked --addinclude wider
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
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 8 changesets with 7 changes to 3 files added 8 changesets with 7 changes to 3 files
new changesets *:* (glob) new changesets *:* (glob)
$ hg tracked $ hg tracked
I path:inside I path:inside
I path:wider/f I path:wider
I path:widest I path:widest/f
$ hg update 'desc("add widest")' $ hg update 'desc("add widest")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ cat widest/f $ cat widest/f
widest widest
$ hg update 'desc("add wider, update widest")' $ hg update 'desc("add wider, update widest")'
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 wider/f $ cat wider/f
wider wider