Show More
@@ -57,6 +57,7 b' def narrow_widen(repo, proto, oldinclude' | |||||
57 | ellipses: whether to send ellipses data or not |
|
57 | ellipses: whether to send ellipses data or not | |
58 | """ |
|
58 | """ | |
59 |
|
59 | |||
|
60 | preferuncompressed = False | |||
60 | try: |
|
61 | try: | |
61 | oldincludes = wireprototypes.decodelist(oldincludes) |
|
62 | oldincludes = wireprototypes.decodelist(oldincludes) | |
62 | newincludes = wireprototypes.decodelist(newincludes) |
|
63 | newincludes = wireprototypes.decodelist(newincludes) | |
@@ -92,9 +93,11 b' def narrow_widen(repo, proto, oldinclude' | |||||
92 | if exc.hint is not None: |
|
93 | if exc.hint is not None: | |
93 | advargs.append(('hint', exc.hint)) |
|
94 | advargs.append(('hint', exc.hint)) | |
94 | bundler.addpart(bundle2.bundlepart('error:abort', manargs, advargs)) |
|
95 | bundler.addpart(bundle2.bundlepart('error:abort', manargs, advargs)) | |
|
96 | preferuncompressed = True | |||
95 |
|
97 | |||
96 | chunks = bundler.getchunks() |
|
98 | chunks = bundler.getchunks() | |
97 |
return wireprototypes.streamres(gen=chunks |
|
99 | return wireprototypes.streamres(gen=chunks, | |
|
100 | prefer_uncompressed=preferuncompressed) | |||
98 |
|
101 | |||
99 | def peernarrowwiden(remote, **kwargs): |
|
102 | def peernarrowwiden(remote, **kwargs): | |
100 | for ch in ('oldincludes', 'newincludes', 'oldexcludes', 'newexcludes', |
|
103 | for ch in ('oldincludes', 'newincludes', 'oldexcludes', 'newexcludes', |
General Comments 0
You need to be logged in to leave comments.
Login now