Show More
@@ -1591,6 +1591,7 b' def _addpartsfromopts(ui, repo, bundler,' | |||
|
1591 | 1591 | part.addparam('targetphase', '%d' % phases.secret, mandatory=False) |
|
1592 | 1592 | |
|
1593 | 1593 | addparttagsfnodescache(repo, bundler, outgoing) |
|
1594 | addpartrevbranchcache(repo, bundler, outgoing) | |
|
1594 | 1595 | |
|
1595 | 1596 | if opts.get('obsolescence', False): |
|
1596 | 1597 | obsmarkers = repo.obsstore.relevantmarkers(outgoing.missing) |
@@ -42,6 +42,7 b' Phases are restored when unbundling' | |||
|
42 | 42 | 26805aba1e600a82e93661149f2313866a221a7b |
|
43 | 43 | f585351a92f85104bff7c284233c338b10eb1df7 |
|
44 | 44 | 9bc730a19041f9ec7cb33c626e811aa233efb18c |
|
45 | cache:rev-branch-cache -- {} | |
|
45 | 46 | phase-heads -- {} |
|
46 | 47 | 26805aba1e600a82e93661149f2313866a221a7b draft |
|
47 | 48 | $ hg strip --no-backup C |
@@ -233,6 +234,7 b' Restore bundle of entire repo' | |||
|
233 | 234 | dc0947a82db884575bb76ea10ac97b08536bfa03 |
|
234 | 235 | 4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4 |
|
235 | 236 | 03ca77807e919db8807c3749086dc36fb478cac0 |
|
237 | cache:rev-branch-cache -- {} | |
|
236 | 238 | phase-heads -- {} |
|
237 | 239 | dc0947a82db884575bb76ea10ac97b08536bfa03 public |
|
238 | 240 | 03ca77807e919db8807c3749086dc36fb478cac0 draft |
@@ -258,6 +260,7 b' Restore bundle of entire repo' | |||
|
258 | 260 | changegroup -- {nbchanges: 2, targetphase: 2, version: 02} |
|
259 | 261 | 112478962961147124edd43549aedd1a335e44bf |
|
260 | 262 | 4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4 |
|
263 | cache:rev-branch-cache -- {} | |
|
261 | 264 | phase-heads -- {} |
|
262 | 265 | $ rm bundle |
|
263 | 266 | |
@@ -269,6 +272,7 b' Restore bundle of entire repo' | |||
|
269 | 272 | 112478962961147124edd43549aedd1a335e44bf |
|
270 | 273 | dc0947a82db884575bb76ea10ac97b08536bfa03 |
|
271 | 274 | 4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4 |
|
275 | cache:rev-branch-cache -- {} | |
|
272 | 276 | phase-heads -- {} |
|
273 | 277 | dc0947a82db884575bb76ea10ac97b08536bfa03 public |
|
274 | 278 | $ rm bundle |
@@ -280,6 +284,7 b' Restore bundle of entire repo' | |||
|
280 | 284 | changegroup -- {nbchanges: 2, targetphase: 2, version: 02} |
|
281 | 285 | 4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4 |
|
282 | 286 | 03ca77807e919db8807c3749086dc36fb478cac0 |
|
287 | cache:rev-branch-cache -- {} | |
|
283 | 288 | phase-heads -- {} |
|
284 | 289 | 03ca77807e919db8807c3749086dc36fb478cac0 draft |
|
285 | 290 | $ rm bundle |
@@ -76,6 +76,7 b' test bundle types' | |||
|
76 | 76 | Stream params: {} |
|
77 | 77 | changegroup -- {nbchanges: 1, version: 02} |
|
78 | 78 | c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf |
|
79 | cache:rev-branch-cache -- {} | |
|
79 | 80 | none-v2 |
|
80 | 81 | |
|
81 | 82 | % test bundle type bzip2 |
@@ -85,6 +86,7 b' test bundle types' | |||
|
85 | 86 | Stream params: {Compression: BZ} |
|
86 | 87 | changegroup -- {nbchanges: 1, version: 02} |
|
87 | 88 |
|
|
89 | cache:rev-branch-cache -- {} | |
|
88 | 90 | bzip2-v2 |
|
89 | 91 | |
|
90 | 92 | % test bundle type gzip |
@@ -94,6 +96,7 b' test bundle types' | |||
|
94 | 96 | Stream params: {Compression: GZ} |
|
95 | 97 | changegroup -- {nbchanges: 1, version: 02} |
|
96 | 98 | c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf |
|
99 | cache:rev-branch-cache -- {} | |
|
97 | 100 | gzip-v2 |
|
98 | 101 | |
|
99 | 102 | % test bundle type none-v2 |
@@ -103,6 +106,7 b' test bundle types' | |||
|
103 | 106 | Stream params: {} |
|
104 | 107 |
|
|
105 | 108 | c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf |
|
109 | cache:rev-branch-cache -- {} | |
|
106 | 110 | none-v2 |
|
107 | 111 | |
|
108 | 112 | % test bundle type v2 |
@@ -112,6 +116,7 b' test bundle types' | |||
|
112 | 116 | Stream params: {Compression: BZ} |
|
113 | 117 | changegroup -- {nbchanges: 1, version: 02} |
|
114 | 118 |
|
|
119 | cache:rev-branch-cache -- {} | |
|
115 | 120 | bzip2-v2 |
|
116 | 121 | |
|
117 | 122 | % test bundle type v1 |
@@ -150,12 +155,12 b' Compression level can be adjusted for bu' | |||
|
150 | 155 | $ hg bundle -a -t gzip-v2 gzip-v2.hg |
|
151 | 156 | 1 changesets found |
|
152 | 157 | $ f --size gzip-v2.hg |
|
153 |
gzip-v2.hg: size=4 |
|
|
158 | gzip-v2.hg: size=468 | |
|
154 | 159 | |
|
155 | 160 | $ hg --config experimental.bundlecomplevel=1 bundle -a -t gzip-v2 gzip-v2-level1.hg |
|
156 | 161 | 1 changesets found |
|
157 | 162 | $ f --size gzip-v2-level1.hg |
|
158 |
gzip-v2-level1.hg: size=4 |
|
|
163 | gzip-v2-level1.hg: size=475 | |
|
159 | 164 | |
|
160 | 165 | $ cd .. |
|
161 | 166 | |
@@ -171,6 +176,7 b' Compression level can be adjusted for bu' | |||
|
171 | 176 | Stream params: {Compression: ZS} |
|
172 | 177 | changegroup -- {nbchanges: 1, version: 02} |
|
173 | 178 | c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf |
|
179 | cache:rev-branch-cache -- {} | |
|
174 | 180 | zstd-v2 |
|
175 | 181 | |
|
176 | 182 | % test bundle type zstd-v2 |
@@ -180,6 +186,7 b' Compression level can be adjusted for bu' | |||
|
180 | 186 | Stream params: {Compression: ZS} |
|
181 | 187 | changegroup -- {nbchanges: 1, version: 02} |
|
182 | 188 |
|
|
189 | cache:rev-branch-cache -- {} | |
|
183 | 190 | zstd-v2 |
|
184 | 191 | |
|
185 | 192 |
@@ -774,7 +774,7 b' bundle single branch' | |||
|
774 | 774 | list of changesets: |
|
775 | 775 | 1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a |
|
776 | 776 | 057f4db07f61970e1c11e83be79e9d08adc4dc31 |
|
777 |
bundle2-output-bundle: "HG20", (1 params) |
|
|
777 | bundle2-output-bundle: "HG20", (1 params) 2 parts total | |
|
778 | 778 | bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
|
779 | 779 | bundling: 1/2 changesets (50.00%) |
|
780 | 780 | bundling: 2/2 changesets (100.00%) |
@@ -783,6 +783,7 b' bundle single branch' | |||
|
783 | 783 | bundling: b 1/3 files (33.33%) |
|
784 | 784 | bundling: b1 2/3 files (66.67%) |
|
785 | 785 | bundling: x 3/3 files (100.00%) |
|
786 | bundle2-output-part: "cache:rev-branch-cache" streamed payload | |
|
786 | 787 | |
|
787 | 788 | == Test for issue3441 |
|
788 | 789 |
@@ -163,7 +163,7 b' changes, clone bundles produced by new M' | |||
|
163 | 163 | by old clients. |
|
164 | 164 | |
|
165 | 165 | $ f --size --hexdump full.hg |
|
166 |
full.hg: size= |
|
|
166 | full.hg: size=442 | |
|
167 | 167 | 0000: 48 47 32 30 00 00 00 0e 43 6f 6d 70 72 65 73 73 |HG20....Compress| |
|
168 | 168 | 0010: 69 6f 6e 3d 47 5a 78 9c 63 60 60 d0 e4 76 f6 70 |ion=GZx.c``..v.p| |
|
169 | 169 | 0020: f4 73 77 75 0f f2 0f 0d 60 00 02 46 46 76 26 4e |.swu....`..FFv&N| |
@@ -188,7 +188,10 b' by old clients.' | |||
|
188 | 188 | 0150: 88 75 34 36 75 04 82 55 17 14 36 a4 38 10 04 d8 |.u46u..U..6.8...| |
|
189 | 189 | 0160: 21 01 9a b1 83 f7 e9 45 8b d2 56 c7 a3 1f 82 52 |!......E..V....R| |
|
190 | 190 | 0170: d7 8a 78 ed fc d5 76 f1 36 25 81 89 c7 ad ec 90 |..x...v.6%......| |
|
191 |
0180: 54 47 75 2b 89 4 |
|
|
191 | 0180: 54 47 75 2b 89 48 b1 b2 62 ce 8e ce 1e ae 56 41 |TGu+.H..b.....VA| | |
|
192 | 0190: ae 61 ba 4e 41 8e 7e ce 1e ba 60 01 a0 14 23 58 |.a.NA.~...`...#X| | |
|
193 | 01a0: 81 35 c8 7d 40 cc 04 e2 a4 a4 a6 25 96 e6 94 60 |.5.}@......%...`| | |
|
194 | 01b0: 33 17 5f 54 00 00 01 1b 0a ec |3._T......| | |
|
192 | 195 | |
|
193 | 196 |
$ |
|
194 | 197 |
$ |
@@ -529,14 +532,14 b' Test clone bundle retrieved through bund' | |||
|
529 | 532 | $ cat hg.pid >> $DAEMON_PIDS |
|
530 | 533 | |
|
531 | 534 | $ hg -R server debuglfput gz-a.hg |
|
532 | f6eca29e25359f6a92f1ea64527cdcf1b5abe62a | |
|
535 | 14ee2f0b3f1d14aeeb2fe037e09fc295c3cf59f5 | |
|
533 | 536 | |
|
534 | 537 | $ cat > server/.hg/clonebundles.manifest << EOF |
|
535 |
> largefile:// |
|
|
538 | > largefile://14ee2f0b3f1d14aeeb2fe037e09fc295c3cf59f5 BUNDLESPEC=gzip-v2 | |
|
536 | 539 | > EOF |
|
537 | 540 | |
|
538 | 541 | $ hg clone -U http://localhost:$HGPORT largefile-provided --traceback |
|
539 |
applying clone bundle from largefile:// |
|
|
542 | applying clone bundle from largefile://14ee2f0b3f1d14aeeb2fe037e09fc295c3cf59f5 | |
|
540 | 543 | adding changesets |
|
541 | 544 | adding manifests |
|
542 | 545 | adding file changes |
@@ -34,12 +34,14 b' Terse output:' | |||
|
34 | 34 | changegroup -- {nbchanges: 2, version: 02} |
|
35 | 35 | 0e067c57feba1a5694ca4844f05588bb1bf82342 |
|
36 | 36 | 991a3460af53952d10ec8a295d3d2cc2e5fa9690 |
|
37 | cache:rev-branch-cache -- {} | |
|
37 | 38 | |
|
38 | 39 | Quiet output |
|
39 | 40 | |
|
40 | 41 | $ hg debugbundle --quiet bundle2.hg |
|
41 | 42 | Stream params: {} |
|
42 | 43 | changegroup -- {nbchanges: 2, version: 02} |
|
44 | cache:rev-branch-cache -- {} | |
|
43 | 45 | |
|
44 | 46 |
|
|
45 | 47 | |
@@ -78,5 +80,6 b' Verbose output:' | |||
|
78 | 80 | |
|
79 | 81 | c |
|
80 | 82 | b80de5d138758541c5f05265ad144ab9fa86d1db 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 991a3460af53952d10ec8a295d3d2cc2e5fa9690 0000000000000000000000000000000000000000 0 |
|
83 | cache:rev-branch-cache -- {} | |
|
81 | 84 | |
|
82 | 85 | $ cd .. |
@@ -159,6 +159,7 b' Test that strip bundle use bundle2' | |||
|
159 | 159 | Stream params: {Compression: BZ} |
|
160 | 160 | changegroup -- {nbchanges: 1, version: 02} |
|
161 | 161 | 1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9 |
|
162 | cache:rev-branch-cache -- {} | |
|
162 | 163 | phase-heads -- {} |
|
163 | 164 | 1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9 draft |
|
164 | 165 |
@@ -95,10 +95,12 b' check-that bundle can contain markers:' | |||
|
95 | 95 | Stream params: {Compression: BZ} |
|
96 | 96 | changegroup -- {nbchanges: 1, version: 02} |
|
97 | 97 | f89bcc95eba5174b1ccc3e33a82e84c96e8338ee |
|
98 | cache:rev-branch-cache -- {} | |
|
98 | 99 | $ hg debugbundle ../f89bcc95eba5-obs.hg |
|
99 | 100 | Stream params: {Compression: BZ} |
|
100 | 101 | changegroup -- {nbchanges: 1, version: 02} |
|
101 | 102 | f89bcc95eba5174b1ccc3e33a82e84c96e8338ee |
|
103 | cache:rev-branch-cache -- {} | |
|
102 | 104 | obsmarkers -- {} |
|
103 | 105 | version: 1 (70 bytes) |
|
104 | 106 | 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
@@ -1427,6 +1427,7 b' Test ability to pull changeset with loca' | |||
|
1427 | 1427 | Stream params: {Compression: BZ} |
|
1428 | 1428 | changegroup -- {nbchanges: 1, version: 02} |
|
1429 | 1429 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 |
|
1430 | cache:rev-branch-cache -- {} | |
|
1430 | 1431 | phase-heads -- {} |
|
1431 | 1432 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft |
|
1432 | 1433 | |
@@ -1468,6 +1469,7 b' Testing that strip remove markers:' | |||
|
1468 | 1469 | changegroup -- {nbchanges: 2, version: 02} |
|
1469 | 1470 | e016b03fd86fcccc54817d120b90b751aaf367d6 |
|
1470 | 1471 | b0551702f918510f01ae838ab03a463054c67b46 |
|
1472 | cache:rev-branch-cache -- {} | |
|
1471 | 1473 | obsmarkers -- {} |
|
1472 | 1474 | version: 1 (92 bytes) |
|
1473 | 1475 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
@@ -390,14 +390,15 b' test bundle and description:' | |||
|
390 | 390 | Content-Disposition: attachment; filename="bundle.hg" |
|
391 | 391 | Content-Transfer-Encoding: base64 |
|
392 | 392 | |
|
393 |
SEcyMAAAAA5Db21wcmVzc2lvbj1CWkJaaDkxQVkmU1 |
|
|
394 | Ak0E4pe4SIIIgQSgGEQOcLAA5VBKqeppMxTI0YjQNBgQMQDI0GgMhtR6I0GI2p6I0yeSEVT9MiYn | |
|
395 | qjCYQwCBtARptARgBNDEwAGiDCMA40NGjQaNA0AAAAADIAAAA0BkABktCk6qObVxZ2A/33KHibLr | |
|
396 | UQ4BwkgcPcmuCUAQZCztIWgR1SpBS6IqbIij4UFwhnnMkElcFTqoucIWbsBPK3l+6c+xYaVBWsJo | |
|
397 | aT0OV/YAOvLrziifDQMJOMIaaYce9agtI2EwQBAq089UiRU+evFHSLRBT7Wa/D/YBaUtU5ezvtr3 | |
|
398 | 6yrIS4Iyp9VWESdWPEi6VjRjdcEY4HvbmDIVEAEVJIUrHNIBx/MmnBBRkw8tSlCQ8ABZxf5ejgBI | |
|
399 | pP5TSQPLVMYbq1qbBPmWN0LYVlAvRbP4X512kDQZ9y4TQbvoZmhe+54sRsEJ8GW3hMJjERh0NNlg | |
|
400 | aB+3Cw/4u5IpwoSGxfltiA== | |
|
393 | SEcyMAAAAA5Db21wcmVzc2lvbj1CWkJaaDkxQVkmU1kHdO0GAAAN////vFcSXL9/8H7R09C/578I | |
|
394 | Ak0E4pe4SIIIgQSgGEQOcLABGYYNKiaaZGEyYjJhGTTRpiHogxGmTRiGRkNMIwhhPSbQJtpQiJkn | |
|
395 | poyk9I0PUeoNNNBkeUAHqGgD0Ro0NNBoBoaMagNBoNCpNPUemp6QGmgyaPSGmQxGhkZDQbUaBkHp | |
|
396 | MhoaANNMhkIyIauvSJPL4aUXjIQemQXkoaqOKqAQDIABsZALnf0yCLAyvmktzDWBCVHO6bb6kCqE | |
|
397 | ZobVEhmMBjs0oQzekgs6PgZSyII8zy9mmG9To49ZlN6TaX5BxlS7cJiuICUdyjNQPIIdQs1Qqqqk | |
|
398 | JZ2/BksYcU4HQyssZcpkoMco6gRc888KF9BO7BvuSuIPz7A4crBoaQB+euFU1ilz8yIBBmNBDgRX | |
|
399 | pVh4zkmPiSKcqRJxcshMqh0vkKlgQDTcOujtdmnMVBZfQiPPemcHm2098VJyHBAOqOwluyIKyG92 | |
|
400 | JAR0CCu9SB5q9DyPHUdc5yB5CurIZHt3GM0dCiQRIN0EAcQNmTYTiHdi6B6Dc/ma0hrmSCQXBzfU | |
|
401 | BEwthEg0YGaJf4u5IpwoSAO6doMA | |
|
401 | 402 | --===============*==-- (glob) |
|
402 | 403 | |
|
403 | 404 | with a specific bundle type |
@@ -297,8 +297,9 b' Check that the right ancestors is used w' | |||
|
297 | 297 | list of changesets: |
|
298 | 298 | e31216eec445e44352c5f01588856059466a24c9 |
|
299 | 299 | 2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2 |
|
300 |
bundle2-output-bundle: "HG20", (1 params) |
|
|
300 | bundle2-output-bundle: "HG20", (1 params) 3 parts total | |
|
301 | 301 | bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
|
302 | bundle2-output-part: "cache:rev-branch-cache" streamed payload | |
|
302 | 303 | bundle2-output-part: "phase-heads" 24 bytes payload |
|
303 | 304 | saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg |
|
304 | 305 | 3 changesets found |
@@ -306,8 +307,9 b' Check that the right ancestors is used w' | |||
|
306 | 307 | 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |
|
307 | 308 | 19c888675e133ab5dff84516926a65672eaf04d9 |
|
308 | 309 | 2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf |
|
309 |
bundle2-output-bundle: "HG20", |
|
|
310 | bundle2-output-bundle: "HG20", 3 parts total | |
|
310 | 311 | bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
|
312 | bundle2-output-part: "cache:rev-branch-cache" streamed payload | |
|
311 | 313 | bundle2-output-part: "phase-heads" 24 bytes payload |
|
312 | 314 | adding branch |
|
313 | 315 | bundle2-input-bundle: with-transaction |
@@ -321,12 +323,15 b' Check that the right ancestors is used w' | |||
|
321 | 323 | adding f1.txt revisions |
|
322 | 324 | added 2 changesets with 2 changes to 1 files |
|
323 | 325 | bundle2-input-part: total payload size 1686 |
|
326 | bundle2-input-part: "cache:rev-branch-cache" supported | |
|
327 | bundle2-input-part: total payload size 74 | |
|
324 | 328 | bundle2-input-part: "phase-heads" supported |
|
325 | 329 | bundle2-input-part: total payload size 24 |
|
326 |
bundle2-input-bundle: |
|
|
330 | bundle2-input-bundle: 2 parts total | |
|
327 | 331 | updating the branch cache |
|
328 | 332 | invalid branchheads cache (served): tip differs |
|
329 | 333 | rebase completed |
|
334 | truncating cache/rbc-revs-v1 to 0 | |
|
330 | 335 | |
|
331 | 336 | Test minimization of merge conflicts |
|
332 | 337 | $ hg up -q null |
@@ -214,6 +214,7 b'' | |||
|
214 | 214 | Stream params: {Compression: BZ} |
|
215 | 215 | changegroup -- {nbchanges: 1, version: 02} |
|
216 | 216 | 264128213d290d868c54642d13aeaa3675551a78 |
|
217 | cache:rev-branch-cache -- {} | |
|
217 | 218 | phase-heads -- {} |
|
218 | 219 | 264128213d290d868c54642d13aeaa3675551a78 draft |
|
219 | 220 | $ hg pull .hg/strip-backup/* |
@@ -843,13 +844,13 b' check strip behavior' | |||
|
843 | 844 | list of changesets: |
|
844 | 845 | 6625a516847449b6f0fa3737b9ba56e9f0f3032c |
|
845 | 846 | d8db9d1372214336d2b5570f20ee468d2c72fa8b |
|
846 |
bundle2-output-bundle: "HG20", (1 params) |
|
|
847 | bundle2-output-bundle: "HG20", (1 params) 3 parts total | |
|
847 | 848 | bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
|
849 | bundle2-output-part: "cache:rev-branch-cache" streamed payload | |
|
848 | 850 | bundle2-output-part: "phase-heads" 24 bytes payload |
|
849 | 851 | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg |
|
850 | 852 | updating the branch cache |
|
851 | 853 | invalid branchheads cache (served): tip differs |
|
852 | truncating cache/rbc-revs-v1 to 24 | |
|
853 | 854 | $ hg log -G |
|
854 | 855 | o changeset: 2:5c51d8d6557d |
|
855 | 856 | | tag: tip |
General Comments 0
You need to be logged in to leave comments.
Login now