graphlog: simplify ascii drawing to process one cset at a time

hgext/graphlog.py

@@ -100,11 +100,13 b' def get_padding_line(ni, n_columns, edge'
     line.extend(["|", " "] * (n_columns - ni - 1))
     return line
 
-def ascii(ui, dag):
+def ascii(ui, base, type, char, text, coldata):
     """prints an ASCII graph of the DAG
 
-    dag is a generator that emits tuples with the following elements:
+    takes the following arguments (one call per node in the graph):
 
+      - ui to write to
+      - A list we can keep the needed state in
       - Column of the current node in the set of ongoing edges.
       - Type indicator of node data == ASCIIDATA.
       - Payload: (char, lines):
@@ -119,9 +121,7 b' def ascii(ui, dag):'
         0 means no columns added or removed; 1 means one column added.
     """
 
-    base = [0, 0]
-    for idx, type, (char, text), edges, ncols, coldiff in dag:
-
+    idx, edges, ncols, coldiff = coldata
         assert -2 < coldiff < 2
         if coldiff == -1:
             # Transform
@@ -139,8 +139,7 b' def ascii(ui, dag):'
         #     |  / /         |   | |  # <--- padding line
         #     o | |          |  / /
         #                    o | |
-        add_padding_line = (len(text) > 2 and
-                            coldiff == -1 and
+    add_padding_line = (len(text) > 2 and coldiff == -1 and
                             [x for (x, y) in edges if x + 1 < y])
 
         # fix_nodeline_tail says whether to rewrite
@@ -217,14 +216,13 b' def check_unsupported_flags(opts):'
         if op in opts and opts[op]:
             raise util.Abort(_("--graph option is incompatible with --%s") % op)
 
-def generate(dag, displayer, showparents, edgefn):
-    seen = []
+def generate(ui, dag, displayer, showparents, edgefn):
+    seen, base = [], [0, 0]
     for rev, type, ctx, parents in dag:
         char = ctx.node() in showparents and '@' or 'o'
         displayer.show(ctx)
         lines = displayer.hunk.pop(rev).split('\n')[:-1]
-        cols = edgefn(seen, rev, parents)
-        yield cols[0], type, (char, lines), cols[1], cols[2], cols[3]
+        ascii(ui, base, type, char, lines, edgefn(seen, rev, parents))
 
 def graphlog(ui, repo, path=None, **opts):
     """show revision history alongside an ASCII revision graph
@@ -252,8 +250,7 b' def graphlog(ui, repo, path=None, **opts'
 
     displayer = show_changeset(ui, repo, opts, buffered=True)
     showparents = [ctx.node() for ctx in repo[None].parents()]
-    gen = generate(revdag, displayer, showparents, asciiedges)
-    ascii(ui, gen)
+    generate(ui, revdag, displayer, showparents, asciiedges)
 
 def graphrevs(repo, nodes, opts):
     limit = cmdutil.loglimit(opts)
@@ -289,8 +286,7 b' def goutgoing(ui, repo, dest=None, **opt'
     revdag = graphrevs(repo, o, opts)
     displayer = show_changeset(ui, repo, opts, buffered=True)
     showparents = [ctx.node() for ctx in repo[None].parents()]
-    gen = generate(revdag, displayer, showparents, asciiedges)
-    ascii(ui, gen)
+    generate(ui, revdag, displayer, showparents, asciiedges)
 
 def gincoming(ui, repo, source="default", **opts):
     """show the incoming changesets alongside an ASCII revision graph
@@ -340,8 +336,7 b' def gincoming(ui, repo, source="default"'
         revdag = graphrevs(other, chlist, opts)
         displayer = show_changeset(ui, other, opts, buffered=True)
         showparents = [ctx.node() for ctx in repo[None].parents()]
-        gen = generate(revdag, displayer, showparents, asciiedges)
-        ascii(ui, gen)
+        generate(ui, revdag, displayer, showparents, asciiedges)
 
     finally:
         if hasattr(other, 'close'):