| 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 (11 lines) | |||
| M | mercurial/wireprotov1server.py (2 lines) |
| configuration choice when possible. | configuration choice when possible. | ||||
| """ | """ | ||||
| requirements = set(default_requirements) | requirements = set(default_requirements) | ||||
| requirements -= supported_formats | requirements -= supported_formats | ||||
| requirements.update(streamed_requirements) | requirements.update(streamed_requirements) | ||||
| return requirements | return requirements | ||||
| def streamed_requirements(repo): | |||||
| """the set of requirement the new clone will have to support | |||||
| This is used for advertising the stream options and to generate the actual | |||||
| stream content.""" | |||||
| requiredformats = repo.requirements & repo.supportedformats | |||||
| return requiredformats | |||||
| 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 | ||||
| The remaining content is the output of ``generatev1()`` (which may be | The remaining content is the output of ``generatev1()`` (which may be | ||||
| compressed in the future). | compressed in the future). | ||||
| Returns a tuple of (requirements, data generator). | Returns a tuple of (requirements, data generator). | ||||
| """ | """ | ||||
| if compression != b'UN': | if compression != b'UN': | ||||
| raise ValueError(b'we do not support the compression argument yet') | raise ValueError(b'we do not support the compression argument yet') | ||||
| requirements = repo.requirements & repo.supportedformats | requirements = streamed_requirements(repo) | ||||
| requires = b','.join(sorted(requirements)) | requires = b','.join(sorted(requirements)) | ||||
| def gen(): | def gen(): | ||||
| yield b'HGS1' | yield b'HGS1' | ||||
| yield compression | yield compression | ||||
| filecount, bytecount, it = generatev1(repo) | filecount, bytecount, it = generatev1(repo) | ||||
| repo.ui.status( | repo.ui.status( | ||||
| # Command of same name as capability isn't exposed to version 1 of | # Command of same name as capability isn't exposed to version 1 of | ||||
| # transports. So conditionally add it. | # transports. So conditionally add it. | ||||
| if commands.commandavailable(b'changegroupsubset', proto): | if commands.commandavailable(b'changegroupsubset', proto): | ||||
| caps.append(b'changegroupsubset') | caps.append(b'changegroupsubset') | ||||
| if streamclone.allowservergeneration(repo): | if streamclone.allowservergeneration(repo): | ||||
| if repo.ui.configbool(b'server', b'preferuncompressed'): | if repo.ui.configbool(b'server', b'preferuncompressed'): | ||||
| caps.append(b'stream-preferred') | caps.append(b'stream-preferred') | ||||
| requiredformats = repo.requirements & repo.supportedformats | requiredformats = streamclone.streamed_requirements(repo) | ||||
| # if our local revlogs are just revlogv1, add 'stream' cap | # if our local revlogs are just revlogv1, add 'stream' cap | ||||
| if not requiredformats - {requirementsmod.REVLOGV1_REQUIREMENT}: | if not requiredformats - {requirementsmod.REVLOGV1_REQUIREMENT}: | ||||
| caps.append(b'stream') | caps.append(b'stream') | ||||
| # otherwise, add 'streamreqs' detailing our local revlog format | # otherwise, add 'streamreqs' detailing our local revlog format | ||||
| else: | else: | ||||
| caps.append(b'streamreqs=%s' % b','.join(sorted(requiredformats))) | caps.append(b'streamreqs=%s' % b','.join(sorted(requiredformats))) | ||||
| if repo.ui.configbool(b'experimental', b'bundle2-advertise'): | if repo.ui.configbool(b'experimental', b'bundle2-advertise'): | ||||
| capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo, role=b'server')) | capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo, role=b'server')) | ||||