Mercurial > hg

comparison tests/test-generaldelta.t @ 51076:786b6225793a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debug-delta-chain: print less data by default This is faster and simpler to read.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 19 Sep 2023 03:15:12 +0200
parents 2cf264e9aa75
children 7083b33a2699
comparison
equal deleted inserted replaced
51075:2d30d1ba0371 51076:786b6225793a
72 $ cd .. 72 $ cd ..
73 $ hg init client --config format.generaldelta=false --config format.usegeneraldelta=false 73 $ hg init client --config format.generaldelta=false --config format.usegeneraldelta=false
74 $ cd client 74 $ cd client
75 $ hg pull -q ../server -r 4 75 $ hg pull -q ../server -r 4
76 $ hg debugdeltachain x 76 $ hg debugdeltachain x
77 rev p1 p2 chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio 77 rev p1 p2 chain# chainlen prev delta
78 0 -1 -1 1 1 -1 base 3 2 3 1.50000 3 0 0.00000 78 0 -1 -1 1 1 -1 base
79 79
80 $ cd .. 80 $ cd ..
81 81
82 Test "usegeneraldelta" config 82 Test "usegeneraldelta" config
83 (repo are general delta, but incoming bundle are not re-deltafied) 83 (repo are general delta, but incoming bundle are not re-deltafied)
102 added 4 changesets with 6 changes to 3 files (+2 heads) 102 added 4 changesets with 6 changes to 3 files (+2 heads)
103 new changesets 0ea3fcf9d01d:bba78d330d9c 103 new changesets 0ea3fcf9d01d:bba78d330d9c
104 updating to branch default 104 updating to branch default
105 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 105 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
106 $ hg -R repo debugdeltachain -m 106 $ hg -R repo debugdeltachain -m
107 rev p1 p2 chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio 107 rev p1 p2 chain# chainlen prev delta
108 0 -1 -1 1 1 -1 base 10? 135 10? 0.7???? 10? 0 0.00000 (glob) 108 0 -1 -1 1 1 -1 base
109 1 0 -1 1 2 0 prev 57 135 1?? 1.????? 16? 0 0.00000 (glob) 109 1 0 -1 1 2 0 prev
110 2 0 -1 1 3 1 prev 57 135 2?? 1.6???? 2?? 0 0.00000 (glob) 110 2 0 -1 1 3 1 prev
111 3 0 -1 2 1 -1 base 104 135 104 0.77037 104 0 0.00000 111 3 0 -1 2 1 -1 base
112 $ hg -R usegd debugdeltachain -m 112 $ hg -R usegd debugdeltachain -m
113 rev p1 p2 chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio 113 rev p1 p2 chain# chainlen prev delta
114 0 -1 -1 1 1 -1 base 10? 135 10? 0.7???? 10? 0 0.00000 (glob) 114 0 -1 -1 1 1 -1 base
115 1 0 -1 1 2 0 p1 57 135 16? 1.????? 16? 0 0.00000 (glob) 115 1 0 -1 1 2 0 p1
116 2 0 -1 1 3 1 prev 57 135 2?? 1.6???? 2?? 0 0.00000 (glob) 116 2 0 -1 1 3 1 prev
117 3 0 -1 1 2 0 p1 57 135 16? 1.????? 27? 114 0.????? (glob) 117 3 0 -1 1 2 0 p1
118 $ hg -R full debugdeltachain -m 118 $ hg -R full debugdeltachain -m
119 rev p1 p2 chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio 119 rev p1 p2 chain# chainlen prev delta
120 0 -1 -1 1 1 -1 base 10? 135 10? 0.7???? 10? 0 0.00000 (glob) 120 0 -1 -1 1 1 -1 base
121 1 0 -1 1 2 0 p1 57 135 16? 1.????? 16? 0 0.00000 (glob) 121 1 0 -1 1 2 0 p1
122 2 0 -1 1 2 0 p1 57 135 16? 1.????? 2?? 57 0.3???? (glob) 122 2 0 -1 1 2 0 p1
123 3 0 -1 1 2 0 p1 57 135 16? 1.????? 27? 114 0.????? (glob) 123 3 0 -1 1 2 0 p1
124 124
125 Test revlog.optimize-delta-parent-choice 125 Test revlog.optimize-delta-parent-choice
126 126
127 $ hg init --config format.generaldelta=1 aggressive 127 $ hg init --config format.generaldelta=1 aggressive
128 $ cd aggressive 128 $ cd aggressive
138 138
139 - Verify non-aggressive merge uses p1 (commit 1) as delta parent 139 - Verify non-aggressive merge uses p1 (commit 1) as delta parent
140 $ hg merge -q 0 140 $ hg merge -q 0
141 $ hg commit -q -m merge 141 $ hg commit -q -m merge
142 $ hg debugdeltachain -m 142 $ hg debugdeltachain -m
143 rev p1 p2 chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio 143 rev p1 p2 chain# chainlen prev delta
144 0 -1 -1 1 1 -1 base ?? 215 ?? 0.????? ?? 0 0.00000 (glob) 144 0 -1 -1 1 1 -1 base
145 1 -1 -1 1 2 0 prev ?? 86 1?? 1.????? 1?? 0 0.00000 (glob) 145 1 -1 -1 1 2 0 prev
146 2 1 0 1 2 0 p2 ?? 301 1?? 0.4???? ??? ?? 0.5???? (glob) 146 2 1 0 1 2 0 p2
147 147
148 $ hg strip -q -r . --config extensions.strip= 148 $ hg strip -q -r . --config extensions.strip=
149 149
150 - Verify aggressive merge uses p2 (commit 0) as delta parent 150 - Verify aggressive merge uses p2 (commit 0) as delta parent
151 $ hg up -q -C 1 151 $ hg up -q -C 1
152 $ hg merge -q 0 152 $ hg merge -q 0
153 $ hg commit -q -m merge --config storage.revlog.optimize-delta-parent-choice=yes 153 $ hg commit -q -m merge --config storage.revlog.optimize-delta-parent-choice=yes
154 $ hg debugdeltachain -m 154 $ hg debugdeltachain -m
155 rev p1 p2 chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio 155 rev p1 p2 chain# chainlen prev delta
156 0 -1 -1 1 1 -1 base ?? 215 ?? 0.????? ?? 0 0.00000 (glob) 156 0 -1 -1 1 1 -1 base
157 1 -1 -1 1 2 0 prev ?? 86 1?? 1.????? 1?? 0 0.00000 (glob) 157 1 -1 -1 1 2 0 prev
158 2 1 0 1 2 0 p2 ?? 301 1?? 0.4???? ??? ?? 0.5???? (glob) 158 2 1 0 1 2 0 p2
159 159
160 Test that strip bundle use bundle2 160 Test that strip bundle use bundle2
161 $ hg --config extensions.strip= strip . 161 $ hg --config extensions.strip= strip .
162 0 files updated, 0 files merged, 5 files removed, 0 files unresolved 162 0 files updated, 0 files merged, 5 files removed, 0 files unresolved
163 saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg 163 saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg
213 $ hg commit -m 'restore all' 213 $ hg commit -m 'restore all'
214 $ hg up null 214 $ hg up null
215 0 files updated, 0 files merged, 14 files removed, 0 files unresolved 215 0 files updated, 0 files merged, 14 files removed, 0 files unresolved
216 $ 216 $
217 $ cd .. 217 $ cd ..
218 $ hg -R source-repo debugdeltachain -m 218 $ hg -R source-repo debugdeltachain -m --all-info
219 rev p1 p2 chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio 219 rev p1 p2 chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
220 0 -1 -1 1 1 -1 base 46 45 46 1.02222 46 0 0.00000 220 0 -1 -1 1 1 -1 base 46 45 46 1.02222 46 0 0.00000
221 1 0 -1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000 221 1 0 -1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000
222 2 1 -1 1 3 1 p1 57 135 160 1.18519 160 0 0.00000 222 2 1 -1 1 3 1 p1 57 135 160 1.18519 160 0 0.00000
223 3 2 -1 1 4 2 p1 57 180 217 1.20556 217 0 0.00000 223 3 2 -1 1 4 2 p1 57 180 217 1.20556 217 0 0.00000
279 adding file changes 279 adding file changes
280 added 55 changesets with 53 changes to 53 files (+2 heads) 280 added 55 changesets with 53 changes to 53 files (+2 heads)
281 new changesets 61246295ee1e:c930ac4a5b32 281 new changesets 61246295ee1e:c930ac4a5b32
282 updating to branch default 282 updating to branch default
283 14 files updated, 0 files merged, 0 files removed, 0 files unresolved 283 14 files updated, 0 files merged, 0 files removed, 0 files unresolved
284 $ hg -R relax-chain debugdeltachain -m 284 $ hg -R relax-chain debugdeltachain -m --all-info
285 rev p1 p2 chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio 285 rev p1 p2 chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
286 0 -1 -1 1 1 -1 base 46 45 46 1.02222 46 0 0.00000 286 0 -1 -1 1 1 -1 base 46 45 46 1.02222 46 0 0.00000
287 1 0 -1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000 287 1 0 -1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000
288 2 1 -1 1 3 1 p1 57 135 160 1.18519 160 0 0.00000 288 2 1 -1 1 3 1 p1 57 135 160 1.18519 160 0 0.00000
289 3 2 -1 1 4 2 p1 57 180 217 1.20556 217 0 0.00000 289 3 2 -1 1 4 2 p1 57 180 217 1.20556 217 0 0.00000
345 adding file changes 345 adding file changes
346 added 55 changesets with 53 changes to 53 files (+2 heads) 346 added 55 changesets with 53 changes to 53 files (+2 heads)
347 new changesets 61246295ee1e:c930ac4a5b32 347 new changesets 61246295ee1e:c930ac4a5b32
348 updating to branch default 348 updating to branch default
349 14 files updated, 0 files merged, 0 files removed, 0 files unresolved 349 14 files updated, 0 files merged, 0 files removed, 0 files unresolved
350 $ hg -R noconst-chain debugdeltachain -m 350 $ hg -R noconst-chain debugdeltachain -m --all-info
351 rev p1 p2 chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio 351 rev p1 p2 chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
352 0 -1 -1 1 1 -1 base 46 45 46 1.02222 46 0 0.00000 352 0 -1 -1 1 1 -1 base 46 45 46 1.02222 46 0 0.00000
353 1 0 -1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000 353 1 0 -1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000
354 2 1 -1 1 3 1 p1 57 135 160 1.18519 160 0 0.00000 354 2 1 -1 1 3 1 p1 57 135 160 1.18519 160 0 0.00000
355 3 2 -1 1 4 2 p1 57 180 217 1.20556 217 0 0.00000 355 3 2 -1 1 4 2 p1 57 180 217 1.20556 217 0 0.00000