Mercurial > hg-stable
changeset 48359:6d2ddea0721a stable
stream-clone: filter possible missing requirements using all supported one
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.
Differential Revision: https://phab.mercurial-scm.org/D12091
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 24 Jan 2022 11:49:06 +0100 |
| parents | 2b271cab2d1c |
| children | f7086f6173f8 |
| files | mercurial/streamclone.py tests/test-http-bundle1.t tests/test-http.t |
| diffstat | 3 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/streamclone.py Tue Jan 18 10:32:11 2022 +0100 +++ b/mercurial/streamclone.py Mon Jan 24 11:49:06 2022 +0100 @@ -104,7 +104,7 @@ streamreqs = set(streamreqs.split(b',')) # Server requires something we don't support. Bail. - missingreqs = streamreqs - repo.supportedformats + missingreqs = streamreqs - repo.supported if missingreqs: pullop.repo.ui.warn( _( @@ -481,7 +481,7 @@ ) filecount, bytecount, requirements = readbundle1header(fp) - missingreqs = requirements - repo.supportedformats + missingreqs = requirements - repo.supported if missingreqs: raise error.Abort( _(b'unable to apply stream clone: unsupported format: %s')
--- a/tests/test-http-bundle1.t Tue Jan 18 10:32:11 2022 +0100 +++ b/tests/test-http-bundle1.t Mon Jan 24 11:49:06 2022 +0100 @@ -70,8 +70,10 @@ $ cat > $TESTTMP/removesupportedformat.py << EOF > from mercurial import localrepo - > def extsetup(ui): - > localrepo.localrepository.supportedformats.remove(b'generaldelta') + > def reposetup(ui, repo): + > local = repo.local() + > if local is not None: + > local.supported.remove(b'generaldelta') > EOF $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3
--- a/tests/test-http.t Tue Jan 18 10:32:11 2022 +0100 +++ b/tests/test-http.t Mon Jan 24 11:49:06 2022 +0100 @@ -59,8 +59,10 @@ $ cat > $TESTTMP/removesupportedformat.py << EOF > from mercurial import localrepo - > def extsetup(ui): - > localrepo.localrepository.supportedformats.remove(b'generaldelta') + > def reposetup(ui, repo): + > local = repo.local() + > if local is not None: + > local.supported.remove(b'generaldelta') > EOF $ hg clone --config extensions.rsf=$TESTTMP/removesupportedformat.py --stream http://localhost:$HGPORT/ copy3