This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12091

stream-clone: filter possible missing requirements using all supported one
ClosedPublic

Authored by marmoute on Jan 27 2022, 8:29 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6d2ddea0721a: stream-clone: filter possible missing requirements using all supported one
Summary

The supportedformat requirements is missing some important requirements and it
seems better to filter out with all requirements we know, not just an
"arbitrary" subset.

The supportedformat set is lacking some important requirements (for example
revlog-compression-zstd). This is getting fixed on default (for Mercurial 6.1)

However, fixing that in 6.1 means the stream requirements sent over the wire
will contains more items. And if we don't apply this fix on older version, they
might end up complaining about lacking support for feature they actually support
for years.

This patch does not fix the deeper problem (advertised stream requirement
lacking some of them), but focus on the trivial part : Lets use the full set of
supported requirement for looking for unsupported ones.

This patch should be simple to backport to older version of Mercurial and
packager should be encouraged to do so.

This is a graft of d9017df70135 from default.

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 27 2022, 8:29 AM
Alphare requested changes to this revision.Jan 31 2022, 3:31 AM
Alphare added a subscriber: Alphare.

Needs a reference to the default patch. Otherwise it looks good.

This revision now requires changes to proceed.Jan 31 2022, 3:31 AM
baymax edited the summary of this revision. (Show Details)Feb 1 2022, 12:55 PM
baymax updated this revision to Diff 32026.

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

Alphare accepted this revision.Feb 2 2022, 4:46 AM
This revision is now accepted and ready to land.Feb 2 2022, 4:46 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/streamclone.py (4 lines)
Mtests/test-http-bundle1.t (6 lines)
Mtests/test-http.t (6 lines)

Diff 32027

mercurial/streamclone.py

b'warning: stream clone requested but server has them ' b'warning: stream clone requested but server has them '
b'disabled\n' b'disabled\n'
) )
) )
return False, None return False, None
streamreqs = set(streamreqs.split(b',')) streamreqs = set(streamreqs.split(b','))
# Server requires something we don't support. Bail. # Server requires something we don't support. Bail.
missingreqs = streamreqs - repo.supportedformats missingreqs = streamreqs - repo.supported
if missingreqs: if missingreqs:
pullop.repo.ui.warn( pullop.repo.ui.warn(
_( _(
b'warning: stream clone requested but client is missing ' b'warning: stream clone requested but client is missing '
b'requirements: %s\n' b'requirements: %s\n'
) )
% b', '.join(sorted(missingreqs)) % b', '.join(sorted(missingreqs))
) )
is at the 2 byte compression identifier. is at the 2 byte compression identifier.
""" """
if len(repo): if len(repo):
raise error.Abort( raise error.Abort(
_(b'cannot apply stream clone bundle on non-empty repo') _(b'cannot apply stream clone bundle on non-empty repo')
) )
filecount, bytecount, requirements = readbundle1header(fp) filecount, bytecount, requirements = readbundle1header(fp)
missingreqs = requirements - repo.supportedformats missingreqs = requirements - repo.supported
if missingreqs: if missingreqs:
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))
) )
consumev1(repo, fp, filecount, bytecount) consumev1(repo, fp, filecount, bytecount)

tests/test-http-bundle1.t

new changesets 8b6053c928fe new changesets 8b6053c928fe
updating to branch default updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
try to clone via stream but missing requirements, so should use pull instead try to clone via stream but missing requirements, so should use pull instead
$ cat > $TESTTMP/removesupportedformat.py << EOF $ cat > $TESTTMP/removesupportedformat.py << EOF
> from mercurial import localrepo > from mercurial import localrepo
> def extsetup(ui): > def reposetup(ui, repo):
> localrepo.localrepository.supportedformats.remove(b'generaldelta') > local = repo.local()
> if local is not None:
> local.supported.remove(b'generaldelta')
> EOF > EOF
$ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3 $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3
warning: stream clone requested but client is missing requirements: generaldelta warning: stream clone requested but client is missing requirements: generaldelta
(see https://www.mercurial-scm.org/wiki/MissingRequirement for more information) (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information)
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests

tests/test-http.t

new changesets 8b6053c928fe new changesets 8b6053c928fe
updating to branch default updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
try to clone via stream but missing requirements, so should use pull instead try to clone via stream but missing requirements, so should use pull instead
$ cat > $TESTTMP/removesupportedformat.py << EOF $ cat > $TESTTMP/removesupportedformat.py << EOF
> from mercurial import localrepo > from mercurial import localrepo
> def extsetup(ui): > def reposetup(ui, repo):
> localrepo.localrepository.supportedformats.remove(b'generaldelta') > local = repo.local()
> if local is not None:
> local.supported.remove(b'generaldelta')
> EOF > EOF
$ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3 $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3
warning: stream clone requested but client is missing requirements: generaldelta warning: stream clone requested but client is missing requirements: generaldelta
(see https://www.mercurial-scm.org/wiki/MissingRequirement for more information) (see https://www.mercurial-scm.org/wiki/MissingRequirement for more information)
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests