# HG changeset patch # User Yuya Nishihara # Date 2017-06-18 08:22:57 # Node ID 08e2793d9f654fda6276c894318bb797cafd08e0 # Parent c7da57bbae96ebdc8435fb33b57a2e0f98f936b1 dagop: bulk rename variables in revancestors() generator - h -> pendingheap: "h" seems too short for variable of long lifetime - current -> currev: future patches will add current "depth" variable - parent -> prev or pctx: short lifetime, follows common naming rules diff --git a/mercurial/dagop.py b/mercurial/dagop.py --- a/mercurial/dagop.py +++ b/mercurial/dagop.py @@ -31,30 +31,30 @@ def _genrevancestors(repo, revs, followf # without fully computing the input revs revs.sort(reverse=True) irevs = iter(revs) - h = [] + pendingheap = [] inputrev = next(irevs, None) if inputrev is not None: - heapq.heappush(h, -inputrev) + heapq.heappush(pendingheap, -inputrev) seen = set() - while h: - current = -heapq.heappop(h) - if current == inputrev: + while pendingheap: + currev = -heapq.heappop(pendingheap) + if currev == inputrev: inputrev = next(irevs, None) if inputrev is not None: - heapq.heappush(h, -inputrev) - if current not in seen: - seen.add(current) - yield current + heapq.heappush(pendingheap, -inputrev) + if currev not in seen: + seen.add(currev) + yield currev try: - for parent in cl.parentrevs(current)[:cut]: - if parent != node.nullrev: - heapq.heappush(h, -parent) + for prev in cl.parentrevs(currev)[:cut]: + if prev != node.nullrev: + heapq.heappush(pendingheap, -prev) except error.WdirUnsupported: - for parent in repo[current].parents()[:cut]: - if parent.rev() != node.nullrev: - heapq.heappush(h, -parent.rev()) + for pctx in repo[currev].parents()[:cut]: + if pctx.rev() != node.nullrev: + heapq.heappush(pendingheap, -pctx.rev()) def revancestors(repo, revs, followfirst): """Like revlog.ancestors(), but supports followfirst."""