Show More
@@ -174,14 +174,13 b' def findcommonheads(ui, local, remote,' | |||||
174 |
|
174 | |||
175 | # full blown discovery |
|
175 | # full blown discovery | |
176 |
|
176 | |||
177 | # own nodes where I don't know if remote knows them |
|
|||
178 | undecided = dag.nodeset() |
|
|||
179 | # own nodes I know we both know |
|
177 | # own nodes I know we both know | |
180 | # treat remote heads (and maybe own heads) as a first implicit sample |
|
178 | # treat remote heads (and maybe own heads) as a first implicit sample | |
181 | # response |
|
179 | # response | |
182 | common = cl.incrementalmissingrevs(srvheads) |
|
180 | common = cl.incrementalmissingrevs(srvheads) | |
183 | commoninsample = set(n for i, n in enumerate(sample) if yesno[i]) |
|
181 | commoninsample = set(n for i, n in enumerate(sample) if yesno[i]) | |
184 | common.addbases(commoninsample) |
|
182 | common.addbases(commoninsample) | |
|
183 | # own nodes where I don't know if remote knows them | |||
185 | undecided = set(common.missingancestors(ownheads)) |
|
184 | undecided = set(common.missingancestors(ownheads)) | |
186 | # own nodes I know remote lacks |
|
185 | # own nodes I know remote lacks | |
187 | missing = set() |
|
186 | missing = set() |
General Comments 0
You need to be logged in to leave comments.
Login now