This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1822

test-treemanifest-treeonly: update test to have more flat manifests
AbandonedPublic

Authored by singhsrb on Jan 5 2018, 7:26 PM.
Tags
None
Subscribers
None

Details

Reviewers
None
Group Reviewers
Restricted Project
Summary

The commit just updates the 'test-treemanifest-treeonly.t' in
preparation for testing of on demand conversion of flat manifest to tree
manifest. This is separated out specifically to aid with the review.

Test Plan

Ran all the tests.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

singhsrb created this revision.Jan 5 2018, 7:26 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 5 2018, 7:26 PM
singhsrb abandoned this revision.Jan 31 2018, 5:44 PM

Will be rebasing and floating for review again.

Revision Contents
Changeset List

PathPackages
Mtests/test-treemanifest-treeonly.t (69 lines)

Diff 4722

tests/test-treemanifest-treeonly.t

1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob) 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ cd client $ cd client
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> EOF > EOF
Make a flat-only draft commit Make a flat-only draft commit tree
$ echo f >> subdir/x $ echo f1 >> subdir/x
$ hg commit -qm "flat only commit" $ hg commit -qm 'flat only commit 1 at level 1'
$ echo f11 >> subdir/x
$ hg commit -qm 'flat only commit 1 over flat only commit 1 at level 1'
$ hg up '.^' $ hg up '.^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo f12 >> subdir/x
$ hg commit -qm 'flat only commit 2 over flat only commit 1 at level 1'
$ echo f121 >> subdir/x
$ hg commit -qm 'flat only commit 1 over flat only commit 2 at level 2'
$ hg up '.^^^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Transition to hybrid flat+tree client Transition to hybrid flat+tree client
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> treemanifest=$TESTDIR/../treemanifest > treemanifest=$TESTDIR/../treemanifest
> fastmanifest=$TESTDIR/../fastmanifest > fastmanifest=$TESTDIR/../fastmanifest
> [fastmanifest] > [fastmanifest]
> usetree=True > usetree=True
subdir/x | 1 + subdir/x | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
$ ls_l $CACHEDIR/master/packs/manifests | wc -l $ ls_l $CACHEDIR/master/packs/manifests | wc -l
\s*4 (re) \s*4 (re)
# Viewing flat draft commit should not produce tree packs # Viewing flat draft commit should not produce tree packs
$ hg log -r tip --stat -T '{desc}\n' $ hg log -r tip --stat -T '{desc}\n'
flat only commit flat only commit 1 over flat only commit 2 at level 2
subdir/x | 1 + subdir/x | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
$ ls_l $CACHEDIR/master/packs/manifests | wc -l $ ls_l $CACHEDIR/master/packs/manifests | wc -l
\s*4 (re) \s*4 (re)
Transition to tree-only client
$ cat >> .hg/hgrc <<EOF
> [treemanifest]
> treeonly=True
> EOF
Make a local hybrid flat+tree draft commit Make a local hybrid flat+tree draft commit
$ echo h >> subdir/x $ echo h >> subdir/x
$ ls_l .hg/store | grep packs $ ls_l .hg/store | grep packs
[1] [1]
$ hg commit -qm "hybrid flat+tree commit" $ hg commit -qm "hybrid flat+tree commit" --config treemanifest.treeonly=False
$ hg up '.^' $ hg up '.^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ ls_l .hg/store/packs/manifests $ ls_l .hg/store/packs/manifests
-r--r--r-- 1106 3c68632603fbc30bd6ee720bd43c0f0940930cc8.dataidx -r--r--r-- 1106 3c68632603fbc30bd6ee720bd43c0f0940930cc8.dataidx
-r--r--r-- 211 3c68632603fbc30bd6ee720bd43c0f0940930cc8.datapack -r--r--r-- 211 3c68632603fbc30bd6ee720bd43c0f0940930cc8.datapack
-r--r--r-- 1196 54389aae9b0f11d9cc4e33901e6de68bad129e73.histidx -r--r--r-- 1196 54389aae9b0f11d9cc4e33901e6de68bad129e73.histidx
-r--r--r-- 183 54389aae9b0f11d9cc4e33901e6de68bad129e73.histpack -r--r--r-- 183 54389aae9b0f11d9cc4e33901e6de68bad129e73.histpack
Transition to tree-only client
$ cat >> .hg/hgrc <<EOF
> [treemanifest]
> treeonly=True
> EOF
Make a local tree-only draft commit Make a local tree-only draft commit
$ ls_l .hg/store/packs/manifests | wc -l $ ls_l .hg/store/packs/manifests | wc -l
\s*4 (re) \s*4 (re)
$ echo t >> subdir/x $ echo t >> subdir/x
$ hg commit -qm "tree only commit" $ hg commit -qm "tree only commit"
1 trees fetched over * (glob) 1 trees fetched over * (glob)
$ hg debugdata -c 3 $ hg debugdata -c 6
7fdb5a91151d114ca83c30c5cb4a1029ef9700ef 7fdb5a91151d114ca83c30c5cb4a1029ef9700ef
test test
0 0 0 0
subdir/x subdir/x
tree only commit (no-eol) tree only commit (no-eol)
$ ls_l .hg/store/packs/manifests | wc -l $ ls_l .hg/store/packs/manifests | wc -l
\s*8 (re) \s*8 (re)
# No manifest revlog revision was added # No manifest revlog revision was added
$ hg debugindex -m --config treemanifest.treeonly=False $ hg debugindex -m --config treemanifest.treeonly=False
rev offset length delta linkrev nodeid p1 p2 rev offset length delta linkrev nodeid p1 p2
0 0 51 -1 0 85b359fdb09e 000000000000 000000000000 0 0 51 -1 0 85b359fdb09e 000000000000 000000000000
1 51 51 -1 1 c0196aba344d 85b359fdb09e 000000000000 1 51 51 -1 1 40f43426c87b 85b359fdb09e 000000000000
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000 2 102 51 -1 2 53c631458e33 40f43426c87b 000000000000
3 153 51 -1 3 a6875e5fbf69 40f43426c87b 000000000000
4 204 51 -1 4 b7db2b1fa98f a6875e5fbf69 000000000000
5 255 51 -1 5 0427baa4e948 85b359fdb09e 000000000000
Tree-only amend Tree-only amend
$ echo >> subdir/x $ echo >> subdir/x
$ hg commit --amend $ hg commit --amend
saved backup bundle to $TESTTMP/client/.hg/strip-backup/779a137458d0-0b309c3a-amend.hg (glob) saved backup bundle to $TESTTMP/client/.hg/strip-backup/779a137458d0-0b309c3a-amend.hg (glob)
# amend commit was added # amend commit was added
$ ls_l .hg/store/packs/manifests | wc -l $ ls_l .hg/store/packs/manifests | wc -l
\s*12 (re) \s*12 (re)
# No manifest revlog revision was added # No manifest revlog revision was added
$ hg debugindex -m --config treemanifest.treeonly=False $ hg debugindex -m --config treemanifest.treeonly=False
rev offset length delta linkrev nodeid p1 p2 rev offset length delta linkrev nodeid p1 p2
0 0 51 -1 0 85b359fdb09e 000000000000 000000000000 0 0 51 -1 0 85b359fdb09e 000000000000 000000000000
1 51 51 -1 1 c0196aba344d 85b359fdb09e 000000000000 1 51 51 -1 1 40f43426c87b 85b359fdb09e 000000000000
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000 2 102 51 -1 2 53c631458e33 40f43426c87b 000000000000
3 153 51 -1 3 a6875e5fbf69 40f43426c87b 000000000000
4 204 51 -1 4 b7db2b1fa98f a6875e5fbf69 000000000000
5 255 51 -1 5 0427baa4e948 85b359fdb09e 000000000000
# Delete the original commits packs # Delete the original commits packs
$ rm -rf .hg/store/packs/manifests/26653c55cb54ab20aeb188315d736fb2ece04cd1* $ rm -rf .hg/store/packs/manifests/26653c55cb54ab20aeb188315d736fb2ece04cd1*
$ rm -rf .hg/store/packs/manifests/2a492611dfb8fbde1652e7e54fa1f64b82bd8ff7* $ rm -rf .hg/store/packs/manifests/2a492611dfb8fbde1652e7e54fa1f64b82bd8ff7*
$ ls_l .hg/store/packs/manifests | wc -l $ ls_l .hg/store/packs/manifests | wc -l
\s*8 (re) \s*8 (re)
Test looking at the tree from inside the bundle Test looking at the tree from inside the bundle
$ hg log -r tip -vp -R $TESTTMP/client/.hg/strip-backup/779a137458d0-0b309c3a-amend.hg --pager=off $ hg log -r tip -vp -R $TESTTMP/client/.hg/strip-backup/779a137458d0-0b309c3a-amend.hg --pager=off
changeset: 4:779a137458d0 changeset: 7:779a137458d0
tag: tip tag: tip
parent: 0:2278cc8c6ce6 parent: 0:2278cc8c6ce6
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
files: subdir/x files: subdir/x
description: description:
tree only commit tree only commit
adding file changes adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads) added 1 changesets with 0 changes to 0 files (+1 heads)
new changesets 779a137458d0 new changesets 779a137458d0
(run 'hg heads .' to see heads, 'hg merge' to merge) (run 'hg heads .' to see heads, 'hg merge' to merge)
# Verify the packs were brought back and the data is accessible # Verify the packs were brought back and the data is accessible
$ ls_l .hg/store/packs/manifests | wc -l $ ls_l .hg/store/packs/manifests | wc -l
\s*12 (re) \s*12 (re)
$ hg log -r tip --stat $ hg log -r tip --stat
changeset: 4:779a137458d0 changeset: 7:779a137458d0
tag: tip tag: tip
parent: 0:2278cc8c6ce6 parent: 0:2278cc8c6ce6
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: tree only commit summary: tree only commit
subdir/x | 1 + subdir/x | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
adding file changes adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads) added 1 changesets with 0 changes to 0 files (+1 heads)
new changesets 2937cde31c19 new changesets 2937cde31c19
(run 'hg heads .' to see heads, 'hg merge' to merge) (run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg debugindex -m --config treemanifest.treeonly=False $ hg debugindex -m --config treemanifest.treeonly=False
rev offset length delta linkrev nodeid p1 p2 rev offset length delta linkrev nodeid p1 p2
0 0 51 -1 0 85b359fdb09e 000000000000 000000000000 0 0 51 -1 0 85b359fdb09e 000000000000 000000000000
1 51 51 -1 1 c0196aba344d 85b359fdb09e 000000000000 1 51 51 -1 1 40f43426c87b 85b359fdb09e 000000000000
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000 2 102 51 -1 2 53c631458e33 40f43426c87b 000000000000
3 153 51 -1 3 a6875e5fbf69 40f43426c87b 000000000000
4 204 51 -1 4 b7db2b1fa98f a6875e5fbf69 000000000000
5 255 51 -1 5 0427baa4e948 85b359fdb09e 000000000000
$ hg log -r tip --stat --pager=off $ hg log -r tip --stat --pager=off
2 trees fetched over * (glob) 2 trees fetched over * (glob)
changeset: 5:2937cde31c19 changeset: 8:2937cde31c19
tag: tip tag: tip
parent: 0:2278cc8c6ce6 parent: 0:2278cc8c6ce6
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: modify subdir/x summary: modify subdir/x
subdir/x | 1 + subdir/x | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob) 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
Test rebasing treeonly commits Test rebasing treeonly commits
$ hg rebase -d 5 -b 2 $ hg rebase -d 8 -b 5
rebasing 2:4b702090309e "hybrid flat+tree commit" rebasing 5:4b702090309e "hybrid flat+tree commit"
merging subdir/x merging subdir/x
warning: conflicts while merging subdir/x! (edit, then use 'hg resolve --mark') warning: conflicts while merging subdir/x! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ printf "x\nx\nh\n" > subdir/x $ printf "x\nx\nh\n" > subdir/x
$ hg resolve --mark subdir/x $ hg resolve --mark subdir/x
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 2:4b702090309e "hybrid flat+tree commit" rebasing 5:4b702090309e "hybrid flat+tree commit"
saved backup bundle to $TESTTMP/client/.hg/strip-backup/4b702090309e-7a0f0c5f-rebase.hg (glob) saved backup bundle to $TESTTMP/client/.hg/strip-backup/4b702090309e-7a0f0c5f-rebase.hg (glob)
Test histedit treeonly commits Test histedit treeonly commits
$ hg up -q 38a88da6315b $ hg up -q 38a88da6315b
$ hg purge --config extensions.purge= $ hg purge --config extensions.purge=
$ echo y > y $ echo y > y
$ hg commit -Aqm 'add y' $ hg commit -Aqm 'add y'
$ hg histedit --config extensions.histedit= --commands - <<EOF $ hg histedit --config extensions.histedit= --commands - <<EOF
Test {manifest} template Test {manifest} template
$ hg log -r . -T '{manifest}' $ hg log -r . -T '{manifest}'
0ab0ab59dd6ab41bda558ad2fd4c665da69323ab (no-eol) 0ab0ab59dd6ab41bda558ad2fd4c665da69323ab (no-eol)
Test turning treeonly off and making sure we can still commit on top of treeonly Test turning treeonly off and making sure we can still commit on top of treeonly
commits commits
$ echo >> subdir/x $ echo >> subdir/x
$ hg debugindex -m --config treemanifest.treeonly=False | tail -1 $ hg debugindex -m --config treemanifest.treeonly=False | tail -1
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000 5 255 51 -1 5 0427baa4e948 85b359fdb09e 000000000000
$ hg commit -m 'treeonly from hybrid repo' --config treemanifest.treeonly=False $ hg commit -m 'treeonly from hybrid repo' --config treemanifest.treeonly=False
$ hg log -r . -T '{desc}\n' --stat $ hg log -r . -T '{desc}\n' --stat
treeonly from hybrid repo treeonly from hybrid repo
subdir/x | 1 + subdir/x | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
$ hg log -r . -T '{desc}\n' --stat --config treemanifest.treeonly=False $ hg log -r . -T '{desc}\n' --stat --config treemanifest.treeonly=False
treeonly from hybrid repo treeonly from hybrid repo
subdir/x | 1 + subdir/x | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
$ hg debugindex -m --config treemanifest.treeonly=False | tail -1 $ hg debugindex -m --config treemanifest.treeonly=False | tail -1
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000 5 255 51 -1 5 0427baa4e948 85b359fdb09e 000000000000
$ hg strip -r . --config fbamend.safestrip=False $ hg strip -r . --config fbamend.safestrip=False
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/client/.hg/strip-backup/87da9865954c-3cfa5389-backup.hg (glob) saved backup bundle to $TESTTMP/client/.hg/strip-backup/87da9865954c-3cfa5389-backup.hg (glob)
Test peer-to-peer push/pull of tree only commits Test peer-to-peer push/pull of tree only commits
$ cd .. $ cd ..
$ clearcache $ clearcache
$ hgcloneshallow ssh://user@dummy/master client2 -q --config treemanifest.treeonly=True --config extensions.treemanifest= $ hgcloneshallow ssh://user@dummy/master client2 -q --config treemanifest.treeonly=True --config extensions.treemanifest=