Show More
@@ -443,8 +443,8 b' def _postprocessobsolete(pushop, futurec' | |||||
443 | public = phases.public |
|
443 | public = phases.public | |
444 | getphase = unfi._phasecache.phase |
|
444 | getphase = unfi._phasecache.phase | |
445 | ispublic = (lambda r: getphase(unfi, r) == public) |
|
445 | ispublic = (lambda r: getphase(unfi, r) == public) | |
446 | hasoutmarker = functools.partial(pushingmarkerfor, unfi.obsstore, |
|
446 | ispushed = (lambda n: n in futurecommon) | |
447 | futurecommon) |
|
447 | hasoutmarker = functools.partial(pushingmarkerfor, unfi.obsstore, ispushed) | |
448 | successorsmarkers = unfi.obsstore.successors |
|
448 | successorsmarkers = unfi.obsstore.successors | |
449 | newhs = set() # final set of new heads |
|
449 | newhs = set() # final set of new heads | |
450 | discarded = set() # new head of fully replaced branch |
|
450 | discarded = set() # new head of fully replaced branch | |
@@ -496,7 +496,7 b' def _postprocessobsolete(pushop, futurec' | |||||
496 | newhs |= unknownheads |
|
496 | newhs |= unknownheads | |
497 | return newhs, discarded |
|
497 | return newhs, discarded | |
498 |
|
498 | |||
499 |
def pushingmarkerfor(obsstore, |
|
499 | def pushingmarkerfor(obsstore, ispushed, node): | |
500 | """true if some markers are to be pushed for node |
|
500 | """true if some markers are to be pushed for node | |
501 |
|
501 | |||
502 | We cannot just look in to the pushed obsmarkers from the pushop because |
|
502 | We cannot just look in to the pushed obsmarkers from the pushop because | |
@@ -512,7 +512,7 b' def pushingmarkerfor(obsstore, pushset, ' | |||||
512 | seen = set(stack) |
|
512 | seen = set(stack) | |
513 | while stack: |
|
513 | while stack: | |
514 | current = stack.pop() |
|
514 | current = stack.pop() | |
515 |
if current |
|
515 | if ispushed(current): | |
516 | return True |
|
516 | return True | |
517 | markers = successorsmarkers.get(current, ()) |
|
517 | markers = successorsmarkers.get(current, ()) | |
518 | # markers fields = ('prec', 'succs', 'flag', 'meta', 'date', 'parents') |
|
518 | # markers fields = ('prec', 'succs', 'flag', 'meta', 'date', 'parents') |
General Comments 0
You need to be logged in to leave comments.
Login now