##// END OF EJS Templates
obsolete: drop usage of changectx in '_computecontentdivergentset'...
Boris Feld -
r35135:5cd6682b default
parent child Browse files
Show More
@@ -1023,8 +1023,10 b' def _computecontentdivergentset(repo):'
1023 divergent = set()
1023 divergent = set()
1024 obsstore = repo.obsstore
1024 obsstore = repo.obsstore
1025 newermap = {}
1025 newermap = {}
1026 for ctx in repo.set('(not public()) - obsolete()'):
1026 tonode = repo.changelog.node
1027 mark = obsstore.predecessors.get(ctx.node(), ())
1027 for rev in repo.revs('(not public()) - obsolete()'):
1028 node = tonode(rev)
1029 mark = obsstore.predecessors.get(node, ())
1028 toprocess = set(mark)
1030 toprocess = set(mark)
1029 seen = set()
1031 seen = set()
1030 while toprocess:
1032 while toprocess:
@@ -1036,7 +1038,7 b' def _computecontentdivergentset(repo):'
1036 obsutil.successorssets(repo, prec, cache=newermap)
1038 obsutil.successorssets(repo, prec, cache=newermap)
1037 newer = [n for n in newermap[prec] if n]
1039 newer = [n for n in newermap[prec] if n]
1038 if len(newer) > 1:
1040 if len(newer) > 1:
1039 divergent.add(ctx.rev())
1041 divergent.add(rev)
1040 break
1042 break
1041 toprocess.update(obsstore.predecessors.get(prec, ()))
1043 toprocess.update(obsstore.predecessors.get(prec, ()))
1042 return divergent
1044 return divergent
General Comments 0
You need to be logged in to leave comments. Login now