mercurial-scm/hg: mercurial/bundlecaches.py comparison

stream-clone: make sure the `stream` capability is set when bundling This is important to start narrowing protocol option in the next changesets.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Sun, 21 May 2023 01:03:19 +0200
parents	d68462736492
children	f4a540c203d7

comparison

equal deleted inserted replaced

-:cd2a2963b982
+:f2bcb56a1d39
 _(b'missing support for repository features: %s')
 % b', '.join(sorted(missingreqs))
 )
 # Compute contentopts based on the version
-if b"stream" in params and params[b"stream"] == b"v2":
+if b"stream" in params:
-# That case is fishy as this mostly derails the version selection
+# This case is fishy as this mostly derails the version selection
 # mechanism. `stream` bundles are quite specific and used differently
 # as "normal" bundles.
 #
-# So we are pinning this to "v2", as this will likely be
-# compatible forever. (see the next conditional).
-#
 # (we should probably define a cleaner way to do this and raise a
-# warning when the old way is encounter)
+# warning when the old way is encountered)
-version = b"streamv2"
+if params[b"stream"] == b"v2":
+version = b"streamv2"
 contentopts = _bundlespeccontentopts.get(version, {}).copy()
 if version == b"streamv2":
 # streamv2 have been reported as "v2" for a while.
 version = b"v2"

Mercurial > public > mercurial-scm > hg