This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3481

rev-branch-cache: mark the bundle2 part as advisory (issue5872)
ClosedPublic

Authored by lothiraldan on May 8 2018, 6:49 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG326b174c6a47: bundle2: mark the bundle2 part as advisory (issue5872)
Summary

It blocks old clients to read bundle including this part.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

lothiraldan created this revision.May 8 2018, 6:49 AM
indygreg accepted this revision.May 8 2018, 5:17 PM
indygreg added a subscriber: indygreg.

I'm going to queue this one on stable. Thanks for fixing this regression! And for making the debug command output more helpful so we can detect this easier in the future.

This revision is now accepted and ready to land.May 8 2018, 5:17 PM
Closed by commit rHG326b174c6a47: bundle2: mark the bundle2 part as advisory (issue5872) (authored by lothiraldan). · Explain WhyMay 8 2018, 5:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8592

mercurial/bundle2.py

utf8branch = encoding.fromlocal(branch) utf8branch = encoding.fromlocal(branch)
yield rbcstruct.pack(len(utf8branch), len(nodes), len(closed)) yield rbcstruct.pack(len(utf8branch), len(nodes), len(closed))
yield utf8branch yield utf8branch
for n in sorted(nodes): for n in sorted(nodes):
yield n yield n
for n in sorted(closed): for n in sorted(closed):
yield n yield n
bundler.newpart('cache:rev-branch-cache', data=generate()) bundler.newpart('cache:rev-branch-cache', data=generate(),
mandatory=False)
def _formatrequirementsspec(requirements): def _formatrequirementsspec(requirements):
return urlreq.quote(','.join(sorted(requirements))) return urlreq.quote(','.join(sorted(requirements)))
def _formatrequirementsparams(requirements): def _formatrequirementsparams(requirements):
requirements = _formatrequirementsspec(requirements) requirements = _formatrequirementsspec(requirements)
params = "%s%s" % (urlreq.quote("requirements="), requirements) params = "%s%s" % (urlreq.quote("requirements="), requirements)
return params return params

tests/test-bundle-phases.t

$ hg bundle --base B -r E bundle $ hg bundle --base B -r E bundle
3 changesets found 3 changesets found
$ hg debugbundle bundle $ hg debugbundle bundle
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 3, targetphase: 2, version: 02} (mandatory: True) changegroup -- {nbchanges: 3, targetphase: 2, version: 02} (mandatory: True)
26805aba1e600a82e93661149f2313866a221a7b 26805aba1e600a82e93661149f2313866a221a7b
f585351a92f85104bff7c284233c338b10eb1df7 f585351a92f85104bff7c284233c338b10eb1df7
9bc730a19041f9ec7cb33c626e811aa233efb18c 9bc730a19041f9ec7cb33c626e811aa233efb18c
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
phase-heads -- {} (mandatory: True) phase-heads -- {} (mandatory: True)
26805aba1e600a82e93661149f2313866a221a7b draft 26805aba1e600a82e93661149f2313866a221a7b draft
$ hg strip --no-backup C $ hg strip --no-backup C
$ hg unbundle -q bundle $ hg unbundle -q bundle
$ rm bundle $ rm bundle
$ hg log -G -T '{desc} {phase}\n' $ hg log -G -T '{desc} {phase}\n'
o E secret o E secret
| |
$ hg debugbundle bundle $ hg debugbundle bundle
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 5, targetphase: 2, version: 02} (mandatory: True) changegroup -- {nbchanges: 5, targetphase: 2, version: 02} (mandatory: True)
426bada5c67598ca65036d57d9e4b64b0c1ce7a0 426bada5c67598ca65036d57d9e4b64b0c1ce7a0
112478962961147124edd43549aedd1a335e44bf 112478962961147124edd43549aedd1a335e44bf
dc0947a82db884575bb76ea10ac97b08536bfa03 dc0947a82db884575bb76ea10ac97b08536bfa03
4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4 4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4
03ca77807e919db8807c3749086dc36fb478cac0 03ca77807e919db8807c3749086dc36fb478cac0
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
phase-heads -- {} (mandatory: True) phase-heads -- {} (mandatory: True)
dc0947a82db884575bb76ea10ac97b08536bfa03 public dc0947a82db884575bb76ea10ac97b08536bfa03 public
03ca77807e919db8807c3749086dc36fb478cac0 draft 03ca77807e919db8807c3749086dc36fb478cac0 draft
$ hg strip --no-backup A $ hg strip --no-backup A
$ hg unbundle -q bundle $ hg unbundle -q bundle
$ rm bundle $ rm bundle
$ hg log -G -T '{node|short} {desc} {phase}\n' $ hg log -G -T '{node|short} {desc} {phase}\n'
o 03ca77807e91 E draft o 03ca77807e91 E draft
$ hg bundle --base 'A + C' -r D bundle $ hg bundle --base 'A + C' -r D bundle
2 changesets found 2 changesets found
$ hg debugbundle bundle $ hg debugbundle bundle
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 2, targetphase: 2, version: 02} (mandatory: True) changegroup -- {nbchanges: 2, targetphase: 2, version: 02} (mandatory: True)
112478962961147124edd43549aedd1a335e44bf 112478962961147124edd43549aedd1a335e44bf
4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4 4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
phase-heads -- {} (mandatory: True) phase-heads -- {} (mandatory: True)
$ rm bundle $ rm bundle
$ hg bundle --base A -r D bundle $ hg bundle --base A -r D bundle
3 changesets found 3 changesets found
$ hg debugbundle bundle $ hg debugbundle bundle
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 3, targetphase: 2, version: 02} (mandatory: True) changegroup -- {nbchanges: 3, targetphase: 2, version: 02} (mandatory: True)
112478962961147124edd43549aedd1a335e44bf 112478962961147124edd43549aedd1a335e44bf
dc0947a82db884575bb76ea10ac97b08536bfa03 dc0947a82db884575bb76ea10ac97b08536bfa03
4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4 4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
phase-heads -- {} (mandatory: True) phase-heads -- {} (mandatory: True)
dc0947a82db884575bb76ea10ac97b08536bfa03 public dc0947a82db884575bb76ea10ac97b08536bfa03 public
$ rm bundle $ rm bundle
$ hg bundle --base 'B + C' -r 'D + E' bundle $ hg bundle --base 'B + C' -r 'D + E' bundle
2 changesets found 2 changesets found
$ hg debugbundle bundle $ hg debugbundle bundle
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 2, targetphase: 2, version: 02} (mandatory: True) changegroup -- {nbchanges: 2, targetphase: 2, version: 02} (mandatory: True)
4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4 4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4
03ca77807e919db8807c3749086dc36fb478cac0 03ca77807e919db8807c3749086dc36fb478cac0
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
phase-heads -- {} (mandatory: True) phase-heads -- {} (mandatory: True)
03ca77807e919db8807c3749086dc36fb478cac0 draft 03ca77807e919db8807c3749086dc36fb478cac0 draft
$ rm bundle $ rm bundle

