merge with stable

tests/artifacts/cache/big-file-churn.hg.md5

@@ -1,1 +1,1 b''
-fe0d0bb5979de50f4fed71bb9437764d
+cb1e67ae6b17ba66dd455f9782692f4a

tests/artifacts/scripts/generate-churning-bundle.py

@@ -118,7 +118,7 b' def run(target):'
                 hg('merge', 'min(head())')
             updatefile(FILENAME, idx)
             hg('commit', '--message', 'commit #%d' % idx)
-        hg('bundle', '--all', target)
+        hg('bundle', '--all', target, '--config', 'devel.bundle.delta=p1')
         with open(target, 'rb') as bundle:
             data = bundle.read()
             digest = hashlib.md5(data).hexdigest()

tests/test-sparse-revlog.t

@@ -28,6 +28,8 b' repeatedly while some of it changes rare'
   > maxchainlen = 15
   > [storage]
   > revlog.optimize-delta-parent-choice = yes
+  > [format]
+  > generaldelta = yes
   > EOF
   $ hg init sparse-repo
   $ cd sparse-repo
@@ -78,7 +80,7 b' repeatedly while some of it changes rare'
   
 
   $ f -s .hg/store/data/*.d
-  .hg/store/data/_s_p_a_r_s_e-_r_e_v_l_o_g-_t_e_s_t-_f_i_l_e.d: size=63002924
+  .hg/store/data/_s_p_a_r_s_e-_r_e_v_l_o_g-_t_e_s_t-_f_i_l_e.d: size=63327412
   $ hg debugrevlog *
   format : 1
   flags  : generaldelta
@@ -90,45 +92,45 b' repeatedly while some of it changes rare'
       empty     :        0 ( 0.00%)
                      text  :        0 (100.00%)
                      delta :        0 (100.00%)
-      snapshot  :      374 ( 7.48%)
-        lvl-0   :              4 ( 0.08%)
-        lvl-1   :             23 ( 0.46%)
-        lvl-2   :             63 ( 1.26%)
-        lvl-3   :            118 ( 2.36%)
-        lvl-4   :            166 ( 3.32%)
-      deltas    :     4627 (92.52%)
-  revision size : 63002924
-      snapshot  :  9888099 (15.69%)
-        lvl-0   :         804262 ( 1.28%)
-        lvl-1   :        1561380 ( 2.48%)
-        lvl-2   :        2096696 ( 3.33%)
-        lvl-3   :        2749539 ( 4.36%)
-        lvl-4   :        2676222 ( 4.25%)
-      deltas    : 53114825 (84.31%)
+      snapshot  :      383 ( 7.66%)
+        lvl-0   :              3 ( 0.06%)
+        lvl-1   :             20 ( 0.40%)
+        lvl-2   :             68 ( 1.36%)
+        lvl-3   :            112 ( 2.24%)
+        lvl-4   :            180 ( 3.60%)
+      deltas    :     4618 (92.34%)
+  revision size : 63327412
+      snapshot  :  9886710 (15.61%)
+        lvl-0   :         603104 ( 0.95%)
+        lvl-1   :        1559991 ( 2.46%)
+        lvl-2   :        2295592 ( 3.62%)
+        lvl-3   :        2531199 ( 4.00%)
+        lvl-4   :        2896824 ( 4.57%)
+      deltas    : 53440702 (84.39%)
   
   chunks        :     5001
       0x78 (x)  :     5001 (100.00%)
-  chunks size   : 63002924
-      0x78 (x)  : 63002924 (100.00%)
+  chunks size   : 63327412
+      0x78 (x)  : 63327412 (100.00%)
   
   avg chain length  :        9
   max chain length  :       15
-  max chain reach   : 28907121
+  max chain reach   : 28248745
   compression ratio :       27
   
   uncompressed data size (min/max/avg) : 346468 / 346472 / 346471
-  full revision size (min/max/avg)     : 201008 / 201141 / 201065
-  inter-snapshot size (min/max/avg)    : 11601 / 157413 / 24550
-      level-1   (min/max/avg)          : 13061 / 157413 / 67886
-      level-2   (min/max/avg)          : 11674 / 85631 / 33280
-      level-3   (min/max/avg)          : 11602 / 42957 / 23301
-      level-4   (min/max/avg)          : 11601 / 21475 / 16121
-  delta size (min/max/avg)             : 10649 / 105465 / 11479
+  full revision size (min/max/avg)     : 201008 / 201050 / 201034
+  inter-snapshot size (min/max/avg)    : 11596 / 168150 / 24430
+      level-1   (min/max/avg)          : 16653 / 168150 / 77999
+      level-2   (min/max/avg)          : 12951 / 85595 / 33758
+      level-3   (min/max/avg)          : 11608 / 43029 / 22599
+      level-4   (min/max/avg)          : 11596 / 21632 / 16093
+  delta size (min/max/avg)             : 10649 / 107163 / 11572
   
-  deltas against prev  : 3966 (85.71%)
-      where prev = p1  : 3922     (98.89%)
+  deltas against prev  : 3910 (84.67%)
+      where prev = p1  : 3910     (100.00%)
       where prev = p2  :    0     ( 0.00%)
-      other            :   44     ( 1.11%)
-  deltas against p1    :  611 (13.21%)
-  deltas against p2    :   50 ( 1.08%)
+      other            :    0     ( 0.00%)
+  deltas against p1    :  648 (14.03%)
+  deltas against p2    :   60 ( 1.30%)
   deltas against other :    0 ( 0.00%)