# HG changeset patch # User Yuya Nishihara # Date 2017-06-24 14:22:45 # Node ID 58ebb38456e0500fa983cc7c826c37a4ff5e42bb # Parent a76a64c78807b3ec01df039d7e10915ab7e95cb3 dagop: factor out pfunc from revancestors() generator This generator will be reused for tracking descendants with depth limit. # ancestors(tip) using hg repo 0) 0.065868 1) 0.068976 diff --git a/mercurial/dagop.py b/mercurial/dagop.py --- a/mercurial/dagop.py +++ b/mercurial/dagop.py @@ -38,6 +38,11 @@ def _genrevancestors(repo, revs, followf raise error.ProgrammingError('negative stopdepth') cl = repo.changelog + def pfunc(rev): + try: + return cl.parentrevs(rev)[:cut] + except error.WdirUnsupported: + return (pctx.rev() for pctx in repo[rev].parents()[:cut]) # load input revs lazily to heap so earlier revisions can be yielded # without fully computing the input revs @@ -65,14 +70,9 @@ def _genrevancestors(repo, revs, followf yield currev pdepth = curdepth + 1 if foundnew and pdepth < stopdepth: - try: - for prev in cl.parentrevs(currev)[:cut]: - if prev != node.nullrev: - heapq.heappush(pendingheap, (-prev, pdepth)) - except error.WdirUnsupported: - for pctx in repo[currev].parents()[:cut]: - if pctx.rev() != node.nullrev: - heapq.heappush(pendingheap, (-pctx.rev(), pdepth)) + for prev in pfunc(currev): + if prev != node.nullrev: + heapq.heappush(pendingheap, (-prev, pdepth)) def revancestors(repo, revs, followfirst, startdepth=None, stopdepth=None): """Like revlog.ancestors(), but supports additional options, includes