Show More
@@ -25,6 +25,7 b' import url as urlmod' | |||||
25 | # Maps bundle version human names to changegroup versions. |
|
25 | # Maps bundle version human names to changegroup versions. | |
26 | _bundlespeccgversions = {'v1': '01', |
|
26 | _bundlespeccgversions = {'v1': '01', | |
27 | 'v2': '02', |
|
27 | 'v2': '02', | |
|
28 | 'packed1': 's1', | |||
28 | 'bundle2': '02', #legacy |
|
29 | 'bundle2': '02', #legacy | |
29 | } |
|
30 | } | |
30 |
|
31 | |||
@@ -87,7 +88,10 b' def parsebundlespec(repo, spec, strict=T' | |||||
87 | if 'generaldelta' in repo.requirements: |
|
88 | if 'generaldelta' in repo.requirements: | |
88 | version = 'v2' |
|
89 | version = 'v2' | |
89 | elif spec in _bundlespeccgversions: |
|
90 | elif spec in _bundlespeccgversions: | |
90 | compression = 'bzip2' |
|
91 | if spec == 'packed1': | |
|
92 | compression = 'none' | |||
|
93 | else: | |||
|
94 | compression = 'bzip2' | |||
91 | version = spec |
|
95 | version = spec | |
92 | else: |
|
96 | else: | |
93 | raise error.UnsupportedBundleSpecification( |
|
97 | raise error.UnsupportedBundleSpecification( | |
@@ -121,6 +125,8 b' def readbundle(ui, fh, fname, vfs=None):' | |||||
121 | return changegroup.cg1unpacker(fh, alg) |
|
125 | return changegroup.cg1unpacker(fh, alg) | |
122 | elif version.startswith('2'): |
|
126 | elif version.startswith('2'): | |
123 | return bundle2.getunbundler(ui, fh, magicstring=magic + version) |
|
127 | return bundle2.getunbundler(ui, fh, magicstring=magic + version) | |
|
128 | elif version == 'S1': | |||
|
129 | return streamclone.streamcloneapplier(fh) | |||
124 | else: |
|
130 | else: | |
125 | raise error.Abort(_('%s: unknown bundle version %s') % (fname, version)) |
|
131 | raise error.Abort(_('%s: unknown bundle version %s') % (fname, version)) | |
126 |
|
132 |
General Comments 0
You need to be logged in to leave comments.
Login now