mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +03:00
ee2c606728
The core Mercurial manifest template prints the rev number and the short hash. Since treemanifest doesn't have rev numbers, this has to change. Let's just have it print the whole hash, since manifest hashes are usually only ever used by automation which probably wants the whole hash anyway. Differential Revision: https://phab.mercurial-scm.org/D1305
425 lines
14 KiB
Perl
425 lines
14 KiB
Perl
$ . "$TESTDIR/library.sh"
|
|
|
|
$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
|
|
$ export PYTHONPATH
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [treemanifest]
|
|
> sendtrees=True
|
|
> EOF
|
|
|
|
Setup the server
|
|
|
|
$ hginit master
|
|
$ cd master
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
|
|
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
|
> treemanifest=$TESTDIR/../treemanifest
|
|
> [treemanifest]
|
|
> server=True
|
|
> [remotefilelog]
|
|
> server=True
|
|
> shallowtrees=True
|
|
> EOF
|
|
|
|
Make local commits on the server
|
|
$ mkdir subdir
|
|
$ echo x > subdir/x
|
|
$ hg commit -qAm 'add subdir/x'
|
|
|
|
The following will simulate the transition from flat to tree-only
|
|
1. Flat only client, with flat only draft commits
|
|
2. Hybrid client, with some flat and some flat+tree draft commits
|
|
3. Tree-only client, with only tree commits (old flat are converted)
|
|
|
|
Create flat manifest client
|
|
$ cd ..
|
|
$ hgcloneshallow ssh://user@dummy/master client -q
|
|
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
|
|
$ cd client
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> fbamend=$TESTDIR/../hgext3rd/fbamend
|
|
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
|
|
> EOF
|
|
|
|
Make a flat-only draft commit
|
|
$ echo f >> subdir/x
|
|
$ hg commit -qm "flat only commit"
|
|
$ hg up '.^'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Transition to hybrid flat+tree client
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> treemanifest=$TESTDIR/../treemanifest
|
|
> fastmanifest=$TESTDIR/../fastmanifest
|
|
> [fastmanifest]
|
|
> usetree=True
|
|
> usecache=False
|
|
> [treemanifest]
|
|
> demanddownload=True
|
|
> EOF
|
|
|
|
# Viewing commit from server should download trees
|
|
$ hg log -r . --stat -T "{desc}\n"
|
|
2 trees fetched over * (glob)
|
|
add subdir/x
|
|
subdir/x | 1 +
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
$ ls_l $CACHEDIR/master/packs/manifests | wc -l
|
|
\s*4 (re)
|
|
|
|
# Viewing flat draft commit should not produce tree packs
|
|
$ hg log -r tip --stat -T '{desc}\n'
|
|
flat only commit
|
|
subdir/x | 1 +
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
$ ls_l $CACHEDIR/master/packs/manifests | wc -l
|
|
\s*4 (re)
|
|
|
|
Make a local hybrid flat+tree draft commit
|
|
$ echo h >> subdir/x
|
|
$ ls_l .hg/store | grep packs
|
|
[1]
|
|
$ hg commit -qm "hybrid flat+tree commit"
|
|
$ hg up '.^'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ ls_l .hg/store/packs/manifests
|
|
-r--r--r-- 1106 3c68632603fbc30bd6ee720bd43c0f0940930cc8.dataidx
|
|
-r--r--r-- 211 3c68632603fbc30bd6ee720bd43c0f0940930cc8.datapack
|
|
-r--r--r-- 1196 54389aae9b0f11d9cc4e33901e6de68bad129e73.histidx
|
|
-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
|
|
$ ls_l .hg/store/packs/manifests | wc -l
|
|
\s*4 (re)
|
|
$ echo t >> subdir/x
|
|
$ hg commit -qm "tree only commit"
|
|
1 trees fetched over * (glob)
|
|
$ hg debugdata -c 3
|
|
7fdb5a91151d114ca83c30c5cb4a1029ef9700ef
|
|
test
|
|
0 0
|
|
subdir/x
|
|
|
|
tree only commit (no-eol)
|
|
$ ls_l .hg/store/packs/manifests | wc -l
|
|
\s*8 (re)
|
|
# No manifest revlog revision was added
|
|
$ hg debugindex -m --config treemanifest.treeonly=False
|
|
rev offset length delta linkrev nodeid p1 p2
|
|
0 0 51 -1 0 85b359fdb09e 000000000000 000000000000
|
|
1 51 51 -1 1 c0196aba344d 85b359fdb09e 000000000000
|
|
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000
|
|
|
|
Tree-only amend
|
|
$ echo >> subdir/x
|
|
$ hg commit --amend
|
|
saved backup bundle to $TESTTMP/client/.hg/strip-backup/779a137458d0-0b309c3a-amend.hg (glob)
|
|
# amend commit was added
|
|
$ ls_l .hg/store/packs/manifests | wc -l
|
|
\s*12 (re)
|
|
# No manifest revlog revision was added
|
|
$ hg debugindex -m --config treemanifest.treeonly=False
|
|
rev offset length delta linkrev nodeid p1 p2
|
|
0 0 51 -1 0 85b359fdb09e 000000000000 000000000000
|
|
1 51 51 -1 1 c0196aba344d 85b359fdb09e 000000000000
|
|
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000
|
|
|
|
# Delete the original commits packs
|
|
$ rm -rf .hg/store/packs/manifests/26653c55cb54ab20aeb188315d736fb2ece04cd1*
|
|
$ rm -rf .hg/store/packs/manifests/2a492611dfb8fbde1652e7e54fa1f64b82bd8ff7*
|
|
$ ls_l .hg/store/packs/manifests | wc -l
|
|
\s*8 (re)
|
|
|
|
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
|
|
changeset: 4:779a137458d0
|
|
tag: tip
|
|
parent: 0:2278cc8c6ce6
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
files: subdir/x
|
|
description:
|
|
tree only commit
|
|
|
|
|
|
diff -r 2278cc8c6ce6 -r 779a137458d0 subdir/x
|
|
--- a/subdir/x Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/subdir/x Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -1,1 +1,2 @@
|
|
x
|
|
+t
|
|
|
|
|
|
Test unbundling the original commit
|
|
# Bring the original commit back from the bundle
|
|
$ hg unbundle $TESTTMP/client/.hg/strip-backup/779a137458d0-0b309c3a-amend.hg
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files (+1 heads)
|
|
new changesets 779a137458d0
|
|
(run 'hg heads .' to see heads, 'hg merge' to merge)
|
|
# Verify the packs were brought back and the data is accessible
|
|
$ ls_l .hg/store/packs/manifests | wc -l
|
|
\s*12 (re)
|
|
$ hg log -r tip --stat
|
|
changeset: 4:779a137458d0
|
|
tag: tip
|
|
parent: 0:2278cc8c6ce6
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: tree only commit
|
|
|
|
subdir/x | 1 +
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
Test pulling new commits from a hybrid server
|
|
$ cd ../master
|
|
$ echo x >> subdir/x
|
|
$ hg commit -qAm 'modify subdir/x'
|
|
$ hg log -r tip -T '{manifest}'
|
|
d9920715ba88cbc7962c4dac9f20004aafd94ac8 (no-eol)
|
|
|
|
$ cd ../client
|
|
$ hg pull
|
|
pulling from ssh://user@dummy/master
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files (+1 heads)
|
|
new changesets 2937cde31c19
|
|
(run 'hg heads .' to see heads, 'hg merge' to merge)
|
|
|
|
$ hg debugindex -m --config treemanifest.treeonly=False
|
|
rev offset length delta linkrev nodeid p1 p2
|
|
0 0 51 -1 0 85b359fdb09e 000000000000 000000000000
|
|
1 51 51 -1 1 c0196aba344d 85b359fdb09e 000000000000
|
|
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000
|
|
$ hg log -r tip --stat --pager=off
|
|
2 trees fetched over * (glob)
|
|
changeset: 5:2937cde31c19
|
|
tag: tip
|
|
parent: 0:2278cc8c6ce6
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: modify subdir/x
|
|
|
|
subdir/x | 1 +
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
|
|
|
|
Test rebasing treeonly commits
|
|
$ hg rebase -d 5 -b 2
|
|
rebasing 2:4b702090309e "hybrid flat+tree commit"
|
|
merging subdir/x
|
|
warning: conflicts while merging subdir/x! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
$ printf "x\nx\nh\n" > subdir/x
|
|
$ hg resolve --mark subdir/x
|
|
(no more unresolved files)
|
|
continue: hg rebase --continue
|
|
$ hg rebase --continue
|
|
rebasing 2:4b702090309e "hybrid flat+tree commit"
|
|
saved backup bundle to $TESTTMP/client/.hg/strip-backup/4b702090309e-7a0f0c5f-rebase.hg (glob)
|
|
|
|
Test histedit treeonly commits
|
|
$ hg up -q 38a88da6315b
|
|
$ hg purge --config extensions.purge=
|
|
$ echo y > y
|
|
$ hg commit -Aqm 'add y'
|
|
$ hg histedit --config extensions.histedit= --commands - <<EOF
|
|
> pick eea609e344ca add y
|
|
> pick 38a88da6315b hybrid flat+tree commit
|
|
> EOF
|
|
saved backup bundle to $TESTTMP/client/.hg/strip-backup/38a88da6315b-320da9c1-histedit.hg (glob)
|
|
$ hg log -l 2 -G -T '{desc}'
|
|
@ hybrid flat+tree commit
|
|
|
|
|
o add y
|
|
|
|
|
~
|
|
|
|
Test {manifest} template
|
|
$ hg log -r . -T '{manifest}'
|
|
0ab0ab59dd6ab41bda558ad2fd4c665da69323ab (no-eol)
|
|
|
|
Test turning treeonly off and making sure we can still commit on top of treeonly
|
|
commits
|
|
$ echo >> subdir/x
|
|
$ hg debugindex -m --config treemanifest.treeonly=False | tail -1
|
|
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000
|
|
$ hg commit -m 'treeonly from hybrid repo' --config treemanifest.treeonly=False
|
|
$ hg log -r . -T '{desc}\n' --stat
|
|
treeonly from hybrid repo
|
|
subdir/x | 1 +
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
$ hg log -r . -T '{desc}\n' --stat --config treemanifest.treeonly=False
|
|
treeonly from hybrid repo
|
|
subdir/x | 1 +
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
$ hg debugindex -m --config treemanifest.treeonly=False | tail -1
|
|
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000
|
|
$ hg strip -r . --config fbamend.safestrip=False
|
|
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)
|
|
|
|
Test peer-to-peer push/pull of tree only commits
|
|
$ cd ..
|
|
$ clearcache
|
|
$ hgcloneshallow ssh://user@dummy/master client2 -q --config treemanifest.treeonly=True --config extensions.treemanifest=
|
|
2 trees fetched over * (glob)
|
|
1 trees fetched over * (glob)
|
|
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
|
|
$ cd client2
|
|
$ ls_l .hg/store
|
|
-rw-r--r-- 277 00changelog.i
|
|
drwxr-xr-x data
|
|
-rw-r--r-- 0 undo
|
|
-rw-r--r-- 2 undo.backupfiles
|
|
-rw-r--r-- 0 undo.phaseroots
|
|
$ rm -rf $CACHEDIR
|
|
$ cp ../client/.hg/hgrc .hg/hgrc
|
|
|
|
# Test pulling from a treeonly peer
|
|
$ hg pull -r tip ssh://user@dummy/client --debug 2>&1 | egrep "(payload|treegroup)"
|
|
bundle2-input-part: total payload size 827
|
|
bundle2-input-part: total payload size 48
|
|
bundle2-input-part: "b2x:treegroup2" (params: 3 mandatory) supported
|
|
bundle2-input-part: total payload size 663
|
|
$ hg up tip
|
|
2 trees fetched over * (glob)
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg log -G -l 3 -T '{desc}\n' --stat
|
|
@ hybrid flat+tree commit
|
|
| subdir/x | 1 +
|
|
| 1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
|
o add y
|
|
| y | 1 +
|
|
| 1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
|
2 trees fetched over * (glob)
|
|
o modify subdir/x
|
|
| subdir/x | 1 +
|
|
~ 1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
|
|
|
|
# Test pushing to a treeonly peer
|
|
$ echo y >> y
|
|
$ hg commit -qm "modify y"
|
|
1 trees fetched over * (glob)
|
|
$ hg push -f -r . ssh://user@dummy/client --debug 2>&1 | grep treegroup
|
|
bundle2-output-part: "b2x:treegroup2" (params: 3 mandatory) streamed payload
|
|
$ cd ../client
|
|
$ hg log -r tip -T '{desc}\n' --stat
|
|
modify y
|
|
y | 1 +
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
Test bundling
|
|
$ hg bundle -r 'tip~3::tip' ../mybundle.hg
|
|
searching for changes
|
|
3 changesets found
|
|
$ cd ..
|
|
$ hgcloneshallow ssh://user@dummy/master client3 -q
|
|
$ cd client3
|
|
$ cp ../client/.hg/hgrc .hg/hgrc
|
|
$ hg unbundle ../mybundle.hg
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 3 changes to 2 files
|
|
new changesets 7ec3c5c54734:2f8e443c6ba8
|
|
(run 'hg update' to get a working copy)
|
|
$ hg log -r 'tip^::tip' -G -T "{desc}\n" --stat
|
|
o modify y
|
|
| y | 1 +
|
|
| 1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
|
o hybrid flat+tree commit
|
|
| subdir/x | 1 +
|
|
~ 1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
Test pushing to a hybrid server w/ pushrebase w/ hooks
|
|
$ cat >> $TESTTMP/filehook.sh <<EOF
|
|
> set -xe
|
|
> [[ \$(hg log -r \$HG_NODE -T '{file_adds}') == 'y' ]] && exit 1
|
|
> echo \$(hg log -r \$HG_NODE -T '{file_adds}')
|
|
> exit 2
|
|
> EOF
|
|
$ chmod a+x $TESTTMP/filehook.sh
|
|
$ cat >> ../master/.hg/hgrc <<EOF
|
|
> [hooks]
|
|
> prepushrebase.fail=$TESTTMP/filehook.sh
|
|
> EOF
|
|
$ hg push -r 2 --to master
|
|
pushing to ssh://user@dummy/master
|
|
searching for changes
|
|
remote: +++ hg log -r 7ec3c5c54734448e59a0694af54c51578ee4d4de -T '{file_adds}'
|
|
remote: ++ [[ y == \y ]]
|
|
remote: ++ exit 1
|
|
remote: prepushrebase.fail hook exited with status 1
|
|
abort: push failed on remote
|
|
[255]
|
|
|
|
Test pushing to a hybrid server w/ pushrebase w/o hooks
|
|
$ cat >> ../master/.hg/hgrc <<EOF
|
|
> [hooks]
|
|
> prepushrebase.fail=true
|
|
> EOF
|
|
$ hg push -r 2 --to master
|
|
pushing to ssh://user@dummy/master
|
|
searching for changes
|
|
remote: pushing 1 changeset:
|
|
remote: 7ec3c5c54734 add y
|
|
remote: 1 new changeset from the server will be downloaded
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
|
|
$ cd ../master
|
|
- Verify the received tree was written down as a flat
|
|
$ hg debugindex -m
|
|
rev offset length delta linkrev nodeid p1 p2
|
|
0 0 51 -1 0 85b359fdb09e 000000000000 000000000000
|
|
1 51 51 -1 1 d9920715ba88 85b359fdb09e 000000000000
|
|
2 102 55 1 2 83b03df1c9d6 d9920715ba88 000000000000
|
|
$ hg debugindex .hg/store/00manifesttree.i
|
|
rev offset length delta linkrev nodeid p1 p2
|
|
0 0 50 -1 0 85b359fdb09e 000000000000 000000000000
|
|
1 50 50 -1 1 d9920715ba88 85b359fdb09e 000000000000
|
|
2 100 55 1 2 83b03df1c9d6 d9920715ba88 000000000000
|
|
- Verify the manifest data is accessible
|
|
$ hg log -r tip --stat
|
|
changeset: 2:4f84204095e0
|
|
tag: tip
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: add y
|
|
|
|
y | 1 +
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
|
|
TODO
|
|
# log -T "{manifest}" #TODO: edit templatekw.showmanifest
|