This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12542

narrow: support debugupgraderepo
AcceptedPublic

Authored by aalekseyev on Tue, Apr 12, 2:49 PM.

Details

Reviewers
durin42
Alphare
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

aalekseyev created this revision.Tue, Apr 12, 2:49 PM
Alphare added subscribers: marmoute, Alphare.Wed, Apr 13, 4:46 AM
Alphare added inline comments.
mercurial/upgrade_utils/actions.py
43

Sounds like the end of that comment is mean for internal use and not upstream? The first part of the comment tells me that this is probably an incomplete solution. Maybe @marmoute has a better idea of what that implies than I do.

aalekseyev updated this revision to Diff 33147.Wed, Apr 13, 5:59 AM
aalekseyev added inline comments.Wed, Apr 13, 6:02 AM
mercurial/upgrade_utils/actions.py
43

Good point.
Pierre-Yves earlier dismissed some of the concern expressed in this comment, and other than that the comment does not seem very useful.
I deleted the whole comment.

Alphare accepted this revision.Thu, Apr 14, 4:36 AM
This revision is now accepted and ready to land.Thu, Apr 14, 4:36 AM

Revision Contents
Changeset List

Diff 33147

mercurial/upgrade_utils/actions.py

# list of requirements that request a clone of all revlog if added/removed # list of requirements that request a clone of all revlog if added/removed
RECLONES_REQUIREMENTS = { RECLONES_REQUIREMENTS = {
requirements.GENERALDELTA_REQUIREMENT, requirements.GENERALDELTA_REQUIREMENT,
requirements.SPARSEREVLOG_REQUIREMENT, requirements.SPARSEREVLOG_REQUIREMENT,
requirements.REVLOGV2_REQUIREMENT, requirements.REVLOGV2_REQUIREMENT,
requirements.CHANGELOGV2_REQUIREMENT, requirements.CHANGELOGV2_REQUIREMENT,
} }
def preservedrequirements(repo): def preservedrequirements(repo):
preserved = { preserved = {
requirements.SHARED_REQUIREMENT, requirements.SHARED_REQUIREMENT,
requirements.NARROW_REQUIREMENT,
} }
return preserved & repo.requirements return preserved & repo.requirements
AlphareUnsubmitted
Not Done

Sounds like the end of that comment is mean for internal use and not upstream? The first part of the comment tells me that this is probably an incomplete solution. Maybe @marmoute has a better idea of what that implies than I do.

Alphare: Sounds like the end of that comment is mean for internal use and not upstream? The first part…
aalekseyevAuthorUnsubmitted
Done

Good point.
Pierre-Yves earlier dismissed some of the concern expressed in this comment, and other than that the comment does not seem very useful.
I deleted the whole comment.

aalekseyev: Good point. Pierre-Yves earlier dismissed some of the concern expressed in this comment, and…
FORMAT_VARIANT = b'deficiency' FORMAT_VARIANT = b'deficiency'
OPTIMISATION = b'optimization' OPTIMISATION = b'optimization'
class improvement: class improvement:
"""Represents an improvement that can be made as part of an upgrade.""" """Represents an improvement that can be made as part of an upgrade."""
### The following attributes should be defined for each subclass: ### The following attributes should be defined for each subclass:
if engine.name() == b'zstd': if engine.name() == b'zstd':
supported.add(b'revlog-compression-zstd') supported.add(b'revlog-compression-zstd')
return supported return supported
def supporteddestrequirements(repo): def supporteddestrequirements(repo):
"""Obtain requirements that upgrade supports in the destination. """Obtain requirements that upgrade supports in the destination.
If the result of the upgrade would create requirements not in this set, If the result of the upgrade would have requirements not in this set,
the upgrade is disallowed. the upgrade is disallowed.
Extensions should monkeypatch this to add their custom requirements. Extensions should monkeypatch this to add their custom requirements.
""" """
supported = { supported = {
requirements.CHANGELOGV2_REQUIREMENT, requirements.CHANGELOGV2_REQUIREMENT,
requirements.COPIESSDC_REQUIREMENT, requirements.COPIESSDC_REQUIREMENT,
requirements.DIRSTATE_TRACKED_HINT_V1, requirements.DIRSTATE_TRACKED_HINT_V1,
requirements.DIRSTATE_V2_REQUIREMENT, requirements.DIRSTATE_V2_REQUIREMENT,
requirements.DOTENCODE_REQUIREMENT, requirements.DOTENCODE_REQUIREMENT,
requirements.FNCACHE_REQUIREMENT, requirements.FNCACHE_REQUIREMENT,
requirements.GENERALDELTA_REQUIREMENT, requirements.GENERALDELTA_REQUIREMENT,
requirements.NODEMAP_REQUIREMENT, requirements.NODEMAP_REQUIREMENT,
requirements.REVLOGV1_REQUIREMENT, # allowed in case of downgrade requirements.REVLOGV1_REQUIREMENT, # allowed in case of downgrade
requirements.REVLOGV2_REQUIREMENT, requirements.REVLOGV2_REQUIREMENT,
requirements.SHARED_REQUIREMENT, requirements.SHARED_REQUIREMENT,
requirements.SHARESAFE_REQUIREMENT, requirements.SHARESAFE_REQUIREMENT,
requirements.SPARSEREVLOG_REQUIREMENT, requirements.SPARSEREVLOG_REQUIREMENT,
requirements.STORE_REQUIREMENT, requirements.STORE_REQUIREMENT,
requirements.NARROW_REQUIREMENT,
} }
for name in compression.compengines: for name in compression.compengines:
engine = compression.compengines[name] engine = compression.compengines[name]
if engine.available() and engine.revlogheader(): if engine.available() and engine.revlogheader():
supported.add(b'exp-compression-%s' % name) supported.add(b'exp-compression-%s' % name)
if engine.name() == b'zstd': if engine.name() == b'zstd':
supported.add(b'revlog-compression-zstd') supported.add(b'revlog-compression-zstd')
return supported return supported

tests/test-narrow.t

adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 0 files added 1 changesets with 0 changes to 0 files
new changesets * (glob) new changesets * (glob)
updating to branch default updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
The "narrow" repo requirement is ignored by [debugupgraderepo]
#if tree
$ (cd should-work; hg debugupgraderepo)
abort: cannot upgrade repository; unsupported source requirement: treemanifest
[255]
#else
$ (cd should-work; hg debugupgraderepo | grep 'no format upgrades found in existing repository')
(no format upgrades found in existing repository)
#endif
Test repo with local changes Test repo with local changes
$ hg clone --narrow ssh://user@dummy/master narrow-local-changes --include d0 --include d3 --include d6 $ hg clone --narrow ssh://user@dummy/master narrow-local-changes --include d0 --include d3 --include d6
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 6 changesets with 3 changes to 3 files added 6 changesets with 3 changes to 3 files
new changesets *:* (glob) new changesets *:* (glob)