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

login
register
mail settings
Submitter phabricator
Date Jan. 27, 2022, 1:30 p.m.
Message ID <differential-rev-PHID-DREV-snppapxqym4vzuwa3rzs-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50417/
State New
Headers show

Comments

phabricator - Jan. 27, 2022, 1:30 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION 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.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D12091

AFFECTED FILES
  mercurial/streamclone.py
  tests/test-http-bundle1.t
  tests/test-http.t

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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 @@ 
 
   $ 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-bundle1.t b/tests/test-http-bundle1.t
--- a/tests/test-http-bundle1.t
+++ b/tests/test-http-bundle1.t
@@ -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
diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py
--- a/mercurial/streamclone.py
+++ b/mercurial/streamclone.py
@@ -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')