Mercurial > public > mercurial-scm > hg
comparison mercurial/bundle2.py @ 50529:116da6bb7e3b
stream-clone: add the `-exp` prefix to the bundle part
We forget to do so in 58adcabc295f, however this is important to prevent
"current" client to send incompatible version to future client.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 23 May 2023 01:28:56 +0200 |
| parents | 58adcabc295f |
| children | f4a540c203d7 |
comparison
equal
deleted
inserted
replaced
| 50528:9d1c56a79bb8 | 50529:116da6bb7e3b |
|---|---|
| 1950 filecount, bytecount, it = streamclone.generatev2( | 1950 filecount, bytecount, it = streamclone.generatev2( |
| 1951 repo, includepats, excludepats, includeobsmarkers | 1951 repo, includepats, excludepats, includeobsmarkers |
| 1952 ) | 1952 ) |
| 1953 requirements = streamclone.streamed_requirements(repo) | 1953 requirements = streamclone.streamed_requirements(repo) |
| 1954 requirements = _formatrequirementsspec(requirements) | 1954 requirements = _formatrequirementsspec(requirements) |
| 1955 part = bundler.newpart(b'stream3', data=it) | 1955 part = bundler.newpart(b'stream3-exp', data=it) |
| 1956 part.addparam(b'bytecount', b'%d' % bytecount, mandatory=True) | 1956 part.addparam(b'bytecount', b'%d' % bytecount, mandatory=True) |
| 1957 part.addparam(b'filecount', b'%d' % filecount, mandatory=True) | 1957 part.addparam(b'filecount', b'%d' % filecount, mandatory=True) |
| 1958 part.addparam(b'requirements', requirements, mandatory=True) | 1958 part.addparam(b'requirements', requirements, mandatory=True) |
| 1959 | 1959 |
| 1960 | 1960 |
| 2609 | 2609 |
| 2610 repo.ui.debug(b'applying stream bundle\n') | 2610 repo.ui.debug(b'applying stream bundle\n') |
| 2611 streamclone.applybundlev2(repo, part, filecount, bytecount, requirements) | 2611 streamclone.applybundlev2(repo, part, filecount, bytecount, requirements) |
| 2612 | 2612 |
| 2613 | 2613 |
| 2614 @parthandler(b'stream3', (b'requirements', b'filecount', b'bytecount')) | 2614 @parthandler(b'stream3-exp', (b'requirements', b'filecount', b'bytecount')) |
| 2615 def handlestreamv3bundle(op, part): | 2615 def handlestreamv3bundle(op, part): |
| 2616 return handlestreamv2bundle(op, part) | 2616 return handlestreamv2bundle(op, part) |
| 2617 | 2617 |
| 2618 | 2618 |
| 2619 def widen_bundle( | 2619 def widen_bundle( |