| hg-reviewers |
The next patch will keep a reference to the returned iterator in a
field, which would otherwise result in a reference cycle.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| bothvisit.add(p) | bothvisit.add(p) | ||||
| else: | else: | ||||
| # visit later | # visit later | ||||
| thisvisit.add(p) | thisvisit.add(p) | ||||
| missing.reverse() | missing.reverse() | ||||
| return missing | return missing | ||||
| # Extracted from lazyancestors.__iter__ to avoid a reference cycle | |||||
| def _lazyancestorsiter(parentrevs, initrevs, stoprev, inclusive): | |||||
| seen = {nullrev} | |||||
| revs = initrevs | |||||
| schedule = heapq.heappush | |||||
| nextitem = heapq.heappop | |||||
| see = seen.add | |||||
| if inclusive: | |||||
| visit = [-r for r in revs] | |||||
| seen.update(revs) | |||||
| heapq.heapify(visit) | |||||
| else: | |||||
| visit = [] | |||||
| heapq.heapify(visit) | |||||
| for r in revs: | |||||
| for parent in parentrevs(r): | |||||
| if parent not in seen: | |||||
| schedule(visit, -parent) | |||||
| see(parent) | |||||
| while visit: | |||||
| current = -nextitem(visit) | |||||
| if current >= stoprev: | |||||
| yield current | |||||
| for parent in parentrevs(current): | |||||
| if parent not in seen: | |||||
| schedule(visit, -parent) | |||||
| see(parent) | |||||
| class lazyancestors(object): | class lazyancestors(object): | ||||
| def __init__(self, pfunc, revs, stoprev=0, inclusive=False): | def __init__(self, pfunc, revs, stoprev=0, inclusive=False): | ||||
| """Create a new object generating ancestors for the given revs. Does | """Create a new object generating ancestors for the given revs. Does | ||||
| not generate revs lower than stoprev. | not generate revs lower than stoprev. | ||||
| This is computed lazily starting from revs. The object supports | This is computed lazily starting from revs. The object supports | ||||
| iteration and membership. | iteration and membership. | ||||
| If inclusive is False, yield a sequence of revision numbers starting | If inclusive is False, yield a sequence of revision numbers starting | ||||
| with the parents of each revision in revs, i.e., each revision is | with the parents of each revision in revs, i.e., each revision is | ||||
| *not* considered an ancestor of itself. Results are emitted in reverse | *not* considered an ancestor of itself. Results are emitted in reverse | ||||
| revision number order. That order is also topological: a child is | revision number order. That order is also topological: a child is | ||||
| always emitted before its parent. | always emitted before its parent. | ||||
| If inclusive is True, the source revisions are also yielded. The | If inclusive is True, the source revisions are also yielded. The | ||||
| reverse revision number order is still enforced.""" | reverse revision number order is still enforced.""" | ||||
| seen = {nullrev} | for rev in _lazyancestorsiter(self._parentrevs, self._initrevs, | ||||
| revs = self._initrevs | self._stoprev, self._inclusive): | ||||
| yield rev | |||||
| parentrevs = self._parentrevs | |||||
| stoprev = self._stoprev | |||||
| schedule = heapq.heappush | |||||
| nextitem = heapq.heappop | |||||
| see = seen.add | |||||
| if self._inclusive: | |||||
| visit = [-r for r in revs] | |||||
| seen.update(revs) | |||||
| heapq.heapify(visit) | |||||
| else: | |||||
| visit = [] | |||||
| heapq.heapify(visit) | |||||
| for r in revs: | |||||
| for parent in parentrevs(r): | |||||
| if parent not in seen: | |||||
| schedule(visit, -parent) | |||||
| see(parent) | |||||
| while visit: | |||||
| current = -nextitem(visit) | |||||
| if current >= stoprev: | |||||
| yield current | |||||
| for parent in parentrevs(current): | |||||
| if parent not in seen: | |||||
| schedule(visit, -parent) | |||||
| see(parent) | |||||
| def __contains__(self, target): | def __contains__(self, target): | ||||
| """Test whether target is an ancestor of self._initrevs.""" | """Test whether target is an ancestor of self._initrevs.""" | ||||
| # Trying to do both __iter__ and __contains__ using the same visit | # Trying to do both __iter__ and __contains__ using the same visit | ||||
| # heap and seen set is complex enough that it slows down both. Keep | # heap and seen set is complex enough that it slows down both. Keep | ||||
| # them separate. | # them separate. | ||||
| seen = self._containsseen | seen = self._containsseen | ||||
| if target in seen: | if target in seen: | ||||