Comments
Patch
@@ -1167,11 +1167,13 @@ def _computebumpedset(repo):
# We only evaluate mutable, non-obsolete revision
node = ctx.node()
# (future) A cache of precursors may worth if split is very common
- for pnode in allprecursors(repo.obsstore, [node],
+ for pnode in allsuccessors(repo.obsstore,
+ allprecursors(repo.obsstore, [node],
+ ignoreflags=bumpedfix),
ignoreflags=bumpedfix):
prev = torev(pnode) # unfiltered! but so is phasecache
if (prev is not None) and (phase(repo, prev) <= public):
- # we have a public precursors
+ # we have a public precursor
bumped.add(rev)
break # Next draft!
return bumped
@@ -1194,7 +1196,10 @@ def _computedivergentset(repo):
seen.add(prec)
if prec not in newermap:
successorssets(repo, prec, newermap)
- newer = [n for n in newermap[prec] if n]
+ newer = [n for n in newermap[prec]]
+ newer = [[x for x in n if not repo.set('public() & %ld' %
repo[x])]
+ for n in newer]
+ newer = [n for n in newer if n]
if len(newer) > 1:
divergent.add(ctx.rev())