diff --git a/tests/test-treemanifest-prefetch.t b/tests/test-treemanifest-prefetch.t --- a/tests/test-treemanifest-prefetch.t +++ b/tests/test-treemanifest-prefetch.t @@ -21,6 +21,7 @@ > [remotefilelog] > name=master > cachepath=$CACHEDIR + > server=True > usefastdatapack=True > > [fastmanifest] @@ -32,14 +33,15 @@ > EOF $ cd .. - $ hg clone ssh://user@dummy/master client + $ hgcloneshallow ssh://user@dummy/master client streaming all changes - 4 files to transfer, 952 bytes of data - transferred 952 bytes in * seconds (*) (glob) + 2 files to transfer, 749 bytes of data + transferred 749 bytes in * (glob) searching for changes no changes found updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + 2 files fetched over * (glob) $ cd master $ hg backfilltree @@ -160,6 +162,7 @@ dir/x | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) + 2 files fetched over * (glob) $ ls $CACHEDIR/master/packs/manifests 148e9eb32f473ea522c591c95be0f9e772be9675.dataidx 148e9eb32f473ea522c591c95be0f9e772be9675.datapack @@ -207,12 +210,14 @@ - 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 2 trees fetched over * (glob) + 2 files fetched over * (glob) Test auto prefetch during pull - Prefetch everything $ 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 $ hg pull --config treemanifest.pullprefetchcount=10 --traceback pulling from ssh://user@dummy/master @@ -313,7 +318,7 @@ adding changesets adding manifests 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 (run 'hg update' to get a working copy) prefetching trees @@ -357,10 +362,12 @@ $ echo >> dir/x $ hg commit -m 'edit x locally' created new head + 1 files fetched over * (glob) $ rm -rf $CACHEDIR/master/* $ hg cat subdir/z 3 trees fetched over * (glob) z + 1 files fetched over * (glob) 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