Show More
@@ -431,6 +431,7 b' def _postprocessobsolete(pushop, futurec' | |||||
431 | repo = pushop.repo |
|
431 | repo = pushop.repo | |
432 | unfi = repo.unfiltered() |
|
432 | unfi = repo.unfiltered() | |
433 | tonode = unfi.changelog.node |
|
433 | tonode = unfi.changelog.node | |
|
434 | torev = unfi.changelog.rev | |||
434 | public = phases.public |
|
435 | public = phases.public | |
435 | getphase = unfi._phasecache.phase |
|
436 | getphase = unfi._phasecache.phase | |
436 | ispublic = (lambda r: getphase(unfi, r) == public) |
|
437 | ispublic = (lambda r: getphase(unfi, r) == public) | |
@@ -460,8 +461,7 b' def _postprocessobsolete(pushop, futurec' | |||||
460 | while localcandidate: |
|
461 | while localcandidate: | |
461 | nh = localcandidate.pop() |
|
462 | nh = localcandidate.pop() | |
462 | # run this check early to skip the evaluation of the whole branch |
|
463 | # run this check early to skip the evaluation of the whole branch | |
463 | if (nh in futurecommon |
|
464 | if (nh in futurecommon or ispublic(torev(nh))): | |
464 | or unfi[nh].phase() <= public): |
|
|||
465 | newhs.add(nh) |
|
465 | newhs.add(nh) | |
466 | continue |
|
466 | continue | |
467 |
|
467 |
General Comments 0
You need to be logged in to leave comments.
Login now