tests/test-bundle-type.t

> done > done
% test bundle type None % test bundle type None
searching for changes searching for changes
1 changesets found 1 changesets found
HG20\x00\x00 (esc) HG20\x00\x00 (esc)
Stream params: {} Stream params: {}
changegroup -- {nbchanges: 1, version: 02} (mandatory: True) changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
none-v2 none-v2
% test bundle type bzip2 % test bundle type bzip2
searching for changes searching for changes
1 changesets found 1 changesets found
HG20\x00\x00 (esc) HG20\x00\x00 (esc)
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 1, version: 02} (mandatory: True) changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
bzip2-v2 bzip2-v2
% test bundle type gzip % test bundle type gzip
searching for changes searching for changes
1 changesets found 1 changesets found
HG20\x00\x00 (esc) HG20\x00\x00 (esc)
Stream params: {Compression: GZ} Stream params: {Compression: GZ}
changegroup -- {nbchanges: 1, version: 02} (mandatory: True) changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
gzip-v2 gzip-v2
% test bundle type none-v2 % test bundle type none-v2
searching for changes searching for changes
1 changesets found 1 changesets found
HG20\x00\x00 (esc) HG20\x00\x00 (esc)
Stream params: {} Stream params: {}
changegroup -- {nbchanges: 1, version: 02} (mandatory: True) changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
none-v2 none-v2
% test bundle type v2 % test bundle type v2
searching for changes searching for changes
1 changesets found 1 changesets found
HG20\x00\x00 (esc) HG20\x00\x00 (esc)
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 1, version: 02} (mandatory: True) changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
bzip2-v2 bzip2-v2
% test bundle type v1 % test bundle type v1
searching for changes searching for changes
1 changesets found 1 changesets found
HG10BZ HG10BZ
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
bzip2-v1 bzip2-v1
> done > done
% test bundle type zstd % test bundle type zstd
searching for changes searching for changes
1 changesets found 1 changesets found
HG20\x00\x00 (esc) HG20\x00\x00 (esc)
Stream params: {Compression: ZS} Stream params: {Compression: ZS}
changegroup -- {nbchanges: 1, version: 02} (mandatory: True) changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
zstd-v2 zstd-v2
% test bundle type zstd-v2 % test bundle type zstd-v2
searching for changes searching for changes
1 changesets found 1 changesets found
HG20\x00\x00 (esc) HG20\x00\x00 (esc)
Stream params: {Compression: ZS} Stream params: {Compression: ZS}
changegroup -- {nbchanges: 1, version: 02} (mandatory: True) changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
zstd-v2 zstd-v2
Explicit request for zstd on non-generaldelta repos Explicit request for zstd on non-generaldelta repos
$ hg --config format.usegeneraldelta=false init nogd $ hg --config format.usegeneraldelta=false init nogd
$ hg -q -R nogd pull t1 $ hg -q -R nogd pull t1
$ hg -R nogd bundle -a -t zstd nogd-zstd $ hg -R nogd bundle -a -t zstd nogd-zstd

tests/test-bundle.t

bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
bundling: 1/2 changesets (50.00%) bundling: 1/2 changesets (50.00%)
bundling: 2/2 changesets (100.00%) bundling: 2/2 changesets (100.00%)
bundling: 1/2 manifests (50.00%) bundling: 1/2 manifests (50.00%)
bundling: 2/2 manifests (100.00%) bundling: 2/2 manifests (100.00%)
bundling: b 1/3 files (33.33%) bundling: b 1/3 files (33.33%)
bundling: b1 2/3 files (66.67%) bundling: b1 2/3 files (66.67%)
bundling: x 3/3 files (100.00%) bundling: x 3/3 files (100.00%)
bundle2-output-part: "cache:rev-branch-cache" streamed payload bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
#if repobundlerepo #if repobundlerepo
== Test for issue3441 == Test for issue3441
$ hg clone -q -r0 . part2 $ hg clone -q -r0 . part2
$ hg -q -R part2 pull bundle.hg $ hg -q -R part2 pull bundle.hg
$ hg -R part2 verify $ hg -R part2 verify
checking changesets checking changesets

tests/test-clonebundles.t

0100: fc 5c 21 a2 39 cb 66 77 7c 00 0d c3 59 17 14 58 |.\!.9.fw|...Y..X| 0100: fc 5c 21 a2 39 cb 66 77 7c 00 0d c3 59 17 14 58 |.\!.9.fw|...Y..X|
0110: 49 16 06 29 a9 a6 29 86 c6 16 e6 a6 16 a6 26 86 |I..)..).......&.| 0110: 49 16 06 29 a9 a6 29 86 c6 16 e6 a6 16 a6 26 86 |I..)..).......&.|
0120: c9 a6 69 06 a6 46 66 a6 89 29 86 26 26 89 49 96 |..i..Ff..).&&.I.| 0120: c9 a6 69 06 a6 46 66 a6 89 29 86 26 26 89 49 96 |..i..Ff..).&&.I.|
0130: 69 89 16 66 29 86 29 49 5c 20 07 3e 16 fe 23 ae |i..f).)I\ .>..#.| 0130: 69 89 16 66 29 86 29 49 5c 20 07 3e 16 fe 23 ae |i..f).)I\ .>..#.|
0140: 26 da 1c ab 10 1f d1 f8 e3 b3 ef cd dd fc 0c 93 |&...............| 0140: 26 da 1c ab 10 1f d1 f8 e3 b3 ef cd dd fc 0c 93 |&...............|
0150: 88 75 34 36 75 04 82 55 17 14 36 a4 38 10 04 d8 |.u46u..U..6.8...| 0150: 88 75 34 36 75 04 82 55 17 14 36 a4 38 10 04 d8 |.u46u..U..6.8...|
0160: 21 01 9a b1 83 f7 e9 45 8b d2 56 c7 a3 1f 82 52 |!......E..V....R| 0160: 21 01 9a b1 83 f7 e9 45 8b d2 56 c7 a3 1f 82 52 |!......E..V....R|
0170: d7 8a 78 ed fc d5 76 f1 36 25 81 89 c7 ad ec 90 |..x...v.6%......| 0170: d7 8a 78 ed fc d5 76 f1 36 25 81 89 c7 ad ec 90 |..x...v.6%......|
0180: 54 47 75 2b 89 48 b1 b2 62 ce 8e ce 1e ae 56 41 |TGu+.H..b.....VA| 0180: 54 47 75 2b 89 48 b1 b2 62 c9 89 c9 19 a9 56 45 |TGu+.H..b.....VE|
0190: ae 61 ba 4e 41 8e 7e ce 1e ba 60 01 a0 14 23 58 |.a.NA.~...`...#X| 0190: a9 65 ba 49 45 89 79 c9 19 ba 60 01 a0 14 23 58 |.e.IE.y...`...#X|
01a0: 81 35 c8 7d 40 cc 04 e2 a4 a4 a6 25 96 e6 94 60 |.5.}@......%...`| 01a0: 81 35 c8 7d 40 cc 04 e2 a4 a4 a6 25 96 e6 94 60 |.5.}@......%...`|
01b0: 33 17 5f 54 00 00 01 1b 0a ec |3._T......| 01b0: 33 17 5f 54 00 00 d3 1b 0d 4c |3._T.....L|
$ echo "http://localhost:$HGPORT1/full.hg" > server/.hg/clonebundles.manifest $ echo "http://localhost:$HGPORT1/full.hg" > server/.hg/clonebundles.manifest
$ hg clone -U http://localhost:$HGPORT full-bundle $ hg clone -U http://localhost:$HGPORT full-bundle
applying clone bundle from http://localhost:$HGPORT1/full.hg applying clone bundle from http://localhost:$HGPORT1/full.hg
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 2 changes to 2 files added 2 changesets with 2 changes to 2 files
> [extensions] > [extensions]
> largefiles= > largefiles=
> EOF > EOF
$ killdaemons.py $ killdaemons.py
$ hg -R server serve -d -p $HGPORT --pid-file hg.pid --accesslog access.log $ hg -R server serve -d -p $HGPORT --pid-file hg.pid --accesslog access.log
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
$ hg -R server debuglfput gz-a.hg $ hg -R server debuglfput gz-a.hg
14ee2f0b3f1d14aeeb2fe037e09fc295c3cf59f5 1f74b3d08286b9b3a16fb3fa185dd29219cbc6ae
$ cat > server/.hg/clonebundles.manifest << EOF $ cat > server/.hg/clonebundles.manifest << EOF
> largefile://14ee2f0b3f1d14aeeb2fe037e09fc295c3cf59f5 BUNDLESPEC=gzip-v2 > largefile://1f74b3d08286b9b3a16fb3fa185dd29219cbc6ae BUNDLESPEC=gzip-v2
> EOF > EOF
$ hg clone -U http://localhost:$HGPORT largefile-provided --traceback $ hg clone -U http://localhost:$HGPORT largefile-provided --traceback
applying clone bundle from largefile://14ee2f0b3f1d14aeeb2fe037e09fc295c3cf59f5 applying clone bundle from largefile://1f74b3d08286b9b3a16fb3fa185dd29219cbc6ae
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 2 changes to 2 files added 2 changesets with 2 changes to 2 files
finished applying clone bundle finished applying clone bundle
searching for changes searching for changes
no changes found no changes found

