This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1333

test-treemanifest-prefetch: use shallow repo for testing
AbandonedPublic

Authored by singhsrb on Nov 7 2017, 7:37 PM.
Tags
None
Subscribers
durham

Details

Reviewers
None
Group Reviewers
Restricted Project
Summary

hg prefetchtrees would soon be merged into the command hg prefetch
which would also prefetch files along with the trees. However, that would
require that we use a shallow repo instead. This commit modifies the test to
use a shallow repo to setup nicely for that change.

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.Nov 7 2017, 7:37 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 7 2017, 7:37 PM
durham added a subscriber: durham.Nov 9 2017, 12:18 PM

Does this mean the new prefetch won't work if remotefilelog is not enabled? Can't we just have it not prefetch the files if it's not enabled?

singhsrb added a comment.Nov 9 2017, 1:07 PM

We can certainly do that! I think that's a better idea.

singhsrb abandoned this revision.Nov 14 2017, 3:46 PM

See D1417 instead.

Revision Contents
Changeset List

PathPackages
Mtests/test-treemanifest-prefetch.t (17 lines)

Diff 3327

tests/test-treemanifest-prefetch.t

$ hg commit -Am 'modify x' $ hg commit -Am 'modify x'
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> treemanifest=$TESTDIR/../treemanifest > treemanifest=$TESTDIR/../treemanifest
> >
> [remotefilelog] > [remotefilelog]
> name=master > name=master
> cachepath=$CACHEDIR > cachepath=$CACHEDIR
> server=True
> usefastdatapack=True > usefastdatapack=True
> >
> [fastmanifest] > [fastmanifest]
> usetree=True > usetree=True
> usecache=False > usecache=False
> >
> [treemanifest] > [treemanifest]
> server=True > server=True
> EOF > EOF
$ cd .. $ cd ..
$ hg clone ssh://user@dummy/master client $ hgcloneshallow ssh://user@dummy/master client
streaming all changes streaming all changes
4 files to transfer, 952 bytes of data 2 files to transfer, 749 bytes of data
transferred 952 bytes in * seconds (*) (glob) transferred 749 bytes in * (glob)
searching for changes searching for changes
no changes found no changes found
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 files fetched over * (glob)
$ cd master $ cd master
$ hg backfilltree $ hg backfilltree
$ cd ../client $ cd ../client
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> treemanifest=$TESTDIR/../treemanifest > treemanifest=$TESTDIR/../treemanifest
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: modify x summary: modify x
dir/x | 1 + dir/x | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
2 files fetched over * (glob)
$ ls $CACHEDIR/master/packs/manifests $ ls $CACHEDIR/master/packs/manifests
148e9eb32f473ea522c591c95be0f9e772be9675.dataidx 148e9eb32f473ea522c591c95be0f9e772be9675.dataidx
148e9eb32f473ea522c591c95be0f9e772be9675.datapack 148e9eb32f473ea522c591c95be0f9e772be9675.datapack
3fb59713808147bda39cbd97b9cd862406f5865c.dataidx 3fb59713808147bda39cbd97b9cd862406f5865c.dataidx
3fb59713808147bda39cbd97b9cd862406f5865c.datapack 3fb59713808147bda39cbd97b9cd862406f5865c.datapack
524ab81400c6bc8449e3e720d81f836ebacec539.histidx 524ab81400c6bc8449e3e720d81f836ebacec539.histidx
524ab81400c6bc8449e3e720d81f836ebacec539.histpack 524ab81400c6bc8449e3e720d81f836ebacec539.histpack
e5c44a5c1bbfd8841df1c6c4b7cca54536e016db.histidx e5c44a5c1bbfd8841df1c6c4b7cca54536e016db.histidx
$ hg prefetchtrees -r 'tip^' $ hg prefetchtrees -r 'tip^'
3 trees fetched over * (glob) 3 trees fetched over * (glob)
$ rm -rf $CACHEDIR/master $ rm -rf $CACHEDIR/master
$ hg prefetchtrees -r tip $ hg prefetchtrees -r tip
3 trees fetched over * (glob) 3 trees fetched over * (glob)
- Only 2 of the 3 trees from tip^ are downloaded as part of --stat's fetch - Only 2 of the 3 trees from tip^ are downloaded as part of --stat's fetch
$ hg log -r tip --stat --pager=off > /dev/null $ hg log -r tip --stat --pager=off > /dev/null
2 trees fetched over * (glob) 2 trees fetched over * (glob)
2 files fetched over * (glob)
Test auto prefetch during pull Test auto prefetch during pull
- Prefetch everything - Prefetch everything
$ echo a >> a $ echo a >> a
$ hg commit -Aqm 'draft commit that shouldnt affect prefetch' $ hg commit -Aqm 'draft commit that shouldnt affect prefetching trees'
1 files fetched over * (glob)
$ rm -rf $CACHEDIR/master $ rm -rf $CACHEDIR/master
$ hg pull --config treemanifest.pullprefetchcount=10 --traceback $ hg pull --config treemanifest.pullprefetchcount=10 --traceback
pulling from ssh://user@dummy/master pulling from ssh://user@dummy/master
searching for changes searching for changes
no changes found no changes found
prefetching trees prefetching trees
6 trees fetched over * (glob) 6 trees fetched over * (glob)
$ hg debugdatapack $CACHEDIR/master/packs/manifests/*.dataidx $ hg debugdatapack $CACHEDIR/master/packs/manifests/*.dataidx
$ cd ../client $ cd ../client
$ rm -rf $CACHEDIR/master $ rm -rf $CACHEDIR/master
$ hg pull --config treemanifest.pullprefetchrevs='tip~2' $ hg pull --config treemanifest.pullprefetchrevs='tip~2'
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 2 changesets with 2 changes to 1 files added 2 changesets with 0 changes to 0 files
new changesets dece825f8add:cfacdcc4cee5 new changesets dece825f8add:cfacdcc4cee5
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
prefetching trees prefetching trees
3 trees fetched over * (glob) 3 trees fetched over * (glob)
$ hg debugdatapack $CACHEDIR/master/packs/manifests/*.dataidx $ hg debugdatapack $CACHEDIR/master/packs/manifests/*.dataidx
$TESTTMP/hgcache/master/packs/manifests/4ee15de76c068ec1c80e3e61f2c3c476a779078a: $TESTTMP/hgcache/master/packs/manifests/4ee15de76c068ec1c80e3e61f2c3c476a779078a:
dir: dir:
Node Delta Base Delta Length Blob Size Node Delta Base Delta Length Blob Size
aa52a49be522 000000000000 95 (missing) aa52a49be522 000000000000 95 (missing)
Test that prefetch refills just part of a tree when the cache is deleted Test that prefetch refills just part of a tree when the cache is deleted
$ echo >> dir/x $ echo >> dir/x
$ hg commit -m 'edit x locally' $ hg commit -m 'edit x locally'
created new head created new head
1 files fetched over * (glob)
$ rm -rf $CACHEDIR/master/* $ rm -rf $CACHEDIR/master/*
$ hg cat subdir/z $ hg cat subdir/z
3 trees fetched over * (glob) 3 trees fetched over * (glob)
z z
1 files fetched over * (glob)
Test prefetch non-parent commits with no base node (should fetch minimal Test prefetch non-parent commits with no base node (should fetch minimal
trees - in this case 3 trees for commit 2, and 2 for commit 4 despite it having trees - in this case 3 trees for commit 2, and 2 for commit 4 despite it having
3 directories) 3 directories)
$ rm -rf $CACHEDIR/master $ rm -rf $CACHEDIR/master
$ hg prefetchtrees -r '2 + 4' $ hg prefetchtrees -r '2 + 4'
5 trees fetched over * (glob) 5 trees fetched over * (glob)