diff -r d9017df70135 -r baddab229b86 mercurial/streamclone.py --- a/mercurial/streamclone.py Mon Jan 24 11:49:06 2022 +0100 +++ b/mercurial/streamclone.py Mon Jan 17 19:26:36 2022 +0100 @@ -32,9 +32,7 @@ ) -def new_stream_clone_requirements( - supported_formats, default_requirements, streamed_requirements -): +def new_stream_clone_requirements(default_requirements, streamed_requirements): """determine the final set of requirement for a new stream clone this method combine the "default" requirements that a new repository would @@ -42,7 +40,7 @@ configuration choice when possible. """ requirements = set(default_requirements) - requirements -= supported_formats + requirements -= requirementsmod.STREAM_FIXED_REQUIREMENTS requirements.update(streamed_requirements) return requirements @@ -52,7 +50,9 @@ This is used for advertising the stream options and to generate the actual stream content.""" - requiredformats = repo.requirements & repo.supportedformats + requiredformats = ( + repo.requirements & requirementsmod.STREAM_FIXED_REQUIREMENTS + ) return requiredformats @@ -209,7 +209,6 @@ with repo.lock(): consumev1(repo, fp, filecount, bytecount) repo.requirements = new_stream_clone_requirements( - repo.supportedformats, repo.requirements, requirements, ) @@ -820,7 +819,6 @@ consumev2(repo, fp, filecount, filesize) repo.requirements = new_stream_clone_requirements( - repo.supportedformats, repo.requirements, requirements, )