Show More
@@ -665,8 +665,16 b' class obsstore(object):' | |||||
665 | _addsuccessors(successors, self._all) |
|
665 | _addsuccessors(successors, self._all) | |
666 | return successors |
|
666 | return successors | |
667 |
|
667 | |||
|
668 | @property | |||
|
669 | def precursors(self): | |||
|
670 | msg = ("'obsstore.precursors' is deprecated, " | |||
|
671 | "use 'obsstore.predecessors'") | |||
|
672 | util.nouideprecwarn(msg, '4.4') | |||
|
673 | ||||
|
674 | return self.predecessors | |||
|
675 | ||||
668 | @propertycache |
|
676 | @propertycache | |
669 |
def pre |
|
677 | def predecessors(self): | |
670 | predecessors = {} |
|
678 | predecessors = {} | |
671 | _addpredecessors(predecessors, self._all) |
|
679 | _addpredecessors(predecessors, self._all) | |
672 | return predecessors |
|
680 | return predecessors | |
@@ -686,8 +694,8 b' class obsstore(object):' | |||||
686 | self._all.extend(markers) |
|
694 | self._all.extend(markers) | |
687 | if self._cached('successors'): |
|
695 | if self._cached('successors'): | |
688 | _addsuccessors(self.successors, markers) |
|
696 | _addsuccessors(self.successors, markers) | |
689 |
if self._cached('pre |
|
697 | if self._cached('predecessors'): | |
690 |
_addpredecessors(self.pre |
|
698 | _addpredecessors(self.predecessors, markers) | |
691 | if self._cached('children'): |
|
699 | if self._cached('children'): | |
692 | _addchildren(self.children, markers) |
|
700 | _addchildren(self.children, markers) | |
693 | _checkinvalidmarkers(markers) |
|
701 | _checkinvalidmarkers(markers) | |
@@ -706,7 +714,7 b' class obsstore(object):' | |||||
706 | pendingnodes = set(nodes) |
|
714 | pendingnodes = set(nodes) | |
707 | seenmarkers = set() |
|
715 | seenmarkers = set() | |
708 | seennodes = set(pendingnodes) |
|
716 | seennodes = set(pendingnodes) | |
709 |
precursorsmarkers = self.pre |
|
717 | precursorsmarkers = self.predecessors | |
710 | succsmarkers = self.successors |
|
718 | succsmarkers = self.successors | |
711 | children = self.children |
|
719 | children = self.children | |
712 | while pendingnodes: |
|
720 | while pendingnodes: | |
@@ -957,7 +965,7 b' def _computedivergentset(repo):' | |||||
957 | obsstore = repo.obsstore |
|
965 | obsstore = repo.obsstore | |
958 | newermap = {} |
|
966 | newermap = {} | |
959 | for ctx in repo.set('(not public()) - obsolete()'): |
|
967 | for ctx in repo.set('(not public()) - obsolete()'): | |
960 |
mark = obsstore.pre |
|
968 | mark = obsstore.predecessors.get(ctx.node(), ()) | |
961 | toprocess = set(mark) |
|
969 | toprocess = set(mark) | |
962 | seen = set() |
|
970 | seen = set() | |
963 | while toprocess: |
|
971 | while toprocess: | |
@@ -971,7 +979,7 b' def _computedivergentset(repo):' | |||||
971 | if len(newer) > 1: |
|
979 | if len(newer) > 1: | |
972 | divergent.add(ctx.rev()) |
|
980 | divergent.add(ctx.rev()) | |
973 | break |
|
981 | break | |
974 |
toprocess.update(obsstore.pre |
|
982 | toprocess.update(obsstore.predecessors.get(prec, ())) | |
975 | return divergent |
|
983 | return divergent | |
976 |
|
984 | |||
977 |
|
985 |
@@ -81,7 +81,7 b' def closestpredecessors(repo, nodeid):' | |||||
81 | considered missing. |
|
81 | considered missing. | |
82 | """ |
|
82 | """ | |
83 |
|
83 | |||
84 |
precursors = repo.obsstore.pre |
|
84 | precursors = repo.obsstore.predecessors | |
85 | stack = [nodeid] |
|
85 | stack = [nodeid] | |
86 | seen = set(stack) |
|
86 | seen = set(stack) | |
87 |
|
87 | |||
@@ -115,7 +115,7 b' def allprecursors(obsstore, nodes, ignor' | |||||
115 | while remaining: |
|
115 | while remaining: | |
116 | current = remaining.pop() |
|
116 | current = remaining.pop() | |
117 | yield current |
|
117 | yield current | |
118 |
for mark in obsstore.pre |
|
118 | for mark in obsstore.predecessors.get(current, ()): | |
119 | # ignore marker flagged with specified flag |
|
119 | # ignore marker flagged with specified flag | |
120 | if mark[2] & ignoreflags: |
|
120 | if mark[2] & ignoreflags: | |
121 | continue |
|
121 | continue | |
@@ -207,7 +207,7 b' def exclusivemarkers(repo, nodes):' | |||||
207 |
|
207 | |||
208 | # shortcut to various useful item |
|
208 | # shortcut to various useful item | |
209 | nm = unfi.changelog.nodemap |
|
209 | nm = unfi.changelog.nodemap | |
210 |
precursorsmarkers = unfi.obsstore.pre |
|
210 | precursorsmarkers = unfi.obsstore.predecessors | |
211 | successormarkers = unfi.obsstore.successors |
|
211 | successormarkers = unfi.obsstore.successors | |
212 | childrenmarkers = unfi.obsstore.children |
|
212 | childrenmarkers = unfi.obsstore.children | |
213 |
|
213 |
General Comments 0
You need to be logged in to leave comments.
Login now