This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4382

tests: add test to show widening is broken without ellipsis
ClosedPublic

Authored by pulkit on Aug 27 2018, 8:09 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGbca0546a44bf: tests: add test to show widening is broken without ellipsis
Summary

This patch adds a test to show that widening a narrow clone is broken if
ellipsis is disabled.

I don't think I can add cases to existing test-narrow-widen.t and check-in a
failing version of that. So I created a copy. Once the test is fixed, we can
merge this new test file back into the original one using testcases.

Also, this is just testing treemanifest case because having two cases and both
or are failing with different outputs is a bit hard to manage.

This is important because upcoming patches will try to fix the broken part.

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.Aug 27 2018, 8:09 AM
martinvonz added a subscriber: martinvonz.Aug 28 2018, 7:31 PM
martinvonz added inline comments.
tests/test-narrow-widen-non-ellipsis.t
2–3

nit: could you call it test-narrow-widen-no-ellipsis.t to match test-narrow-clone-no-ellipsis.t?

107

Wow, we don't even update the narrowspec? This is worse than I expected.

Closed by commit rHGbca0546a44bf: tests: add test to show widening is broken without ellipsis (authored by pulkit). · Explain WhyAug 29 2018, 7:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Ptests/test-narrow-widen-non-ellipsis.t (203 lines)
Copied from tests/test-narrow-widen.t
Ptests/test-narrow-widen.t
Copied to tests/test-narrow-widen-non-ellipsis.t

Diff 10661

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

  • This file was copied from tests/test-narrow-widen.t.
#testcases flat tree
$ . "$TESTDIR/narrow-library.sh" $ . "$TESTDIR/narrow-library.sh"
#if tree
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
martinvonzUnsubmitted
Not Done

nit: could you call it test-narrow-widen-no-ellipsis.t to match test-narrow-clone-no-ellipsis.t?

