Show More
@@ -340,22 +340,21 b' def checkheads(pushop):' | |||||
340 | allfuturecommon.update(allmissing) |
|
340 | allfuturecommon.update(allmissing) | |
341 | for branch, heads in sorted(headssum.iteritems()): |
|
341 | for branch, heads in sorted(headssum.iteritems()): | |
342 | remoteheads, newheads, unsyncedheads = heads |
|
342 | remoteheads, newheads, unsyncedheads = heads | |
343 | candidate_newhs = set(newheads) |
|
|||
344 | # add unsynced data |
|
343 | # add unsynced data | |
345 | if remoteheads is None: |
|
344 | if remoteheads is None: | |
346 | oldhs = set() |
|
345 | oldhs = set() | |
347 | else: |
|
346 | else: | |
348 | oldhs = set(remoteheads) |
|
347 | oldhs = set(remoteheads) | |
349 | oldhs.update(unsyncedheads) |
|
348 | oldhs.update(unsyncedheads) | |
350 | candidate_newhs.update(unsyncedheads) |
|
|||
351 | dhs = None # delta heads, the new heads on branch |
|
349 | dhs = None # delta heads, the new heads on branch | |
352 | if not repo.obsstore: |
|
350 | if not repo.obsstore: | |
353 | discardedheads = set() |
|
351 | discardedheads = set() | |
354 |
newhs = |
|
352 | newhs = set(newheads) | |
355 | else: |
|
353 | else: | |
356 | newhs, discardedheads = _postprocessobsolete(pushop, |
|
354 | newhs, discardedheads = _postprocessobsolete(pushop, | |
357 | allfuturecommon, |
|
355 | allfuturecommon, | |
358 |
|
|
356 | newheads) | |
|
357 | newhs.update(unsyncedheads) | |||
359 | unsynced = sorted(h for h in unsyncedheads if h not in discardedheads) |
|
358 | unsynced = sorted(h for h in unsyncedheads if h not in discardedheads) | |
360 | if unsynced: |
|
359 | if unsynced: | |
361 | if None in unsynced: |
|
360 | if None in unsynced: |
General Comments 0
You need to be logged in to leave comments.
Login now