# HG changeset patch # User Pierre-Yves David # Date 2022-01-24 10:49:06 # Node ID d9017df7013524bac86f79643166b0543af6d618 # Parent dfbfa802876b0abea581ede425607c3c7353d08f 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. This is especially relevant as we about to phase out the `supportedformat` class attribute. (a backport of this change to stable should be sent soon). Differential Revision: https://phab.mercurial-scm.org/D12031 diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py --- a/mercurial/streamclone.py +++ b/mercurial/streamclone.py @@ -128,7 +128,7 @@ def canperformstreamclone(pullop, bundle 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( _( @@ -503,7 +503,7 @@ def applybundlev1(repo, fp): ) 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') diff --git a/tests/test-http-bundle1.t b/tests/test-http-bundle1.t --- a/tests/test-http-bundle1.t +++ b/tests/test-http-bundle1.t @@ -70,8 +70,10 @@ try to clone via stream but missing requ $ 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 diff --git a/tests/test-http.t b/tests/test-http.t --- a/tests/test-http.t +++ b/tests/test-http.t @@ -59,8 +59,10 @@ try to clone via stream but missing requ $ 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