| hg-reviewers |
Most code don't really care how sidedata support is added, but it needs to know
if it is present. To achieve this. we use the repo.features attributes with a
new dedicated features".
Having such centralised information is more robust and will help us to remove the
sidedata requirements in a later changesets.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/bundle2.py (13 lines) | |||
| M | mercurial/exchange.py (5 lines) | |||
| M | mercurial/interfaces/repository.py (2 lines) | |||
| M | mercurial/localrepo.py (3 lines) |
| tags, | tags, | ||||
| url, | url, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from .utils import ( | from .utils import ( | ||||
| stringutil, | stringutil, | ||||
| urlutil, | urlutil, | ||||
| ) | ) | ||||
| from .interfaces import repository | |||||
| urlerr = util.urlerr | urlerr = util.urlerr | ||||
| urlreq = util.urlreq | urlreq = util.urlreq | ||||
| _pack = struct.pack | _pack = struct.pack | ||||
| _unpack = struct.unpack | _unpack = struct.unpack | ||||
| _fstreamparamsize = b'>i' | _fstreamparamsize = b'>i' | ||||
| b'nbchanges', b'%d' % cg.extras[b'clcount'], mandatory=False | b'nbchanges', b'%d' % cg.extras[b'clcount'], mandatory=False | ||||
| ) | ) | ||||
| if opts.get(b'phases') and repo.revs( | if opts.get(b'phases') and repo.revs( | ||||
| b'%ln and secret()', outgoing.ancestorsof | b'%ln and secret()', outgoing.ancestorsof | ||||
| ): | ): | ||||
| part.addparam( | part.addparam( | ||||
| b'targetphase', b'%d' % phases.secret, mandatory=False | b'targetphase', b'%d' % phases.secret, mandatory=False | ||||
| ) | ) | ||||
| if b'exp-sidedata-flag' in repo.requirements: | if repository.REPO_FEATURE_SIDE_DATA in repo.features: | ||||
| part.addparam(b'exp-sidedata', b'1') | part.addparam(b'exp-sidedata', b'1') | ||||
| if opts.get(b'streamv2', False): | if opts.get(b'streamv2', False): | ||||
| addpartbundlestream2(bundler, repo, stream=True) | addpartbundlestream2(bundler, repo, stream=True) | ||||
| if opts.get(b'tagsfnodescache', True): | if opts.get(b'tagsfnodescache', True): | ||||
| addparttagsfnodescache(repo, bundler, outgoing) | addparttagsfnodescache(repo, bundler, outgoing) | ||||
| if opts.get(b'revbranchcache', True): | if opts.get(b'revbranchcache', True): | ||||
| b'narrow_widen', | b'narrow_widen', | ||||
| changelog=False, | changelog=False, | ||||
| ) | ) | ||||
| part = bundler.newpart(b'changegroup', data=cgdata) | part = bundler.newpart(b'changegroup', data=cgdata) | ||||
| part.addparam(b'version', cgversion) | part.addparam(b'version', cgversion) | ||||
| if scmutil.istreemanifest(repo): | if scmutil.istreemanifest(repo): | ||||
| part.addparam(b'treemanifest', b'1') | part.addparam(b'treemanifest', b'1') | ||||
| if b'exp-sidedata-flag' in repo.requirements: | if repository.REPO_FEATURE_SIDE_DATA in repo.features: | ||||
| part.addparam(b'exp-sidedata', b'1') | part.addparam(b'exp-sidedata', b'1') | ||||
| wanted = format_remote_wanted_sidedata(repo) | wanted = format_remote_wanted_sidedata(repo) | ||||
| part.addparam(b'exp-wanted-sidedata', wanted) | part.addparam(b'exp-wanted-sidedata', wanted) | ||||
| return bundler | return bundler | ||||
| util, | util, | ||||
| wireprototypes, | wireprototypes, | ||||
| ) | ) | ||||
| from .utils import ( | from .utils import ( | ||||
| hashutil, | hashutil, | ||||
| stringutil, | stringutil, | ||||
| urlutil, | urlutil, | ||||
| ) | ) | ||||
| from .interfaces import repository | |||||
| urlerr = util.urlerr | urlerr = util.urlerr | ||||
| urlreq = util.urlreq | urlreq = util.urlreq | ||||
| _NARROWACL_SECTION = b'narrowacl' | _NARROWACL_SECTION = b'narrowacl' | ||||
| def readbundle(ui, fh, fname, vfs=None): | def readbundle(ui, fh, fname, vfs=None): | ||||
| bundlecaps=b2caps, | bundlecaps=b2caps, | ||||
| remote_sidedata=remote_sidedata, | remote_sidedata=remote_sidedata, | ||||
| ) | ) | ||||
| cgpart = bundler.newpart(b'changegroup', data=cgstream) | cgpart = bundler.newpart(b'changegroup', data=cgstream) | ||||
| if cgversions: | if cgversions: | ||||
| cgpart.addparam(b'version', version) | cgpart.addparam(b'version', version) | ||||
| if scmutil.istreemanifest(pushop.repo): | if scmutil.istreemanifest(pushop.repo): | ||||
| cgpart.addparam(b'treemanifest', b'1') | cgpart.addparam(b'treemanifest', b'1') | ||||
| if b'exp-sidedata-flag' in pushop.repo.requirements: | if repository.REPO_FEATURE_SIDE_DATA in pushop.repo.features: | ||||
| cgpart.addparam(b'exp-sidedata', b'1') | cgpart.addparam(b'exp-sidedata', b'1') | ||||
| def handlereply(op): | def handlereply(op): | ||||
| """extract addchangegroup returns from server reply""" | """extract addchangegroup returns from server reply""" | ||||
| cgreplies = op.records.getreplies(cgpart.id) | cgreplies = op.records.getreplies(cgpart.id) | ||||
| assert len(cgreplies[b'changegroup']) == 1 | assert len(cgreplies[b'changegroup']) == 1 | ||||
| pushop.cgresult = cgreplies[b'changegroup'][0][b'return'] | pushop.cgresult = cgreplies[b'changegroup'][0][b'return'] | ||||
| if cgversions: | if cgversions: | ||||
| part.addparam(b'version', version) | part.addparam(b'version', version) | ||||
| part.addparam(b'nbchanges', b'%d' % len(outgoing.missing), mandatory=False) | part.addparam(b'nbchanges', b'%d' % len(outgoing.missing), mandatory=False) | ||||
| if scmutil.istreemanifest(repo): | if scmutil.istreemanifest(repo): | ||||
| part.addparam(b'treemanifest', b'1') | part.addparam(b'treemanifest', b'1') | ||||
| if b'exp-sidedata-flag' in repo.requirements: | if repository.REPO_FEATURE_SIDE_DATA in repo.features: | ||||
| part.addparam(b'exp-sidedata', b'1') | part.addparam(b'exp-sidedata', b'1') | ||||
| sidedata = bundle2.format_remote_wanted_sidedata(repo) | sidedata = bundle2.format_remote_wanted_sidedata(repo) | ||||
| part.addparam(b'exp-wanted-sidedata', sidedata) | part.addparam(b'exp-wanted-sidedata', sidedata) | ||||
| if ( | if ( | ||||
| kwargs.get('narrow', False) | kwargs.get('narrow', False) | ||||
| and kwargs.get('narrow_acl', False) | and kwargs.get('narrow_acl', False) | ||||
| and (include or exclude) | and (include or exclude) | ||||
| # Revlogs are being used for file storage. | # Revlogs are being used for file storage. | ||||
| REPO_FEATURE_REVLOG_FILE_STORAGE = b'revlogfilestorage' | REPO_FEATURE_REVLOG_FILE_STORAGE = b'revlogfilestorage' | ||||
| # The storage part of the repository is shared from an external source. | # The storage part of the repository is shared from an external source. | ||||
| REPO_FEATURE_SHARED_STORAGE = b'sharedstore' | REPO_FEATURE_SHARED_STORAGE = b'sharedstore' | ||||
| # LFS supported for backing file storage. | # LFS supported for backing file storage. | ||||
| REPO_FEATURE_LFS = b'lfs' | REPO_FEATURE_LFS = b'lfs' | ||||
| # Repository supports being stream cloned. | # Repository supports being stream cloned. | ||||
| REPO_FEATURE_STREAM_CLONE = b'streamclone' | REPO_FEATURE_STREAM_CLONE = b'streamclone' | ||||
| # Repository supports (at least) some sidedata to be stored | |||||
| REPO_FEATURE_SIDE_DATA = b'side-data' | |||||
| # Files storage may lack data for all ancestors. | # Files storage may lack data for all ancestors. | ||||
| REPO_FEATURE_SHALLOW_FILE_STORAGE = b'shallowfilestorage' | REPO_FEATURE_SHALLOW_FILE_STORAGE = b'shallowfilestorage' | ||||
| REVISION_FLAG_CENSORED = 1 << 15 | REVISION_FLAG_CENSORED = 1 << 15 | ||||
| REVISION_FLAG_ELLIPSIS = 1 << 14 | REVISION_FLAG_ELLIPSIS = 1 << 14 | ||||
| REVISION_FLAG_EXTSTORED = 1 << 13 | REVISION_FLAG_EXTSTORED = 1 << 13 | ||||
| REVISION_FLAG_HASCOPIESINFO = 1 << 12 | REVISION_FLAG_HASCOPIESINFO = 1 << 12 | ||||
| storebasepath, | storebasepath, | ||||
| lambda base: vfsmod.vfs(base, cacheaudited=True), | lambda base: vfsmod.vfs(base, cacheaudited=True), | ||||
| ) | ) | ||||
| hgvfs.createmode = store.createmode | hgvfs.createmode = store.createmode | ||||
| storevfs = store.vfs | storevfs = store.vfs | ||||
| storevfs.options = resolvestorevfsoptions(ui, requirements, features) | storevfs.options = resolvestorevfsoptions(ui, requirements, features) | ||||
| if requirementsmod.REVLOGV2_REQUIREMENT in requirements: | |||||
| features.add(repository.REPO_FEATURE_SIDE_DATA) | |||||
| # The cache vfs is used to manage cache files. | # The cache vfs is used to manage cache files. | ||||
| cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) | cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) | ||||
| cachevfs.createmode = store.createmode | cachevfs.createmode = store.createmode | ||||
| # The cache vfs is used to manage cache files related to the working copy | # The cache vfs is used to manage cache files related to the working copy | ||||
| wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True) | wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True) | ||||
| wcachevfs.createmode = store.createmode | wcachevfs.createmode = store.createmode | ||||
| # Now resolve the type for the repository object. We do this by repeatedly | # Now resolve the type for the repository object. We do this by repeatedly | ||||