Mercurial > hg-stable
changeset 13554:22565ddb28e7
ancestor: improve description
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 07 Mar 2011 15:45:10 -0600 |
| parents | c2eda93961ec |
| children | 970150ddaaf8 |
| files | mercurial/ancestor.py |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/ancestor.py Sun Mar 06 22:13:36 2011 +0100 +++ b/mercurial/ancestor.py Mon Mar 07 15:45:10 2011 -0600 @@ -9,9 +9,10 @@ def ancestor(a, b, pfunc): """ - return a minimal-distance ancestor of nodes a and b, or None if there is no - such ancestor. Note that there can be several ancestors with the same - (minimal) distance, and the one returned is arbitrary. + Returns the common ancestor of a and b that is furthest from a + root (as measured by longest path) or None if no ancestor is + found. If there are multiple common ancestors at the same + distance, the first one found is returned. pfunc must return a list of parent vertices for a given vertex """ @@ -22,6 +23,7 @@ a, b = sorted([a, b]) # find depth from root of all ancestors + # depth is stored as a negative for heapq parentcache = {} visit = [a, b] depth = {} @@ -39,6 +41,7 @@ if p not in depth: visit.append(p) if visit[-1] == vertex: + # -(maximum distance of parents + 1) depth[vertex] = min([depth[p] for p in pl]) - 1 visit.pop()