This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10612

requirements: no longer drop `generaldelta` requirement with revlogv2
ClosedPublic

Authored by marmoute on May 3 2021, 7:53 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5eb5b866e517: requirements: no longer drop `generaldelta` requirement with revlogv2
Summary

A repository could use a mix of revlogv1 and revlogv2, making the requirements
still necessary. Overall we should move away from the "requirements" file being
used a way to configure the repository and stick to it "what do you need to
access this repository". However this is a wider work for another time.

In addition the logic we just dropped was confusing the hg debugformat
command, breaking the upgrade code and inconsistent (eg: sparse-revlog is also
implied by revlogv2).

Finally, multiple other config option would imply the use of the revlogv2
requirements, without drop the generaldelta one, leading to more
inconsistency.

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.May 3 2021, 7:53 AM
baymax updated this revision to Diff 27527.May 3 2021, 9:44 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27858.May 11 2021, 1:42 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27984.May 17 2021, 7:02 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG5eb5b866e517: requirements: no longer drop `generaldelta` requirement with revlogv2.May 17 2021, 8:57 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5eb5b866e517: requirements: no longer drop `generaldelta` requirement with revlogv2 (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (2 lines)
Mtests/test-revlog-v2.t (1 line)

Diff 28012

mercurial/localrepo.py

requirements.add(requirementsmod.SIDEDATA_REQUIREMENT) requirements.add(requirementsmod.SIDEDATA_REQUIREMENT)
requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) requirements.add(requirementsmod.COPIESSDC_REQUIREMENT)
if ui.configbool(b'experimental', b'treemanifest'): if ui.configbool(b'experimental', b'treemanifest'):
requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT)
revlogv2 = ui.config(b'experimental', b'revlogv2') revlogv2 = ui.config(b'experimental', b'revlogv2')
if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': if revlogv2 == b'enable-unstable-format-and-corrupt-my-data':
requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT) requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT)
# generaldelta is implied by revlogv2.
requirements.discard(requirementsmod.GENERALDELTA_REQUIREMENT)
requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)
# experimental config: format.internal-phase # experimental config: format.internal-phase
if ui.configbool(b'format', b'internal-phase'): if ui.configbool(b'format', b'internal-phase'):
requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT) requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT)
if createopts.get(b'narrowfiles'): if createopts.get(b'narrowfiles'):
requirements.add(requirementsmod.NARROW_REQUIREMENT) requirements.add(requirementsmod.NARROW_REQUIREMENT)

tests/test-revlog-v2.t

> EOF > EOF
$ hg init empty-repo $ hg init empty-repo
$ cd empty-repo $ cd empty-repo
$ cat .hg/requires $ cat .hg/requires
dotencode dotencode
exp-revlogv2.2 exp-revlogv2.2
fncache fncache
generaldelta
persistent-nodemap (rust !) persistent-nodemap (rust !)
revlog-compression-zstd (zstd !) revlog-compression-zstd (zstd !)
sparserevlog sparserevlog
store store
$ hg log $ hg log
Unknown flags to revlog are rejected Unknown flags to revlog are rejected