kallithea Changeset - 2da0dc09895a

Changeset - 2da0dc09895a

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: make colors sticky on the named branches

1 file changed with 20 insertions and 9 deletions:

kallithea/lib/graphmod.py

0 comments (0 inline, 0 general)

kallithea/lib/graphmod.py

➞

Show inline comments

@@ @@ -51,13 +51,13 @@ def graph_data(repo, revs): @@
       - Tuple (col, color) with column and color index for the current node
       - A list of tuples indicating the edges between the current node and its
         parents.
     """
     dag = _dagwalker(repo, revs)
     return list(_colored(dag))
+    return list(_colored(repo, dag))
 def _dagwalker(repo, revs):
     if not revs:
         return
     if repo.alias == 'hg':
@@ @@ -79,25 +79,31 @@ def _dagwalker(repo, revs): @@
                 ancestors = acache[p] = _first_known_ancestors(parentrev_func, minrev, knownrevs, p)
             dagparents.update(ancestors)
         yield (rev, sorted(dagparents))
 def _colored(dag):
+def _colored(repo, dag):
     """annotates a DAG with colored edge information
     For each DAG node this function emits tuples::
       ((col, color), [(col, nextcol, color)])
     with the following new elements:
       - Tuple (col, color) with column and color index for the current node
       - A list of tuples indicating the edges between the current node and its
         parents.
     """
     branch_cache = {}
     def branch(rev):
         if rev not in branch_cache:
             branch_cache[rev] = repo[rev].branch
         return branch_cache[rev]
     row = []
     colors = {}
     newcolor = 1
     for (rev, dagparents) in dag:
@@ @@ -115,28 +121,33 @@ def _colored(dag): @@
         tmprow[col:col + 1] = reversed(addparents) # higest revs first (to the right), dead ends last (to the left)
         # Stop looking for non-existing ancestors
         nextrow = []
         for r in tmprow:
             if r > nullrev or r in dagparents:
                 nextrow.append(r)
             else:
                 colors.pop(r)
         # Set colors for the parents
         color = colors.pop(rev)
         for i, p in enumerate(addparents):
             if not i:
                 colors[p] = color
             else:
                 colors[p] = newcolor
                 newcolor += 1
         if addparents:
             b = branch(rev)
             for p in reversed(addparents):
                 if b and branch(abs(p)) == b:
                     colors[p] = color
                     b = None
                 else:
                     colors[p] = newcolor
                     newcolor += 1
         # Add edges to the graph
         edges = []
         for ecol, ep in enumerate(row):
             if ep in nextrow:
                 edges.append((ecol, nextrow.index(ep), colors[ep]))
             elif ep == rev:
                 for p in dagparents:
-                    edges.append((ecol, nextrow.index(p), colors[p] if len(dagparents) > 1 else color))
                     edges.append((ecol, nextrow.index(p), colors[p]))
         # Yield and move on
         yield ((col, color), edges)
         row = nextrow

0 comments (0 inline, 0 general)