| Alphare |
| hg-reviewers |
This gather code duplicated in multiple place and will make it easier to modify
it safely in the future.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/streamclone.py (34 lines) |
| store, | store, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from .utils import ( | from .utils import ( | ||||
| stringutil, | stringutil, | ||||
| ) | ) | ||||
| def new_stream_clone_requirements( | |||||
| supported_formats, default_requirements, streamed_requirements | |||||
| ): | |||||
| """determine the final set of requirement for a new stream clone | |||||
| this method combine the "default" requirements that a new repository would | |||||
| use with the constaint we get from the stream clone content. We keep local | |||||
| configuration choice when possible. | |||||
| """ | |||||
| requirements = set(default_requirements) | |||||
| requirements -= supported_formats | |||||
| requirements.update(streamed_requirements) | |||||
| return requirements | |||||
| def canperformstreamclone(pullop, bundle2=False): | def canperformstreamclone(pullop, bundle2=False): | ||||
| """Whether it is possible to perform a streaming clone as part of pull. | """Whether it is possible to perform a streaming clone as part of pull. | ||||
| ``bundle2`` will cause the function to consider stream clone through | ``bundle2`` will cause the function to consider stream clone through | ||||
| bundle2 and only through bundle2. | bundle2 and only through bundle2. | ||||
| Returns a tuple of (supported, requirements). ``supported`` is True if | Returns a tuple of (supported, requirements). ``supported`` is True if | ||||
| streaming clone is supported and False otherwise. ``requirements`` is | streaming clone is supported and False otherwise. ``requirements`` is | ||||
| filecount, bytecount = map(int, l.split(b' ', 1)) | filecount, bytecount = map(int, l.split(b' ', 1)) | ||||
| except (ValueError, TypeError): | except (ValueError, TypeError): | ||||
| raise error.ResponseError( | raise error.ResponseError( | ||||
| _(b'unexpected response from remote server:'), l | _(b'unexpected response from remote server:'), l | ||||
| ) | ) | ||||
| with repo.lock(): | with repo.lock(): | ||||
| consumev1(repo, fp, filecount, bytecount) | consumev1(repo, fp, filecount, bytecount) | ||||
| repo.requirements = new_stream_clone_requirements( | |||||
| # new requirements = old non-format requirements + | repo.supportedformats, | ||||
| # new format-related remote requirements | repo.requirements, | ||||
| # requirements from the streamed-in repository | requirements, | ||||
| repo.requirements = requirements | ( | |||||
| repo.requirements - repo.supportedformats | |||||
| ) | ) | ||||
| repo.svfs.options = localrepo.resolvestorevfsoptions( | repo.svfs.options = localrepo.resolvestorevfsoptions( | ||||
| repo.ui, repo.requirements, repo.features | repo.ui, repo.requirements, repo.features | ||||
| ) | ) | ||||
| scmutil.writereporequirements(repo) | scmutil.writereporequirements(repo) | ||||
| if rbranchmap: | if rbranchmap: | ||||
| repo._branchcaches.replace(repo, rbranchmap) | repo._branchcaches.replace(repo, rbranchmap) | ||||
| if missingreqs: | if missingreqs: | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b'unable to apply stream clone: unsupported format: %s') | _(b'unable to apply stream clone: unsupported format: %s') | ||||
| % b', '.join(sorted(missingreqs)) | % b', '.join(sorted(missingreqs)) | ||||
| ) | ) | ||||
| consumev2(repo, fp, filecount, filesize) | consumev2(repo, fp, filecount, filesize) | ||||
| # new requirements = old non-format requirements + | repo.requirements = new_stream_clone_requirements( | ||||
| # new format-related remote requirements | repo.supportedformats, | ||||
| # requirements from the streamed-in repository | repo.requirements, | ||||
| repo.requirements = set(requirements) | ( | requirements, | ||||
| repo.requirements - repo.supportedformats | |||||
| ) | ) | ||||
| repo.svfs.options = localrepo.resolvestorevfsoptions( | repo.svfs.options = localrepo.resolvestorevfsoptions( | ||||
| repo.ui, repo.requirements, repo.features | repo.ui, repo.requirements, repo.features | ||||
| ) | ) | ||||
| scmutil.writereporequirements(repo) | scmutil.writereporequirements(repo) | ||||
| def _copy_files(src_vfs_map, dst_vfs_map, entries, progress): | def _copy_files(src_vfs_map, dst_vfs_map, entries, progress): | ||||