martinvonz: nit: could you call it `test-narrow-widen-no-ellipsis.t` to match `test-narrow-clone-no…
> [experimental] > [experimental]
> treemanifest = 1 > treemanifest = 1
> EOF > EOF
#endif
$ hg init master $ hg init master
$ cd master $ cd master
$ cat >> .hg/hgrc <<EOF
> [narrow]
> serveellipses=True
> EOF
$ mkdir inside $ mkdir inside
$ echo 'inside' > inside/f $ echo 'inside' > inside/f
$ hg add inside/f $ hg add inside/f
$ hg commit -m 'add inside' $ hg commit -m 'add inside'
$ mkdir widest $ mkdir widest
$ echo 'widest' > widest/f $ echo 'widest' > widest/f
narrow clone the inside file narrow clone the inside file
$ hg clone --narrow ssh://user@dummy/master narrow --include inside $ hg clone --narrow ssh://user@dummy/master narrow --include inside
requesting all changes requesting all changes
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 1 changes to 1 files
new changesets *:* (glob) new changesets *:* (glob)
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
$ hg tracked $ hg tracked
I path:inside I path:inside
$ ls $ ls
inside inside
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
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) 3 local changesets published
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
new changesets *:* (glob)
$ hg tracked $ hg tracked
I path:inside I path:inside
I path:wider/f
martinvonzUnsubmitted
Not Done

Wow, we don't even update the narrowspec? This is worse than I expected.

martinvonz: Wow, we don't even update the narrowspec? This is worse than I expected.
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 1 changes to 1 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 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat wider/f $ cat wider/f
wider cat: wider/f: $ENOENT$
[1]
$ 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 cat: wider/f: $ENOENT$
[1]
$ cat inside/f $ cat inside/f
inside v2 inside v2
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
...*: update widest v4 (glob) 45662f0793c7: update widest v4
1dd1364b566e: add outside2
*: update inside (glob) *: update inside (glob)
...*: update widest v3 (glob) be0600e3ccba: update widest v3
*: add wider, update widest (glob) *: add wider, update widest (glob)
...*: add outside (glob) 4922ea71b958: add outside
40e0ea6c8cd7: add widest
*: add inside (glob) *: add inside (glob)
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 widest file
$ hg tracked --addinclude widest $ hg tracked --addinclude widest
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) 5 local changesets published
adding changesets abort: path ends in directory separator: widest/
adding manifests [255]
adding file changes
added 8 changesets with 7 changes to 3 files
new changesets *:* (glob)
$ hg tracked $ hg tracked
I path:inside I path:inside
I path:wider/f
I path:widest
$ hg update 'desc("add widest")' $ hg update 'desc("add widest")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat widest/f $ cat widest/f
widest cat: widest/f: $ENOENT$
[1]
$ 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 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat wider/f $ cat wider/f
wider cat: wider/f: $ENOENT$
[1]
$ cat widest/f $ cat widest/f
widest v2 cat: widest/f: $ENOENT$
[1]
$ hg update 'desc("update widest v3")' $ hg update 'desc("update widest v3")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat widest/f $ cat widest/f
widest v3 cat: widest/f: $ENOENT$
[1]
$ hg update 'desc("update widest v4")' $ hg update 'desc("update widest v4")'
2 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 v4 cat: widest/f: $ENOENT$
[1]
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
*: update widest v4 (glob) *: update widest v4 (glob)
...*: add outside2 (glob) 1dd1364b566e: add outside2
*: update inside (glob) *: update inside (glob)
*: update widest v3 (glob) *: update widest v3 (glob)
*: add wider, update widest (glob) *: add wider, update widest (glob)
...*: add outside (glob) 4922ea71b958: add outside
*: add widest (glob) *: add widest (glob)
*: add inside (glob) *: add inside (glob)
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
> [narrow]
> serveellipses=True
> 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 "{node|short}: {desc}\n"
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
adding file changes adding file changes
added 8 changesets with 4 changes to 4 files added 11 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 narrow2 $ cd narrow2
$ hg tracked $ hg tracked
I path:d0 I path:d0
I path:d3 I path:d3
I path:d6 I path:d6
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
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, 11 changesets, 4 total revisions
$ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{node|short}: {desc}\n"
...*: add d10/f (glob) 5dcf948d1e26: add d10/f
*: add d9/f (glob) *: add d9/f (glob)
...*: add d8/f (glob) ed07d334af10: add d8/f
472749d2eed8: add d7/f
*: add d6/f (glob) *: add d6/f (glob)
...*: add d5/f (glob) 47c482f555ec: add d5/f
3c6772db7d10: add d4/f
*: add d3/f (glob) *: add d3/f (glob)
...*: add d2/f (glob) a68ce05aaaed: add d2/f
5934322a52dd: add d1/f
*: add d0/f (glob) *: add d0/f (glob)
$ 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) 11 local changesets published
adding changesets abort: path ends in directory separator: d1/
adding manifests [255]
adding file changes
added 9 changesets with 5 changes to 5 files
new changesets *:* (glob)
$ hg tracked $ hg tracked
I path:d0 I path:d0
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, '...')}{node|short}: {desc}\n"
...*: add d10/f (glob) 5dcf948d1e26: add d10/f
*: add d9/f (glob) *: add d9/f (glob)
...*: add d8/f (glob) ed07d334af10: add d8/f
472749d2eed8: add d7/f
*: add d6/f (glob) *: add d6/f (glob)
...*: add d5/f (glob) 47c482f555ec: add d5/f
3c6772db7d10: add d4/f
*: add d3/f (glob) *: add d3/f (glob)
...*: add d2/f (glob) a68ce05aaaed: add d2/f
*: add d1/f (glob) *: add d1/f (glob)
*: add d0/f (glob) *: add d0/f (glob)
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
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
5 files, 9 changesets, 5 total revisions 4 files, 11 changesets, 4 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, '...')}{node|short}: {desc}\n"
*: add d2/f (glob) *: add d2/f (glob)
...*: add d1/f (glob) 5934322a52dd: add d1/f
44d97ac7c511: 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
abort: path ends in directory separator: d0/
[255]
Widening preserves bookmarks Widening preserves bookmarks
$ cd .. $ cd ..
$ hg clone -q --narrow ssh://user@dummy/upstream narrow-bookmarks --include d4 $ hg clone -q --narrow ssh://user@dummy/upstream narrow-bookmarks --include d4
$ cd narrow-bookmarks $ cd narrow-bookmarks
$ echo local > d4/f $ echo local > d4/f
$ hg ci -m local $ hg ci -m local
$ hg bookmarks bookmark $ hg bookmarks bookmark
$ hg bookmarks $ hg bookmarks
* bookmark 3:* (glob) * bookmark 11:42aed9c63197
$ hg -q tracked --addinclude d2 $ hg -q tracked --addinclude d2
abort: path ends in directory separator: d2/
[255]
$ hg bookmarks $ hg bookmarks
* bookmark 5:* (glob) * bookmark 11:42aed9c63197
$ hg log -r bookmark -T '{desc}\n' $ hg log -r bookmark -T '{desc}\n'
local local
Widening that fails can be recovered from Widening that fails can be recovered from
$ cd .. $ cd ..
$ hg clone -q --narrow ssh://user@dummy/upstream interrupted --include d0 $ hg clone -q --narrow ssh://user@dummy/upstream interrupted --include d0
$ cd interrupted $ cd interrupted
$ echo local > d0/f $ echo local > d0/f
$ hg ci -m local $ hg ci -m local
$ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
2: local 11: local
...1: add d10/f 10: add d10/f
9: add d9/f
8: add d8/f
7: add d7/f
6: add d6/f
5: add d5/f
4: add d4/f
3: add d3/f
2: add d2/f
1: add d1/f
0: add d0/f 0: add d0/f
$ hg bookmarks bookmark $ hg bookmarks bookmark
$ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1 $ hg --config hooks.pretxnchangegroup.bad=false 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/interrupted/.hg/strip-backup/*-widen.hg (glob) 11 local changesets published
adding changesets abort: path ends in directory separator: d1/
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
transaction abort!
rollback completed
abort: pretxnchangegroup.bad hook exited with status 1
[255] [255]
$ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
11: local
10: add d10/f
9: add d9/f
8: add d8/f
7: add d7/f
6: add d6/f
5: add d5/f
4: add d4/f
3: add d3/f
2: add d2/f
1: add d1/f
0: add d0/f
$ hg bookmarks $ hg bookmarks
no bookmarks set * bookmark 11:b7ce3df41eca
$ hg unbundle .hg/strip-backup/*-widen.hg $ hg unbundle .hg/strip-backup/*-widen.hg
adding changesets abort: $ENOENT$: .hg/strip-backup/*-widen.hg
adding manifests [255]
adding file changes
added 3 changesets with 2 changes to 1 files
new changesets *:* (glob)
(run 'hg update' to get a working copy)
$ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
2: local 11: local
...1: add d10/f 10: add d10/f
9: add d9/f
8: add d8/f
7: add d7/f
6: add d6/f
5: add d5/f
4: add d4/f
3: add d3/f
2: add d2/f
1: add d1/f
0: add d0/f 0: add d0/f
$ hg bookmarks $ hg bookmarks
* bookmark 2:* (glob) * bookmark 11:b7ce3df41eca

tests/test-narrow-widen.t

  • This file was copied to tests/test-narrow-widen-non-ellipsis.t.