tests/test-debugbundle.t

Terse output: Terse output:
$ hg debugbundle bundle2.hg $ hg debugbundle bundle2.hg
Stream params: {} Stream params: {}
changegroup -- {nbchanges: 2, version: 02} (mandatory: True) changegroup -- {nbchanges: 2, version: 02} (mandatory: True)
0e067c57feba1a5694ca4844f05588bb1bf82342 0e067c57feba1a5694ca4844f05588bb1bf82342
991a3460af53952d10ec8a295d3d2cc2e5fa9690 991a3460af53952d10ec8a295d3d2cc2e5fa9690
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
Quiet output Quiet output
$ hg debugbundle --quiet bundle2.hg $ hg debugbundle --quiet bundle2.hg
Stream params: {} Stream params: {}
changegroup -- {nbchanges: 2, version: 02} (mandatory: True) changegroup -- {nbchanges: 2, version: 02} (mandatory: True)
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
Verbose output: Verbose output:
$ hg debugbundle --all bundle.hg $ hg debugbundle --all bundle.hg
format: id, p1, p2, cset, delta base, len(delta) format: id, p1, p2, cset, delta base, len(delta)
changelog changelog
0e067c57feba1a5694ca4844f05588bb1bf82342 3903775176ed42b1458a6281db4a0ccf4d9f287a 0000000000000000000000000000000000000000 0e067c57feba1a5694ca4844f05588bb1bf82342 3903775176ed42b1458a6281db4a0ccf4d9f287a 80 0e067c57feba1a5694ca4844f05588bb1bf82342 3903775176ed42b1458a6281db4a0ccf4d9f287a 0000000000000000000000000000000000000000 0e067c57feba1a5694ca4844f05588bb1bf82342 3903775176ed42b1458a6281db4a0ccf4d9f287a 80
686dbf0aeca417636fa26a9121c681eabbb15a20 8515d4bfda768e04af4c13a69a72e28c7effbea7 0000000000000000000000000000000000000000 0e067c57feba1a5694ca4844f05588bb1bf82342 8515d4bfda768e04af4c13a69a72e28c7effbea7 55 686dbf0aeca417636fa26a9121c681eabbb15a20 8515d4bfda768e04af4c13a69a72e28c7effbea7 0000000000000000000000000000000000000000 0e067c57feba1a5694ca4844f05588bb1bf82342 8515d4bfda768e04af4c13a69a72e28c7effbea7 55
ae25a31b30b3490a981e7b96a3238cc69583fda1 686dbf0aeca417636fa26a9121c681eabbb15a20 0000000000000000000000000000000000000000 991a3460af53952d10ec8a295d3d2cc2e5fa9690 686dbf0aeca417636fa26a9121c681eabbb15a20 55 ae25a31b30b3490a981e7b96a3238cc69583fda1 686dbf0aeca417636fa26a9121c681eabbb15a20 0000000000000000000000000000000000000000 991a3460af53952d10ec8a295d3d2cc2e5fa9690 686dbf0aeca417636fa26a9121c681eabbb15a20 55
b b
b80de5d138758541c5f05265ad144ab9fa86d1db 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0e067c57feba1a5694ca4844f05588bb1bf82342 0000000000000000000000000000000000000000 0 b80de5d138758541c5f05265ad144ab9fa86d1db 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0e067c57feba1a5694ca4844f05588bb1bf82342 0000000000000000000000000000000000000000 0
c c
b80de5d138758541c5f05265ad144ab9fa86d1db 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 991a3460af53952d10ec8a295d3d2cc2e5fa9690 0000000000000000000000000000000000000000 0 b80de5d138758541c5f05265ad144ab9fa86d1db 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 991a3460af53952d10ec8a295d3d2cc2e5fa9690 0000000000000000000000000000000000000000 0
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
$ cd .. $ cd ..

tests/test-generaldelta.t

