Show More
@@ -272,9 +272,13 b' def checkheads(repo, remote, outgoing, r' | |||
|
272 | 272 | # If there are more heads after the push than before, a suitable |
|
273 | 273 | # error message, depending on unsynced status, is displayed. |
|
274 | 274 | error = None |
|
275 | allmissing = set(outgoing.missing) | |
|
276 | allfuturecommon = set(c.node() for c in repo.set('%ld', outgoing.common)) | |
|
277 | allfuturecommon.update(allmissing) | |
|
275 | # If there is no obsstore, allfuturecommon won't be used, so no | |
|
276 | # need to compute it. | |
|
277 | if repo.obsstore: | |
|
278 | allmissing = set(outgoing.missing) | |
|
279 | cctx = repo.set('%ld', outgoing.common) | |
|
280 | allfuturecommon = set(c.node() for c in cctx) | |
|
281 | allfuturecommon.update(allmissing) | |
|
278 | 282 | for branch, heads in sorted(headssum.iteritems()): |
|
279 | 283 | remoteheads, newheads, unsyncedheads = heads |
|
280 | 284 | candidate_newhs = set(newheads) |
General Comments 0
You need to be logged in to leave comments.
Login now