Show More
@@ -143,14 +143,12 b' def generate_ellipses_bundle2_for_wideni' | |||
|
143 | 143 | # c) goto a |
|
144 | 144 | # |
|
145 | 145 | # until they've built up the full new state. |
|
146 | # Convert to revnums and intersect with "common". The client should | |
|
147 | # have made it a subset of "common" already, but let's be safe. | |
|
148 | known = set(repo.revs(b"%ln & ::%ln", known, common)) | |
|
146 | knownrevs = {repo.changelog.rev(n) for n in known} | |
|
149 | 147 | # TODO: we could send only roots() of this set, and the |
|
150 | 148 | # list of nodes in common, and the client could work out |
|
151 | 149 | # what to strip, instead of us explicitly sending every |
|
152 | 150 | # single node. |
|
153 | deadrevs = known | |
|
151 | deadrevs = knownrevs | |
|
154 | 152 | |
|
155 | 153 | def genkills(): |
|
156 | 154 | for r in deadrevs: |
@@ -160,7 +158,7 b' def generate_ellipses_bundle2_for_wideni' | |||
|
160 | 158 | |
|
161 | 159 | bundler.newpart(_CHANGESPECPART, data=genkills()) |
|
162 | 160 | newvisit, newfull, newellipsis = exchange._computeellipsis( |
|
163 | repo, set(), common, known, newmatch | |
|
161 | repo, set(), common, knownrevs, newmatch | |
|
164 | 162 | ) |
|
165 | 163 | if newvisit: |
|
166 | 164 | packer = changegroup.getbundler( |
General Comments 0
You need to be logged in to leave comments.
Login now