Show More
@@ -130,8 +130,12 b' def parsebundlespec(repo, spec, strict=T' | |||||
130 | if spec in util.compengines.supportedbundlenames: |
|
130 | if spec in util.compengines.supportedbundlenames: | |
131 | compression = spec |
|
131 | compression = spec | |
132 | version = 'v1' |
|
132 | version = 'v1' | |
|
133 | # Generaldelta repos require v2. | |||
133 | if 'generaldelta' in repo.requirements: |
|
134 | if 'generaldelta' in repo.requirements: | |
134 | version = 'v2' |
|
135 | version = 'v2' | |
|
136 | # Modern compression engines require v2. | |||
|
137 | if compression not in _bundlespecv1compengines: | |||
|
138 | version = 'v2' | |||
135 | elif spec in _bundlespeccgversions: |
|
139 | elif spec in _bundlespeccgversions: | |
136 | if spec == 'packed1': |
|
140 | if spec == 'packed1': | |
137 | compression = 'none' |
|
141 | compression = 'none' |
@@ -187,9 +187,7 b' Explicit request for zstd on non-general' | |||||
187 | $ hg --config format.usegeneraldelta=false init nogd |
|
187 | $ hg --config format.usegeneraldelta=false init nogd | |
188 | $ hg -q -R nogd pull t1 |
|
188 | $ hg -q -R nogd pull t1 | |
189 | $ hg -R nogd bundle -a -t zstd nogd-zstd |
|
189 | $ hg -R nogd bundle -a -t zstd nogd-zstd | |
190 | abort: compression engine zstd is not supported on v1 bundles |
|
190 | 1 changesets found | |
191 | (see 'hg help bundle' for supported values for --type) |
|
|||
192 | [255] |
|
|||
193 |
|
191 | |||
194 | zstd-v1 always fails |
|
192 | zstd-v1 always fails | |
195 |
|
193 |
General Comments 0
You need to be logged in to leave comments.
Login now