This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10342

changegroup: don't limit cgv4 to revlogv2 repos
ClosedPublic

Authored by Alphare on Apr 9 2021, 4:49 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG08e26ef4ad35: changegroup: don't limit cgv4 to revlogv2 repos
Summary

To help the transition from revlogv1 to revlogv2, we need to be able to enable
cgv4 for revlogv1 repos, so that revlogv2 clients can handle adding/removing
sidedata over the wire.

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

Alphare created this revision.Apr 9 2021, 4:49 AM
marmoute added a subscriber: marmoute.Apr 9 2021, 6:02 AM
marmoute added inline comments.
mercurial/changegroup.py
1696

Why is the config relevant here ?

(and if it is, this is not the right way to do it, since side-data can be implicitly enable by other options)

Alphare updated this revision to Diff 26777.Apr 10 2021, 3:14 PM
Alphare marked an inline comment as done.Apr 10 2021, 3:19 PM
Alphare updated this revision to Diff 27031.Apr 19 2021, 6:09 AM
Alphare updated this revision to Diff 27098.Apr 20 2021, 9:38 AM
marmoute added a comment.Apr 22 2021, 1:41 PM

So, the config will be, later, used to by the exchange code to forcily activate CG04 in situation that requires it ?

marmoute accepted this revision.Apr 22 2021, 1:56 PM
baymax updated this revision to Diff 27299.May 3 2021, 6:06 AM

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

baymax updated this revision to Diff 27449.May 3 2021, 9:01 PM

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

Alphare added a commit: rHG08e26ef4ad35: changegroup: don't limit cgv4 to revlogv2 repos.May 5 2021, 6:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG08e26ef4ad35: changegroup: don't limit cgv4 to revlogv2 repos (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (9 lines)
Mmercurial/configitems.py (5 lines)

Diff 27602

mercurial/changegroup.py

# we keep version 03 because we need to to exchange treemanifest data # we keep version 03 because we need to to exchange treemanifest data
# #
# we also keep vresion 01 and 02, because it is possible for repo to # we also keep vresion 01 and 02, because it is possible for repo to
# contains both normal and tree manifest at the same time. so using # contains both normal and tree manifest at the same time. so using
# older version to pull data is viable # older version to pull data is viable
# #
# (or even to push subset of history) # (or even to push subset of history)
needv03 = True needv03 = True
has_revlogv2 = requirements.REVLOGV2_REQUIREMENT in repo.requirements
if not has_revlogv2:
versions.discard(b'04')
if not needv03: if not needv03:
versions.discard(b'03') versions.discard(b'03')
want_v4 = (
repo.ui.configbool(b'experimental', b'changegroup4')
or requirements.REVLOGV2_REQUIREMENT in repo.requirements
marmouteUnsubmitted
Done

Why is the config relevant here ?

(and if it is, this is not the right way to do it, since side-data can be implicitly enable by other options)

marmoute: Why is the config relevant here ? (and if it is, this is not the right way to do it, since…
)
if not want_v4:
versions.discard(b'04')
return versions return versions
# Changegroup versions that can be applied to the repo # Changegroup versions that can be applied to the repo
def supportedincomingversions(repo): def supportedincomingversions(repo):
return allsupportedversions(repo) return allsupportedversions(repo)

mercurial/configitems.py

) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'changegroup3', b'changegroup3',
default=False, default=False,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'changegroup4',
default=False,
)
coreconfigitem(
b'experimental',
b'cleanup-as-archived', b'cleanup-as-archived',
default=False, default=False,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'clientcompressionengines', b'clientcompressionengines',
default=list, default=list,
) )