This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4385

tests: add flat manifest case in test-narrow-widen-non-ellipsis.t
ClosedPublic

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

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG57b2a02420cd: tests: add flat manifest case in test-narrow-widen-non-ellipsis.t
Summary

We had this test with tree manifest only because the tests were broken and we
were fixing them and maintaing two different cases of broken tests was bit hard.
Now that things work fine, let's add the flat manifest case.

The test shows that things work fine in both cases.

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:10 AM
martinvonz accepted this revision.Aug 29 2018, 7:39 PM
martinvonz added a subscriber: martinvonz.
martinvonz added inline comments.
tests/test-narrow-widen-non-ellipsis.t
127–128

I know that you're just copying this from other test, but I wonder why we didn't just use {rev} instead of {node|short} so we didn't have to glob it out. It makes more sense to fix that in all the tests after this series, of course.

This revision is now accepted and ready to land.Aug 29 2018, 7:39 PM
Closed by commit rHG57b2a02420cd: tests: add flat manifest case in test-narrow-widen-non-ellipsis.t (authored by pulkit). · Explain WhyAug 29 2018, 7:45 PM
This revision was automatically updated to reflect the committed changes.
pulkit added inline comments.Aug 30 2018, 8:45 AM
tests/test-narrow-widen-non-ellipsis.t
127–128

Yes makes sense to use {rev} and thanks for the patch for that.

Revision Contents
Changeset List

Diff 10664

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

#testcases tree flat
$ . "$TESTDIR/narrow-library.sh" $ . "$TESTDIR/narrow-library.sh"
#if tree
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [experimental] > [experimental]
> treemanifest = 1 > treemanifest = 1
> EOF > EOF
#endif
$ hg init master $ hg init master
$ cd master $ cd master
$ 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'
$ 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, '...')}{node|short}: {desc}\n"
45662f0793c7: update widest v4 *: update widest v4 (glob)
martinvonzUnsubmitted
Not Done

I know that you're just copying this from other test, but I wonder why we didn't just use {rev} instead of {node|short} so we didn't have to glob it out. It makes more sense to fix that in all the tests after this series, of course.

martinvonz: I know that you're just copying this from other test, but I wonder why we didn't just use…
pulkitAuthorUnsubmitted
Not Done

Yes makes sense to use {rev} and thanks for the patch for that.

pulkit: Yes makes sense to use {rev} and thanks for the patch for that.
1dd1364b566e: add outside2 *: add outside2 (glob)
*: update inside (glob) *: update inside (glob)
be0600e3ccba: update widest v3 *: update widest v3 (glob)
*: add wider, update widest (glob) *: add wider, update widest (glob)
4922ea71b958: add outside *: add outside (glob)
40e0ea6c8cd7: add widest *: add widest (glob)
*: 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]
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, '...')}{node|short}: {desc}\n"
*: update widest v4 (glob) *: update widest v4 (glob)
1dd1364b566e: add outside2 *: add outside2 (glob)
*: update inside (glob) *: update inside (glob)
*: update widest v3 (glob) *: update widest v3 (glob)
*: add wider, update widest (glob) *: add wider, update widest (glob)
4922ea71b958: add outside *: add outside (glob)
*: 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
$ 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 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, '...')}{node|short}: {desc}\n"
5dcf948d1e26: add d10/f *: add d10/f (glob)
*: add d9/f (glob) *: add d9/f (glob)
ed07d334af10: add d8/f *: add d8/f (glob)
472749d2eed8: add d7/f *: add d7/f (glob)
*: add d6/f (glob) *: add d6/f (glob)
47c482f555ec: add d5/f *: add d5/f (glob)
3c6772db7d10: add d4/f *: add d4/f (glob)
*: add d3/f (glob) *: add d3/f (glob)
a68ce05aaaed: add d2/f *: add d2/f (glob)
5934322a52dd: add d1/f *: add d1/f (glob)
*: 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
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, '...')}{node|short}: {desc}\n"
5dcf948d1e26: add d10/f *: add d10/f (glob)
*: add d9/f (glob) *: add d9/f (glob)
ed07d334af10: add d8/f *: add d8/f (glob)
472749d2eed8: add d7/f *: add d7/f (glob)
*: add d6/f (glob) *: add d6/f (glob)
47c482f555ec: add d5/f *: add d5/f (glob)
3c6772db7d10: add d4/f *: add d4/f (glob)
*: add d3/f (glob) *: add d3/f (glob)
a68ce05aaaed: add d2/f *: add d2/f (glob)
*: 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 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, '...')}{node|short}: {desc}\n"
*: add d2/f (glob) *: add d2/f (glob)
5934322a52dd: add d1/f *: add d1/f (glob)
44d97ac7c511: add d0/f *: add d0/f (glob)
$ 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
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 11:42aed9c63197 * bookmark 11:* (glob)
$ hg -q tracked --addinclude d2 $ hg -q tracked --addinclude d2
$ hg bookmarks $ hg bookmarks
* bookmark 11:42aed9c63197 * bookmark 11:* (glob)
$ 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
6: add d6/f 6: add d6/f
5: add d5/f 5: add d5/f
4: add d4/f 4: add d4/f
3: add d3/f 3: add d3/f
2: add d2/f 2: add d2/f
1: add d1/f 1: add d1/f
0: add d0/f 0: add d0/f
$ hg bookmarks $ hg bookmarks
* bookmark 11:b7ce3df41eca * bookmark 11:* (glob)
$ hg unbundle .hg/strip-backup/*-widen.hg $ hg unbundle .hg/strip-backup/*-widen.hg
abort: $ENOENT$: .hg/strip-backup/*-widen.hg abort: $ENOENT$: .hg/strip-backup/*-widen.hg
[255] [255]
$ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
11: local 11: local
10: add d10/f 10: add d10/f
9: add d9/f 9: add d9/f
8: add d8/f 8: add d8/f
7: add d7/f 7: add d7/f
6: add d6/f 6: add d6/f
5: add d5/f 5: add d5/f
4: add d4/f 4: add d4/f
3: add d3/f 3: add d3/f
2: add d2/f 2: add d2/f
1: add d1/f 1: add d1/f
0: add d0/f 0: add d0/f
$ hg bookmarks $ hg bookmarks
* bookmark 11:b7ce3df41eca * bookmark 11:* (glob)