--- a/tests/test-remotefilelog-repack-fast.t Wed Oct 03 17:20:44 2018 -0400
+++ b/tests/test-remotefilelog-repack-fast.t Tue Oct 16 13:17:16 2018 -0400
@@ -285,53 +285,48 @@
> [remotefilelog]
> data.generations=60
> 150
- > fetchpacks=True
> EOF
Single pack - repack does nothing
$ hg prefetch -r 0
- 1 files fetched over 1 fetches - (0 misses, 100.00% hit ratio) over * (glob)
+ 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ ls_l $TESTTMP/hgcache/master/packs/ | grep datapack
- -r--r--r-- 59 5b7dec902026f0cddb0ef8acb62f27b5698494d4.datapack
+ [1]
$ ls_l $TESTTMP/hgcache/master/packs/ | grep histpack
- -r--r--r-- 90 c3399b56e035f73c3295276ed098235a08a0ed8c.histpack
+ [1]
$ hg repack --incremental
$ ls_l $TESTTMP/hgcache/master/packs/ | grep datapack
- -r--r--r-- 59 5b7dec902026f0cddb0ef8acb62f27b5698494d4.datapack
+ -r--r--r-- 67 b5a62f3496ccbd2479497cdbc7345f3304735f33.datapack
$ ls_l $TESTTMP/hgcache/master/packs/ | grep histpack
-r--r--r-- 90 c3399b56e035f73c3295276ed098235a08a0ed8c.histpack
3 gen1 packs, 1 gen0 pack - packs 3 gen1 into 1
$ hg prefetch -r 1
- 1 files fetched over 1 fetches - (0 misses, 100.00% hit ratio) over * (glob)
+ 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ hg prefetch -r 2
- 1 files fetched over 1 fetches - (0 misses, 100.00% hit ratio) over * (glob)
+ 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ hg prefetch -r 3
- 1 files fetched over 1 fetches - (0 misses, 100.00% hit ratio) over * (glob)
+ 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ ls_l $TESTTMP/hgcache/master/packs/ | grep datapack
- -r--r--r-- 59 5b7dec902026f0cddb0ef8acb62f27b5698494d4.datapack
- -r--r--r-- 65 6c499d21350d79f92fd556b4b7a902569d88e3c9.datapack
- -r--r--r-- 61 817d294043bd21a3de01f807721971abe45219ce.datapack
- -r--r--r-- 63 ff45add45ab3f59c4f75efc6a087d86c821219d6.datapack
+ -r--r--r-- 67 b5a62f3496ccbd2479497cdbc7345f3304735f33.datapack
$ ls_l $TESTTMP/hgcache/master/packs/ | grep histpack
- -r--r--r-- 254 077e7ce5dfe862dc40cc8f3c9742d96a056865f2.histpack
- -r--r--r-- 336 094b530486dad4427a0faf6bcbc031571b99ca24.histpack
- -r--r--r-- 172 276d308429d0303762befa376788300f0310f90e.histpack
-r--r--r-- 90 c3399b56e035f73c3295276ed098235a08a0ed8c.histpack
$ hg repack --incremental
$ ls_l $TESTTMP/hgcache/master/packs/ | grep datapack
- -r--r--r-- 59 5b7dec902026f0cddb0ef8acb62f27b5698494d4.datapack
-r--r--r-- 225 8fe685c56f6f7edf550bfcec74eeecc5f3c2ba15.datapack
+ -r--r--r-- 67 b5a62f3496ccbd2479497cdbc7345f3304735f33.datapack
$ ls_l $TESTTMP/hgcache/master/packs/ | grep histpack
-r--r--r-- 336 094b530486dad4427a0faf6bcbc031571b99ca24.histpack
+ -r--r--r-- 90 c3399b56e035f73c3295276ed098235a08a0ed8c.histpack
1 gen3 pack, 1 gen0 pack - does nothing
$ hg repack --incremental
$ ls_l $TESTTMP/hgcache/master/packs/ | grep datapack
- -r--r--r-- 59 5b7dec902026f0cddb0ef8acb62f27b5698494d4.datapack
-r--r--r-- 225 8fe685c56f6f7edf550bfcec74eeecc5f3c2ba15.datapack
+ -r--r--r-- 67 b5a62f3496ccbd2479497cdbc7345f3304735f33.datapack
$ ls_l $TESTTMP/hgcache/master/packs/ | grep histpack
-r--r--r-- 336 094b530486dad4427a0faf6bcbc031571b99ca24.histpack
+ -r--r--r-- 90 c3399b56e035f73c3295276ed098235a08a0ed8c.histpack
Pull should run background repack
$ cat >> .hg/hgrc <<EOF
@@ -340,23 +335,13 @@
> EOF
$ clearcache
$ hg prefetch -r 0
- 1 files fetched over 1 fetches - (0 misses, 100.00% hit ratio) over * (glob)
+ 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ hg prefetch -r 1
- 1 files fetched over 1 fetches - (0 misses, 100.00% hit ratio) over * (glob)
+ 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ hg prefetch -r 2
- 1 files fetched over 1 fetches - (0 misses, 100.00% hit ratio) over * (glob)
+ 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ hg prefetch -r 3
- 1 files fetched over 1 fetches - (0 misses, 100.00% hit ratio) over * (glob)
- $ ls_l $TESTTMP/hgcache/master/packs/ | grep datapack
- -r--r--r-- 59 5b7dec902026f0cddb0ef8acb62f27b5698494d4.datapack
- -r--r--r-- 65 6c499d21350d79f92fd556b4b7a902569d88e3c9.datapack
- -r--r--r-- 61 817d294043bd21a3de01f807721971abe45219ce.datapack
- -r--r--r-- 63 ff45add45ab3f59c4f75efc6a087d86c821219d6.datapack
- $ ls_l $TESTTMP/hgcache/master/packs/ | grep histpack
- -r--r--r-- 254 077e7ce5dfe862dc40cc8f3c9742d96a056865f2.histpack
- -r--r--r-- 336 094b530486dad4427a0faf6bcbc031571b99ca24.histpack
- -r--r--r-- 172 276d308429d0303762befa376788300f0310f90e.histpack
- -r--r--r-- 90 c3399b56e035f73c3295276ed098235a08a0ed8c.histpack
+ 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ hg pull
pulling from ssh://user@dummy/master
@@ -366,26 +351,24 @@
$ sleep 0.5
$ hg debugwaitonrepack >/dev/null 2>&1
$ ls_l $TESTTMP/hgcache/master/packs/ | grep datapack
- -r--r--r-- 59 5b7dec902026f0cddb0ef8acb62f27b5698494d4.datapack
- -r--r--r-- 225 8fe685c56f6f7edf550bfcec74eeecc5f3c2ba15.datapack
+ -r--r--r-- 301 09b8bf49256b3fc2175977ba97d6402e91a9a604.datapack
$ ls_l $TESTTMP/hgcache/master/packs/ | grep histpack
-r--r--r-- 336 094b530486dad4427a0faf6bcbc031571b99ca24.histpack
Test environment variable resolution
$ CACHEPATH=$TESTTMP/envcache hg prefetch --config 'remotefilelog.cachepath=$CACHEPATH'
- 1 files fetched over 1 fetches - (0 misses, 100.00% hit ratio) over * (glob)
+ 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ find $TESTTMP/envcache | sort
$TESTTMP/envcache
$TESTTMP/envcache/master
- $TESTTMP/envcache/master/packs
- $TESTTMP/envcache/master/packs/54afbfda203716c1aa2636029ccc0df18165129e.dataidx
- $TESTTMP/envcache/master/packs/54afbfda203716c1aa2636029ccc0df18165129e.datapack
- $TESTTMP/envcache/master/packs/dcebd8e8d4d97ee88e40dd8f92d8678c10e1a3ad.histidx
- $TESTTMP/envcache/master/packs/dcebd8e8d4d97ee88e40dd8f92d8678c10e1a3ad.histpack
+ $TESTTMP/envcache/master/95
+ $TESTTMP/envcache/master/95/cb0bfd2977c761298d9624e4b4d4c72a39974a
+ $TESTTMP/envcache/master/95/cb0bfd2977c761298d9624e4b4d4c72a39974a/577959738234a1eb241ed3ed4b22a575833f56e0
+ $TESTTMP/envcache/repos
Test local remotefilelog blob is correct when based on a pack
$ hg prefetch -r .
- 1 files fetched over 1 fetches - (0 misses, 100.00% hit ratio) over * (glob)
+ 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ echo >> y
$ hg commit -m y2
$ hg debugremotefilelog .hg/store/data/95cb0bfd2977c761298d9624e4b4d4c72a39974a/b70860edba4f8242a1d52f2a94679dd23cb76808