kallithea Changeset - b20330417f57

Changeset - b20330417f57

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: stop looking for ancestors that have been passed - showing it as a "dead end" is better when the repo is very branchy

1 file changed with 11 insertions and 5 deletions:

kallithea/lib/graphmod.py

0 comments (0 inline, 0 general)

kallithea/lib/graphmod.py

➞

Show inline comments

@@ @@ -10,49 +10,50 @@ @@
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 Modified mercurial DAG graph functions that re-uses VCS structure
 It allows to have a shared codebase for DAG generation for hg and git repos
 """
 nullrev = -1
 def _first_known_ancestors(parentrev_func, minrev, knownrevs, head):
     """
     Walk DAG defined by parentrev_func.
     Return most immediate ancestors of head that are in knownrevs.
     minrev is lower bound on knownrevs.
     """
     pending = set([head])
     seen = set()
     ancestors = set()
     while pending:
         r = pending.pop()
         if r < minrev:
             pass
             if r > nullrev: # ignore -1 returned from parentrev_func
                 ancestors.add(-head) # fake unique unknown parent for this rev
         elif r in knownrevs:
             ancestors.add(r)
         elif r not in seen:
             pending.update(parentrev_func(r))
             seen.add(r)
     return ancestors
 def graph_data(repo, revs):
     """Return a DAG with colored edge information for revs
     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.
     """
     dag = _dagwalker(repo, revs)
     return list(_colored(dag))
 def _dagwalker(repo, revs):
@@ @@ -85,52 +86,57 @@ def _colored(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.
     """
     row = []
     colors = {}
     newcolor = 1
     for (rev, dagparents) in dag:
         # Compute row and nextrow
         if rev not in row:
             row.append(rev)  # new head
             colors[rev] = newcolor
             newcolor += 1
         nextrow = row[:]
         col = row.index(rev)
         addparents = [p for p in dagparents if p not in row]
         # Add unknown parents to nextrow
         addparents = [p for p in dagparents if p not in nextrow]
         col = nextrow.index(rev)
         nextrow[col:col + 1] = addparents
         tmprow = row[:]
         tmprow[col:col + 1] = addparents
         # Stop looking for non-existing ancestors
         nextrow = []
         for r in tmprow:
             if r > nullrev or r in dagparents:
                 nextrow.append(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
         # 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))
         # Yield and move on
         yield ((col, color), edges)
         row = nextrow

0 comments (0 inline, 0 general)