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