kallithea Changeset - efc911d7b217

Changeset - efc911d7b217

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 12 years ago 2013-12-10 19:30:37
madski@unity3d.com

graph: refactor first known ancestor calculation

1 file changed with 5 insertions and 8 deletions:

kallithea/lib/graphmod.py

0 comments (0 inline, 0 general)

kallithea/lib/graphmod.py

➞

Show inline comments

@@ @@ -28,13 +28,13 @@ def _first_known_ancestors(parentrev_fun @@
     pending = set([head])
     seen = set()
     ancestors = set()
     minrev = max(nullrev, minrev)
     while pending:
         r = pending.pop()
         if r >= minrev and r not in seen:
             if r in knownrevs:
         if r < minrev:
             pass
         elif r in knownrevs:
                 ancestors.add(r)
-            else:
+        elif r not in seen:
                 pending.update(parentrev_func(r))
             seen.add(r)
     return ancestors
@@ @@ -65,7 +65,7 @@ def _dagwalker(repo, revs): @@
         def parentrev_func(rev):
             return [x.revision for x in repo[rev].parents]
-    minrev = min(revs)
+    minrev = revs[-1] # assuming sorted reverse
     knownrevs = set(revs)
     acache = {}
     for rev in revs:
@@ @@ -76,10 +76,7 @@ def _dagwalker(repo, revs): @@
             ancestors = acache.get(p)
             if ancestors is None:
                 ancestors = acache[p] = _first_known_ancestors(parentrev_func, minrev, knownrevs, p)
             if ancestors: # some indirect known ancestors found - use them and ignore unknown ancestors
                 dagparents.update(ancestors)
             else: # no known ancestors - use the real but unknown parent
                 dagparents.add(p)
         yield (rev, sorted(dagparents))

0 comments (0 inline, 0 general)