Show More
@@ -61,8 +61,9 def getbundlechangegrouppart_narrow(bund | |||||
61 | oldexclude = sorted(filter(bool, kwargs.get(r'oldexcludepats', []))) |
|
61 | oldexclude = sorted(filter(bool, kwargs.get(r'oldexcludepats', []))) | |
62 | newinclude = sorted(filter(bool, kwargs.get(r'includepats', []))) |
|
62 | newinclude = sorted(filter(bool, kwargs.get(r'includepats', []))) | |
63 | newexclude = sorted(filter(bool, kwargs.get(r'excludepats', []))) |
|
63 | newexclude = sorted(filter(bool, kwargs.get(r'excludepats', []))) | |
|
64 | known = {bin(n) for n in kwargs.get('known', [])} | |||
64 | generateellipsesbundle2(bundler, repo, oldinclude, oldexclude, newinclude, |
|
65 | generateellipsesbundle2(bundler, repo, oldinclude, oldexclude, newinclude, | |
65 |
newexclude, version, common, |
|
66 | newexclude, version, common, known, | |
66 | kwargs.get(r'depth', None), heads) |
|
67 | kwargs.get(r'depth', None), heads) | |
67 |
|
68 | |||
68 | def generateellipsesbundle2(bundler, repo, oldinclude, oldexclude, newinclude, |
|
69 | def generateellipsesbundle2(bundler, repo, oldinclude, oldexclude, newinclude, | |
@@ -76,7 +77,6 def generateellipsesbundle2(bundler, rep | |||||
76 |
|
77 | |||
77 | heads = set(heads or repo.heads()) |
|
78 | heads = set(heads or repo.heads()) | |
78 | common = set(common or [nullid]) |
|
79 | common = set(common or [nullid]) | |
79 | known = {bin(n) for n in known} |
|
|||
80 | if known and (oldinclude != newinclude or oldexclude != newexclude): |
|
80 | if known and (oldinclude != newinclude or oldexclude != newexclude): | |
81 | # Steps: |
|
81 | # Steps: | |
82 | # 1. Send kill for "$known & ::common" |
|
82 | # 1. Send kill for "$known & ::common" |
General Comments 0
You need to be logged in to leave comments.
Login now