diff -r 435481393198 -r 806b07d7c7d6 tests/test-generaldelta.t --- a/tests/test-generaldelta.t Mon Apr 02 15:55:50 2018 -0700 +++ b/tests/test-generaldelta.t Mon Apr 02 16:24:57 2018 -0700 @@ -67,9 +67,9 @@ $ hg init client --config format.generaldelta=false --config format.usegeneraldelta=false $ cd client $ hg pull -q ../server -r 4 - $ hg debugindex x - rev offset length base linkrev nodeid p1 p2 - 0 0 3 0 1 1406e7411862 000000000000 000000000000 + $ hg debugdeltachain x + rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio + 0 1 1 -1 base 3 2 3 1.50000 3 0 0.00000 $ cd .. @@ -97,24 +97,24 @@ new changesets 0ea3fcf9d01d:bba78d330d9c updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R repo debugindex -m - rev offset length base linkrev nodeid p1 p2 - 0 0 104 0 0 cef96823c800 000000000000 000000000000 - 1 104 57 0 1 58ab9a8d541d cef96823c800 000000000000 - 2 161 57 0 2 134fdc6fd680 cef96823c800 000000000000 - 3 218 104 3 3 723508934dad cef96823c800 000000000000 - $ hg -R usegd debugindex -m - rev offset length delta linkrev nodeid p1 p2 - 0 0 104 -1 0 cef96823c800 000000000000 000000000000 - 1 104 57 0 1 58ab9a8d541d cef96823c800 000000000000 - 2 161 57 1 2 134fdc6fd680 cef96823c800 000000000000 - 3 218 57 0 3 723508934dad cef96823c800 000000000000 - $ hg -R full debugindex -m - rev offset length delta linkrev nodeid p1 p2 - 0 0 104 -1 0 cef96823c800 000000000000 000000000000 - 1 104 57 0 1 58ab9a8d541d cef96823c800 000000000000 - 2 161 57 0 2 134fdc6fd680 cef96823c800 000000000000 - 3 218 57 0 3 723508934dad cef96823c800 000000000000 + $ hg -R repo debugdeltachain -m + rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio + 0 1 1 -1 base 104 135 104 0.77037 104 0 0.00000 + 1 1 2 0 prev 57 135 161 1.19259 161 0 0.00000 + 2 1 3 1 prev 57 135 218 1.61481 218 0 0.00000 + 3 2 1 -1 base 104 135 104 0.77037 104 0 0.00000 + $ hg -R usegd debugdeltachain -m + rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio + 0 1 1 -1 base 104 135 104 0.77037 104 0 0.00000 + 1 1 2 0 p1 57 135 161 1.19259 161 0 0.00000 + 2 1 3 1 prev 57 135 218 1.61481 218 0 0.00000 + 3 1 2 0 p1 57 135 161 1.19259 275 114 0.70807 + $ hg -R full debugdeltachain -m + rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio + 0 1 1 -1 base 104 135 104 0.77037 104 0 0.00000 + 1 1 2 0 p1 57 135 161 1.19259 161 0 0.00000 + 2 1 2 0 p1 57 135 161 1.19259 218 57 0.35404 + 3 1 2 0 p1 57 135 161 1.19259 275 114 0.70807 Test format.aggressivemergedeltas @@ -133,11 +133,11 @@ - Verify non-aggressive merge uses p1 (commit 1) as delta parent $ hg merge -q 0 $ hg commit -q -m merge - $ hg debugindex -m - rev offset length delta linkrev nodeid p1 p2 - 0 0 59 -1 0 8dde941edb6e 000000000000 000000000000 - 1 59 61 0 1 315c023f341d 000000000000 000000000000 - 2 120 65 1 2 2ab389a983eb 315c023f341d 8dde941edb6e + $ hg debugdeltachain -m + rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio + 0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000 + 1 1 2 0 prev 61 86 120 1.39535 120 0 0.00000 + 2 1 3 1 p1 65 301 185 0.61462 185 0 0.00000 $ hg strip -q -r . --config extensions.strip= @@ -145,11 +145,11 @@ $ hg up -q -C 1 $ hg merge -q 0 $ hg commit -q -m merge --config format.aggressivemergedeltas=True - $ hg debugindex -m - rev offset length delta linkrev nodeid p1 p2 - 0 0 59 -1 0 8dde941edb6e 000000000000 000000000000 - 1 59 61 0 1 315c023f341d 000000000000 000000000000 - 2 120 62 0 2 2ab389a983eb 315c023f341d 8dde941edb6e + $ hg debugdeltachain -m + rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio + 0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000 + 1 1 2 0 prev 61 86 120 1.39535 120 0 0.00000 + 2 1 2 0 p2 62 301 121 0.40199 182 61 0.50413 Test that strip bundle use bundle2 $ hg --config extensions.strip= strip . @@ -171,61 +171,61 @@ $ cd source-repo $ hg debugbuilddag --new-file '.+5:brancha$.+11:branchb$.+30:branchc