Show More
@@ -57,11 +57,18 b' def getbundlechangegrouppart_narrow(bund' | |||||
57 | raise ValueError(_('no common changegroup version')) |
|
57 | raise ValueError(_('no common changegroup version')) | |
58 | version = max(cgversions) |
|
58 | version = max(cgversions) | |
59 |
|
59 | |||
60 | include = sorted(filter(bool, kwargs.get(r'includepats', []))) |
|
60 | oldinclude = sorted(filter(bool, kwargs.get(r'oldincludepats', []))) | |
61 | exclude = sorted(filter(bool, kwargs.get(r'excludepats', []))) |
|
61 | oldexclude = sorted(filter(bool, kwargs.get(r'oldexcludepats', []))) | |
62 | newmatch = narrowspec.match(repo.root, include=include, exclude=exclude) |
|
62 | newinclude = sorted(filter(bool, kwargs.get(r'includepats', []))) | |
|
63 | newexclude = sorted(filter(bool, kwargs.get(r'excludepats', []))) | |||
|
64 | generateellipsesbundle2(bundler, repo, oldinclude, oldexclude, newinclude, | |||
|
65 | newexclude, version, common, kwargs.get('known', []), | |||
|
66 | kwargs.get(r'depth', None), heads) | |||
63 |
|
67 | |||
64 | depth = kwargs.get(r'depth', None) |
|
68 | def generateellipsesbundle2(bundler, repo, oldinclude, oldexclude, newinclude, | |
|
69 | newexclude, version, common, known, depth, heads): | |||
|
70 | newmatch = narrowspec.match(repo.root, include=newinclude, | |||
|
71 | exclude=newexclude) | |||
65 | if depth is not None: |
|
72 | if depth is not None: | |
66 | depth = int(depth) |
|
73 | depth = int(depth) | |
67 | if depth < 1: |
|
74 | if depth < 1: | |
@@ -69,10 +76,8 b' def getbundlechangegrouppart_narrow(bund' | |||||
69 |
|
76 | |||
70 | heads = set(heads or repo.heads()) |
|
77 | heads = set(heads or repo.heads()) | |
71 | common = set(common or [nullid]) |
|
78 | common = set(common or [nullid]) | |
72 | oldinclude = sorted(filter(bool, kwargs.get(r'oldincludepats', []))) |
|
79 | known = {bin(n) for n in known} | |
73 | oldexclude = sorted(filter(bool, kwargs.get(r'oldexcludepats', []))) |
|
80 | if known and (oldinclude != newinclude or oldexclude != newexclude): | |
74 | known = {bin(n) for n in kwargs.get(r'known', [])} |
|
|||
75 | if known and (oldinclude != include or oldexclude != exclude): |
|
|||
76 | # Steps: |
|
81 | # Steps: | |
77 | # 1. Send kill for "$known & ::common" |
|
82 | # 1. Send kill for "$known & ::common" | |
78 | # |
|
83 | # |
General Comments 0
You need to be logged in to leave comments.
Login now