Show More
@@ -331,13 +331,17 def checkheads(pushop): | |||
|
331 | 331 | # If there are more heads after the push than before, a suitable |
|
332 | 332 | # error message, depending on unsynced status, is displayed. |
|
333 | 333 | errormsg = None |
|
334 | # If there is no obsstore, allfuturecommon won't be used, so no | |
|
335 | # need to compute it. | |
|
334 | # If there are no obsstore, no post-processing are needed. | |
|
336 | 335 | if repo.obsstore: |
|
337 | 336 | allmissing = set(outgoing.missing) |
|
338 | 337 | cctx = repo.set('%ld', outgoing.common) |
|
339 | 338 | allfuturecommon = set(c.node() for c in cctx) |
|
340 | 339 | allfuturecommon.update(allmissing) |
|
340 | for branch, heads in sorted(headssum.iteritems()): | |
|
341 | remoteheads, newheads, unsyncedheads = heads | |
|
342 | result = _postprocessobsolete(pushop, allfuturecommon, newheads) | |
|
343 | newheads = sorted(result[0]) | |
|
344 | headssum[branch] = (remoteheads, newheads, unsyncedheads) | |
|
341 | 345 | for branch, heads in sorted(headssum.iteritems()): |
|
342 | 346 | remoteheads, newheads, unsyncedheads = heads |
|
343 | 347 | # add unsynced data |
@@ -347,9 +351,6 def checkheads(pushop): | |||
|
347 | 351 | oldhs = set(remoteheads) |
|
348 | 352 | oldhs.update(unsyncedheads) |
|
349 | 353 | dhs = None # delta heads, the new heads on branch |
|
350 | if repo.obsstore: | |
|
351 | result = _postprocessobsolete(pushop, allfuturecommon, newheads) | |
|
352 | newheads = sorted(result[0]) | |
|
353 | 354 | newhs = set(newheads) |
|
354 | 355 | newhs.update(unsyncedheads) |
|
355 | 356 | if unsyncedheads: |
General Comments 0
You need to be logged in to leave comments.
Login now