Show More
@@ -56,7 +56,12 b' class bundlespec:' | |||||
56 | b'tagsfnodescache': True, |
|
56 | b'tagsfnodescache': True, | |
57 | b'revbranchcache': True, |
|
57 | b'revbranchcache': True, | |
58 | }, |
|
58 | }, | |
59 |
b'packed1': { |
|
59 | b'packed1': { | |
|
60 | b'cg.version': b's1', | |||
|
61 | }, | |||
|
62 | b'bundle2': { # legacy | |||
|
63 | b'cg.version': b'02', | |||
|
64 | }, | |||
60 | } |
|
65 | } | |
61 | _bundlespeccontentopts[b'bundle2'] = _bundlespeccontentopts[b'v2'] |
|
66 | _bundlespeccontentopts[b'bundle2'] = _bundlespeccontentopts[b'v2'] | |
62 |
|
67 | |||
@@ -150,7 +155,7 b' def parsebundlespec(repo, spec, strict=T' | |||||
150 |
|
155 | |||
151 | version, params = parseparams(version) |
|
156 | version, params = parseparams(version) | |
152 |
|
157 | |||
153 |
if version not in _bundlespecc |
|
158 | if version not in _bundlespeccontentopts: | |
154 | raise error.UnsupportedBundleSpecification( |
|
159 | raise error.UnsupportedBundleSpecification( | |
155 | _(b'%s is not a recognized bundle version') % version |
|
160 | _(b'%s is not a recognized bundle version') % version | |
156 | ) |
|
161 | ) | |
@@ -172,7 +177,7 b' def parsebundlespec(repo, spec, strict=T' | |||||
172 | # Modern compression engines require v2. |
|
177 | # Modern compression engines require v2. | |
173 | if compression not in _bundlespecv1compengines: |
|
178 | if compression not in _bundlespecv1compengines: | |
174 | version = b'v2' |
|
179 | version = b'v2' | |
175 |
elif spec in _bundlespecc |
|
180 | elif spec in _bundlespeccontentopts: | |
176 | if spec == b'packed1': |
|
181 | if spec == b'packed1': | |
177 | compression = b'none' |
|
182 | compression = b'none' | |
178 | else: |
|
183 | else: | |
@@ -212,7 +217,7 b' def parsebundlespec(repo, spec, strict=T' | |||||
212 |
|
217 | |||
213 | engine = util.compengines.forbundlename(compression) |
|
218 | engine = util.compengines.forbundlename(compression) | |
214 | compression, wirecompression = engine.bundletype() |
|
219 | compression, wirecompression = engine.bundletype() | |
215 |
wireversion = _bundlespecc |
|
220 | wireversion = _bundlespeccontentopts[version][b'cg.version'] | |
216 |
|
221 | |||
217 | return bundlespec( |
|
222 | return bundlespec( | |
218 | compression, wirecompression, version, wireversion, params, contentopts |
|
223 | compression, wirecompression, version, wireversion, params, contentopts |
General Comments 0
You need to be logged in to leave comments.
Login now