Show More
@@ -51,15 +51,11 b' def getbundlechangegrouppart_narrow(bund' | |||||
51 | assert repo.ui.configbool('experimental', 'narrowservebrokenellipses') |
|
51 | assert repo.ui.configbool('experimental', 'narrowservebrokenellipses') | |
52 |
|
52 | |||
53 | cgversions = b2caps.get('changegroup') |
|
53 | cgversions = b2caps.get('changegroup') | |
54 | if cgversions: # 3.1 and 3.2 ship with an empty value |
|
54 | cgversions = [v for v in cgversions | |
55 | cgversions = [v for v in cgversions |
|
55 | if v in changegroup.supportedoutgoingversions(repo)] | |
56 | if v in changegroup.supportedoutgoingversions(repo)] |
|
56 | if not cgversions: | |
57 | if not cgversions: |
|
57 | raise ValueError(_('no common changegroup version')) | |
58 | raise ValueError(_('no common changegroup version')) |
|
58 | version = max(cgversions) | |
59 | version = max(cgversions) |
|
|||
60 | else: |
|
|||
61 | raise ValueError(_("server does not advertise changegroup version," |
|
|||
62 | " can't negotiate support for ellipsis nodes")) |
|
|||
63 |
|
59 | |||
64 | include = sorted(filter(bool, kwargs.get(r'includepats', []))) |
|
60 | include = sorted(filter(bool, kwargs.get(r'includepats', []))) | |
65 | exclude = sorted(filter(bool, kwargs.get(r'excludepats', []))) |
|
61 | exclude = sorted(filter(bool, kwargs.get(r'excludepats', []))) |
General Comments 0
You need to be logged in to leave comments.
Login now