This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12032

stream-clone: add a explicit set list requirements relevant to stream clone
ClosedPublic

Authored by marmoute on Jan 24 2022, 6:35 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGbaddab229b86: stream-clone: add a explicit set list requirements relevant to stream clone
Summary

This set explicitly lists all the requirements that "stream clone" will
preserve. Any other one will not be preserved.

The role of listing the relevant one was previously filled by
repo.supportedformat, but it seems clearer to use that such global and
explicit set. The repo.supportedformat attribute will be cleaned up in a later
changeset

The true meaning of repo.supportedformat vs repo._basesupported was lost
over time so, the content is currently bad. For example, dirstate-v2 is
currently considered relevant to the stream clone, or internal phase is
missing. We kept the same content in this changeset and we will fix them later.

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

marmoute created this revision.Jan 24 2022, 6:35 AM
Alphare requested changes to this revision.Jan 24 2022, 9:30 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
mercurial/requirements.py
94

In such cases? I'm not sure

This revision now requires changes to proceed.Jan 24 2022, 9:30 AM
marmoute updated this revision to Diff 31737.Jan 24 2022, 9:44 AM
Alphare accepted this revision.Jan 24 2022, 9:45 AM
This revision is now accepted and ready to land.Jan 24 2022, 9:45 AM

Revision Contents
Changeset List

Diff 31908

mercurial/bundlecaches.py

% compression % compression
) )
# The specification for packed1 can optionally declare the data formats # The specification for packed1 can optionally declare the data formats
# required to apply it. If we see this metadata, compare against what the # required to apply it. If we see this metadata, compare against what the
# repo supports and error if the bundle isn't compatible. # repo supports and error if the bundle isn't compatible.
if version == b'packed1' and b'requirements' in params: if version == b'packed1' and b'requirements' in params:
requirements = set(params[b'requirements'].split(b',')) requirements = set(params[b'requirements'].split(b','))
missingreqs = requirements - repo.supportedformats missingreqs = requirements - requirementsmod.STREAM_FIXED_REQUIREMENTS
if missingreqs: if missingreqs:
raise error.UnsupportedBundleSpecification( raise error.UnsupportedBundleSpecification(
_(b'missing support for repository features: %s') _(b'missing support for repository features: %s')
% b', '.join(sorted(missingreqs)) % b', '.join(sorted(missingreqs))
) )
# Compute contentopts based on the version # Compute contentopts based on the version
contentopts = _bundlespeccontentopts.get(version, {}).copy() contentopts = _bundlespeccontentopts.get(version, {}).copy()

mercurial/requirements.py

# working directory. # working directory.
WORKING_DIR_REQUIREMENTS = { WORKING_DIR_REQUIREMENTS = {
SPARSE_REQUIREMENT, SPARSE_REQUIREMENT,
SHARED_REQUIREMENT, SHARED_REQUIREMENT,
RELATIVE_SHARED_REQUIREMENT, RELATIVE_SHARED_REQUIREMENT,
SHARESAFE_REQUIREMENT, SHARESAFE_REQUIREMENT,
DIRSTATE_V2_REQUIREMENT, DIRSTATE_V2_REQUIREMENT,
} }
# List of requirement that impact "stream-clone" (and hardlink clone) and
# cannot be changed in such cases.
AlphareUnsubmitted
Not Done

In such cases? I'm not sure

Alphare: In such cases? I'm not sure
#
# requirements not in this list are safe to be altered during stream-clone.
#
# note: the list is currently inherited from previous code and miss some relevant requirement while containing some irrelevant ones.
STREAM_FIXED_REQUIREMENTS = {
BOOKMARKS_IN_STORE_REQUIREMENT,
CHANGELOGV2_REQUIREMENT,
COPIESSDC_REQUIREMENT,
DIRSTATE_V2_REQUIREMENT,
GENERALDELTA_REQUIREMENT,
NODEMAP_REQUIREMENT,
REVLOGV1_REQUIREMENT,
REVLOGV2_REQUIREMENT,
SHARESAFE_REQUIREMENT,
SPARSEREVLOG_REQUIREMENT,
TREEMANIFEST_REQUIREMENT,
}

mercurial/streamclone.py

store, store,
util, util,
) )
from .utils import ( from .utils import (
stringutil, stringutil,
) )
def new_stream_clone_requirements( def new_stream_clone_requirements(default_requirements, streamed_requirements):
supported_formats, default_requirements, streamed_requirements
):
"""determine the final set of requirement for a new stream clone """determine the final set of requirement for a new stream clone
this method combine the "default" requirements that a new repository would 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 use with the constaint we get from the stream clone content. We keep local
configuration choice when possible. configuration choice when possible.
""" """
requirements = set(default_requirements) requirements = set(default_requirements)
requirements -= supported_formats requirements -= requirementsmod.STREAM_FIXED_REQUIREMENTS
requirements.update(streamed_requirements) requirements.update(streamed_requirements)
return requirements return requirements
def streamed_requirements(repo): def streamed_requirements(repo):
"""the set of requirement the new clone will have to support """the set of requirement the new clone will have to support
This is used for advertising the stream options and to generate the actual This is used for advertising the stream options and to generate the actual
stream content.""" stream content."""
requiredformats = repo.requirements & repo.supportedformats requiredformats = (
repo.requirements & requirementsmod.STREAM_FIXED_REQUIREMENTS
)
return requiredformats 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.
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( repo.requirements = new_stream_clone_requirements(
repo.supportedformats,
repo.requirements, repo.requirements,
requirements, requirements,
) )
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)
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)
repo.requirements = new_stream_clone_requirements( repo.requirements = new_stream_clone_requirements(
repo.supportedformats,
repo.requirements, repo.requirements,
requirements, requirements,
) )
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)