Test that strip bundle use bundle2 Test that strip bundle use bundle2
$ hg --config extensions.strip= strip . $ hg --config extensions.strip= strip .
0 files updated, 0 files merged, 5 files removed, 0 files unresolved 0 files updated, 0 files merged, 5 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg
$ hg debugbundle .hg/strip-backup/* $ hg debugbundle .hg/strip-backup/*
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 1, version: 02} (mandatory: True) changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9 1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
phase-heads -- {} (mandatory: True) phase-heads -- {} (mandatory: True)
1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9 draft 1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9 draft
$ cd .. $ cd ..
test maxdeltachainspan test maxdeltachainspan
$ hg init source-repo $ hg init source-repo

tests/test-http-bad-server.t

write(38 from 38) -> (257) 20\\r\\n\x08LISTKEYS\x00\x00\x00\x01\x01\x00 \x06namespacephases\\r\\n (esc) write(38 from 38) -> (257) 20\\r\\n\x08LISTKEYS\x00\x00\x00\x01\x01\x00 \x06namespacephases\\r\\n (esc)
write(9 from 9) -> (248) 4\\r\\n\x00\x00\x00:\\r\\n (esc) write(9 from 9) -> (248) 4\\r\\n\x00\x00\x00:\\r\\n (esc)
write(64 from 64) -> (184) 3a\r\n96ee1d7354c4ad7372047672c36a1f561e3a6a4c 1\npublishing True\r\n write(64 from 64) -> (184) 3a\r\n96ee1d7354c4ad7372047672c36a1f561e3a6a4c 1\npublishing True\r\n
write(9 from 9) -> (175) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc) write(9 from 9) -> (175) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc)
write(9 from 9) -> (166) 4\\r\\n\x00\x00\x00#\\r\\n (esc) write(9 from 9) -> (166) 4\\r\\n\x00\x00\x00#\\r\\n (esc)
write(41 from 41) -> (125) 23\\r\\n\x08LISTKEYS\x00\x00\x00\x02\x01\x00 namespacebookmarks\\r\\n (esc) write(41 from 41) -> (125) 23\\r\\n\x08LISTKEYS\x00\x00\x00\x02\x01\x00 namespacebookmarks\\r\\n (esc)
write(9 from 9) -> (116) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc) write(9 from 9) -> (116) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc)
write(9 from 9) -> (107) 4\\r\\n\x00\x00\x00\x1d\\r\\n (esc) write(9 from 9) -> (107) 4\\r\\n\x00\x00\x00\x1d\\r\\n (esc)
write(35 from 35) -> (72) 1d\\r\\n\x16CACHE:REV-BRANCH-CACHE\x00\x00\x00\x03\x00\x00\\r\\n (esc) write(35 from 35) -> (72) 1d\\r\\n\x16cache:rev-branch-cache\x00\x00\x00\x03\x00\x00\\r\\n (esc)
write(9 from 9) -> (63) 4\\r\\n\x00\x00\x00'\\r\\n (esc) write(9 from 9) -> (63) 4\\r\\n\x00\x00\x00'\\r\\n (esc)
write(45 from 45) -> (18) 27\\r\\n\x00\x00\x00\x07\x00\x00\x00\x01\x00\x00\x00\x00default\x96\xee\x1dsT\xc4\xadsr\x04vr\xc3j\x1fV\x1e:jL\\r\\n (esc) write(45 from 45) -> (18) 27\\r\\n\x00\x00\x00\x07\x00\x00\x00\x01\x00\x00\x00\x00default\x96\xee\x1dsT\xc4\xadsr\x04vr\xc3j\x1fV\x1e:jL\\r\\n (esc)
write(9 from 9) -> (9) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc) write(9 from 9) -> (9) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc)
write(9 from 9) -> (0) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc) write(9 from 9) -> (0) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc)
write limit reached; closing socket write limit reached; closing socket
write(27) -> 15\r\nInternal Server Error\r\n write(27) -> 15\r\nInternal Server Error\r\n
$ rm -f error.log $ rm -f error.log
write(38 from 38) -> (260) 20\\r\\n\x08LISTKEYS\x00\x00\x00\x01\x01\x00 \x06namespacephases\\r\\n (esc) write(38 from 38) -> (260) 20\\r\\n\x08LISTKEYS\x00\x00\x00\x01\x01\x00 \x06namespacephases\\r\\n (esc)
write(9 from 9) -> (251) 4\\r\\n\x00\x00\x00:\\r\\n (esc) write(9 from 9) -> (251) 4\\r\\n\x00\x00\x00:\\r\\n (esc)
write(64 from 64) -> (187) 3a\r\n96ee1d7354c4ad7372047672c36a1f561e3a6a4c 1\npublishing True\r\n write(64 from 64) -> (187) 3a\r\n96ee1d7354c4ad7372047672c36a1f561e3a6a4c 1\npublishing True\r\n
write(9 from 9) -> (178) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc) write(9 from 9) -> (178) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc)
write(9 from 9) -> (169) 4\\r\\n\x00\x00\x00#\\r\\n (esc) write(9 from 9) -> (169) 4\\r\\n\x00\x00\x00#\\r\\n (esc)
write(41 from 41) -> (128) 23\\r\\n\x08LISTKEYS\x00\x00\x00\x02\x01\x00 namespacebookmarks\\r\\n (esc) write(41 from 41) -> (128) 23\\r\\n\x08LISTKEYS\x00\x00\x00\x02\x01\x00 namespacebookmarks\\r\\n (esc)
write(9 from 9) -> (119) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc) write(9 from 9) -> (119) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc)
write(9 from 9) -> (110) 4\\r\\n\x00\x00\x00\x1d\\r\\n (esc) write(9 from 9) -> (110) 4\\r\\n\x00\x00\x00\x1d\\r\\n (esc)
write(35 from 35) -> (75) 1d\\r\\n\x16CACHE:REV-BRANCH-CACHE\x00\x00\x00\x03\x00\x00\\r\\n (esc) write(35 from 35) -> (75) 1d\\r\\n\x16cache:rev-branch-cache\x00\x00\x00\x03\x00\x00\\r\\n (esc)
write(9 from 9) -> (66) 4\\r\\n\x00\x00\x00'\\r\\n (esc) write(9 from 9) -> (66) 4\\r\\n\x00\x00\x00'\\r\\n (esc)
write(45 from 45) -> (21) 27\\r\\n\x00\x00\x00\x07\x00\x00\x00\x01\x00\x00\x00\x00default\x96\xee\x1dsT\xc4\xadsr\x04vr\xc3j\x1fV\x1e:jL\\r\\n (esc) write(45 from 45) -> (21) 27\\r\\n\x00\x00\x00\x07\x00\x00\x00\x01\x00\x00\x00\x00default\x96\xee\x1dsT\xc4\xadsr\x04vr\xc3j\x1fV\x1e:jL\\r\\n (esc)
write(9 from 9) -> (12) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc) write(9 from 9) -> (12) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc)
write(9 from 9) -> (3) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc) write(9 from 9) -> (3) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc)
write(3 from 5) -> (0) 0\r\n write(3 from 5) -> (0) 0\r\n
write limit reached; closing socket write limit reached; closing socket
write(27) -> 15\r\nInternal Server Error\r\n write(27) -> 15\r\nInternal Server Error\r\n
$ rm -f error.log $ rm -f error.log
$ rm -rf clone $ rm -rf clone

tests/test-lfs-serve-access.t

adding file changes adding file changes
adding lfs.bin revisions adding lfs.bin revisions
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs
bundle2-input-part: total payload size 648 bundle2-input-part: total payload size 648
bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-part: "cache:rev-branch-cache" supported bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
bundle2-input-part: total payload size 39 bundle2-input-part: total payload size 39
bundle2-input-bundle: 3 parts total bundle2-input-bundle: 3 parts total
checking for updated bookmarks checking for updated bookmarks
updating the branch cache updating the branch cache
new changesets 525251863cad new changesets 525251863cad
updating to branch default updating to branch default
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False

tests/test-obsolete-changeset-exchange.t

check-that bundle can contain markers: check-that bundle can contain markers:
$ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5-obs.hg --config experimental.evolution.bundle-obsmarker=1 $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5-obs.hg --config experimental.evolution.bundle-obsmarker=1
1 changesets found 1 changesets found
$ hg debugbundle ../f89bcc95eba5.hg $ hg debugbundle ../f89bcc95eba5.hg
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 1, version: 02} (mandatory: True) changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
f89bcc95eba5174b1ccc3e33a82e84c96e8338ee f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
$ hg debugbundle ../f89bcc95eba5-obs.hg $ hg debugbundle ../f89bcc95eba5-obs.hg
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 1, version: 02} (mandatory: True) changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
f89bcc95eba5174b1ccc3e33a82e84c96e8338ee f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
obsmarkers -- {} (mandatory: True) obsmarkers -- {} (mandatory: True)
version: 1 (70 bytes) version: 1 (70 bytes)
9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
$ cd .. $ cd ..
pull does not fetch excessive changesets when common node is hidden (issue4982) pull does not fetch excessive changesets when common node is hidden (issue4982)
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
1 changesets found 1 changesets found
list of changesets: list of changesets:
bec0734cd68e84477ba7fc1d13e6cff53ab70129 bec0734cd68e84477ba7fc1d13e6cff53ab70129
listing keys for "bookmarks" listing keys for "bookmarks"
bundle2-output-bundle: "HG20", 4 parts total bundle2-output-bundle: "HG20", 4 parts total
bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload
bundle2-output-part: "phase-heads" 24 bytes payload bundle2-output-part: "phase-heads" 24 bytes payload
bundle2-output-part: "cache:rev-branch-cache" streamed payload bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
adding changesets adding changesets
add changeset bec0734cd68e add changeset bec0734cd68e
adding manifests adding manifests
adding file changes adding file changes
adding foo revisions adding foo revisions
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
bundle2-input-part: total payload size 476 bundle2-input-part: total payload size 476
bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-part: "cache:rev-branch-cache" supported bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
bundle2-input-part: total payload size 39 bundle2-input-part: total payload size 39
bundle2-input-bundle: 3 parts total bundle2-input-bundle: 3 parts total
checking for updated bookmarks checking for updated bookmarks
updating the branch cache updating the branch cache
new changesets bec0734cd68e new changesets bec0734cd68e
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)

tests/test-obsolete.t

o 1:e016b03fd86f (draft) [ ] 1 o 1:e016b03fd86f (draft) [ ] 1
| |
o 0:a78f55e5508c (draft) [ ] 0 o 0:a78f55e5508c (draft) [ ] 0
$ hg debugbundle .hg/strip-backup/e008cf283490-*-backup.hg $ hg debugbundle .hg/strip-backup/e008cf283490-*-backup.hg
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 1, version: 02} (mandatory: True) changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
e008cf2834908e5d6b0f792a9d4b0e2272260fb8 e008cf2834908e5d6b0f792a9d4b0e2272260fb8
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
phase-heads -- {} (mandatory: True) phase-heads -- {} (mandatory: True)
e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft
#if repobundlerepo #if repobundlerepo
$ hg pull .hg/strip-backup/e008cf283490-*-backup.hg $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg
pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg
searching for changes searching for changes
no changes found no changes found
$ hg log -G --hidden $ hg log -G --hidden
@ 0:a78f55e5508c (draft) [tip ] 0 @ 0:a78f55e5508c (draft) [tip ] 0
$ hg debugbundle .hg/strip-backup/e016b03fd86f-*-backup.hg $ hg debugbundle .hg/strip-backup/e016b03fd86f-*-backup.hg
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 2, version: 02} (mandatory: True) changegroup -- {nbchanges: 2, version: 02} (mandatory: True)
e016b03fd86fcccc54817d120b90b751aaf367d6 e016b03fd86fcccc54817d120b90b751aaf367d6
b0551702f918510f01ae838ab03a463054c67b46 b0551702f918510f01ae838ab03a463054c67b46
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
obsmarkers -- {} (mandatory: True) obsmarkers -- {} (mandatory: True)
version: 1 (92 bytes) version: 1 (92 bytes)
e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
phase-heads -- {} (mandatory: True) phase-heads -- {} (mandatory: True)
b0551702f918510f01ae838ab03a463054c67b46 draft b0551702f918510f01ae838ab03a463054c67b46 draft
$ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg
adding changesets adding changesets

tests/test-patchbomb.t

description description
--===*= (glob) --===*= (glob)
Content-Type: application/x-mercurial-bundle Content-Type: application/x-mercurial-bundle
MIME-Version: 1.0 MIME-Version: 1.0
Content-Disposition: attachment; filename="bundle.hg" Content-Disposition: attachment; filename="bundle.hg"
Content-Transfer-Encoding: base64 Content-Transfer-Encoding: base64
SEcyMAAAAA5Db21wcmVzc2lvbj1CWkJaaDkxQVkmU1kHdO0GAAAN////vFcSXL9/8H7R09C/578I SEcyMAAAAA5Db21wcmVzc2lvbj1CWkJaaDkxQVkmU1l91TAVAAAN////vFcSXL9/8H7R09C/578I
Ak0E4pe4SIIIgQSgGEQOcLABGYYNKiaaZGEyYjJhGTTRpiHogxGmTRiGRkNMIwhhPSbQJtpQiJkn Ak0E4pe4SIIIgQSgGEQOcLABGYYNKgJgmhpp6mmjIZMCZNMhpgBBpkaYJpo9QaZMg02iaY2lCImK
poyk9I0PUeoNNNBkeUAHqGgD0Ro0NNBoBoaMagNBoNCpNPUemp6QGmgyaPSGmQxGhkZDQbUaBkHp emk02kmEAeoA0D01ANBoHqHqADTaj1NAAyZqA0Gg0KiYnqaepk0eoNDTCGj1A0eoyBoGjRkYBqAB
MhoaANNMhkIyIauvSJPL4aUXjIQemQXkoaqOKqAQDIABsZALnf0yCLAyvmktzDWBCVHO6bb6kCqE poNMmhkBhENSP0knlYZbqyEIYxkFdpDUS6roBDMgAGhkAqd92kEcgyeMo2MM366gpLNHjfKrhJPN
ZobVEhmMBjs0oQzekgs6PgZSyII8zy9mmG9To49ZlN6TaX5BxlS7cJiuICUdyjNQPIIdQs1Qqqqk vdBCHAEDsYzAvzkHKxy5KWBAmh5e1nFttGChpsxrgmutRG0YrsSLWEBH9h95cbZEKFeUKYykRXHa
JZ2/BksYcU4HQyssZcpkoMco6gRc888KF9BO7BvuSuIPz7A4crBoaQB+euFU1ilz8yIBBmNBDgRX Bkt2OSgELsqqnWKeMudBR+YSZCOSHrwPz7B/Gfou7/L6QV6S0IgclBCitBVHMxMFq/vGwp5WHezM
pVh4zkmPiSKcqRJxcshMqh0vkKlgQDTcOujtdmnMVBZfQiPPemcHm2098VJyHBAOqOwluyIKyG92 JwhKTnH0OkMbmVjrAkQKR7VM2aNSXn+GzLOCzOQm0AJ1TLCpdSgnfFPcY7mGxAOyHXS1YEFVi5O9
JAR0CCu9SB5q9DyPHUdc5yB5CurIZHt3GM0dCiQRIN0EAcQNmTYTiHdi6B6Dc/ma0hrmSCQXBzfU I4EVBBd8VRgN4n1MAm8l6QQ+yB60hkeX/0ZZmKoQRINkEBxEDZU2HjIZMcwWRvZtbRIa5kgkGIb/
BEwthEg0YGaJf4u5IpwoSAO6doMA SkImFwIkDtQxyX+LuSKcKEg+6pgKgA==
--===============*==-- (glob) --===============*==-- (glob)
with a specific bundle type with a specific bundle type
(binary part must be different) (binary part must be different)
$ hg email --date '1970-1-1 0:3' -n -f quux -t foo \ $ hg email --date '1970-1-1 0:3' -n -f quux -t foo \
> -c bar -s test -r tip -b --desc description \ > -c bar -s test -r tip -b --desc description \
> --config patchbomb.bundletype=gzip-v1 | $FILTERBOUNDARY > --config patchbomb.bundletype=gzip-v1 | $FILTERBOUNDARY

tests/test-rebase-conflicts.t

f2.txt: remote created -> g f2.txt: remote created -> g
getting f2.txt getting f2.txt
2 changesets found 2 changesets found
list of changesets: list of changesets:
e31216eec445e44352c5f01588856059466a24c9 e31216eec445e44352c5f01588856059466a24c9
2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2 2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
bundle2-output-bundle: "HG20", (1 params) 3 parts total bundle2-output-bundle: "HG20", (1 params) 3 parts total
bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
bundle2-output-part: "cache:rev-branch-cache" streamed payload bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
bundle2-output-part: "phase-heads" 24 bytes payload bundle2-output-part: "phase-heads" 24 bytes payload
saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg
3 changesets found 3 changesets found
list of changesets: list of changesets:
4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
19c888675e133ab5dff84516926a65672eaf04d9 19c888675e133ab5dff84516926a65672eaf04d9
2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf 2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf
bundle2-output-bundle: "HG20", 3 parts total bundle2-output-bundle: "HG20", 3 parts total
bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
bundle2-output-part: "cache:rev-branch-cache" streamed payload bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
bundle2-output-part: "phase-heads" 24 bytes payload bundle2-output-part: "phase-heads" 24 bytes payload
adding branch adding branch
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
adding changesets adding changesets
add changeset 4c9fbe56a16f add changeset 4c9fbe56a16f
add changeset 19c888675e13 add changeset 19c888675e13
add changeset 2a7f09cac94c add changeset 2a7f09cac94c
adding manifests adding manifests
adding file changes adding file changes
adding f1.txt revisions adding f1.txt revisions
added 2 changesets with 2 changes to 1 files added 2 changesets with 2 changes to 1 files
bundle2-input-part: total payload size 1686 bundle2-input-part: total payload size 1686
bundle2-input-part: "cache:rev-branch-cache" supported bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
bundle2-input-part: total payload size 74 bundle2-input-part: total payload size 74
truncating cache/rbc-revs-v1 to 56 truncating cache/rbc-revs-v1 to 56
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 2 parts total bundle2-input-bundle: 2 parts total
updating the branch cache updating the branch cache
invalid branchheads cache (served): tip differs invalid branchheads cache (served): tip differs
rebase completed rebase completed

tests/test-strip.t

user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: b summary: b
$ hg debugbundle .hg/strip-backup/* $ hg debugbundle .hg/strip-backup/*
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 1, version: 02} (mandatory: True) changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
264128213d290d868c54642d13aeaa3675551a78 264128213d290d868c54642d13aeaa3675551a78
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
phase-heads -- {} (mandatory: True) phase-heads -- {} (mandatory: True)
264128213d290d868c54642d13aeaa3675551a78 draft 264128213d290d868c54642d13aeaa3675551a78 draft
$ hg unbundle .hg/strip-backup/* $ hg unbundle .hg/strip-backup/*
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads) added 1 changesets with 0 changes to 1 files (+1 heads)
new changesets 264128213d29 new changesets 264128213d29
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
2 changesets found 2 changesets found
list of changesets: list of changesets:
6625a516847449b6f0fa3737b9ba56e9f0f3032c 6625a516847449b6f0fa3737b9ba56e9f0f3032c
d8db9d1372214336d2b5570f20ee468d2c72fa8b d8db9d1372214336d2b5570f20ee468d2c72fa8b
bundle2-output-bundle: "HG20", (1 params) 3 parts total bundle2-output-bundle: "HG20", (1 params) 3 parts total
bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
bundle2-output-part: "cache:rev-branch-cache" streamed payload bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
bundle2-output-part: "phase-heads" 24 bytes payload bundle2-output-part: "phase-heads" 24 bytes payload
saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg
updating the branch cache updating the branch cache
invalid branchheads cache (served): tip differs invalid branchheads cache (served): tip differs
$ hg log -G $ hg log -G
o changeset: 2:5c51d8d6557d o changeset: 2:5c51d8d6557d
| tag: tip | tag: tip
| user: test | user: test

tests/test-tags.t

$ hg debugbundle ./test-cache-in-bundle-all-rev.hg $ hg debugbundle ./test-cache-in-bundle-all-rev.hg
Stream params: {Compression: BZ} Stream params: {Compression: BZ}
changegroup -- {nbchanges: 4, version: 02} (mandatory: True) changegroup -- {nbchanges: 4, version: 02} (mandatory: True)
96ee1d7354c4ad7372047672c36a1f561e3a6a4c 96ee1d7354c4ad7372047672c36a1f561e3a6a4c
c4dab0c2fd337eb9191f80c3024830a4889a8f34 c4dab0c2fd337eb9191f80c3024830a4889a8f34
f63cc8fe54e4d326f8d692805d70e092f851ddb1 f63cc8fe54e4d326f8d692805d70e092f851ddb1
40f0358cb314c824a5929ee527308d90e023bc10 40f0358cb314c824a5929ee527308d90e023bc10
hgtagsfnodes -- {} (mandatory: True) hgtagsfnodes -- {} (mandatory: True)
cache:rev-branch-cache -- {} (mandatory: True) cache:rev-branch-cache -- {} (mandatory: False)
Check that local clone includes cache data Check that local clone includes cache data
$ hg clone tagsclient tags-local-clone $ hg clone tagsclient tags-local-clone
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ (cd tags-local-clone/.hg/cache/; ls -1 tag*) $ (cd tags-local-clone/.hg/cache/; ls -1 tag*)
tags2-visible tags2-visible