mercurial: comparison hgext/graphlog.py

equal deleted inserted replaced

-:b360addfbe0e
+:571a7acb4544
 c = " "
 line.extend([c, " "])
 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):
 - Character to use as node's symbol.
 - List of lines to display as the node's text.
 in the next revision and the number of columns (ongoing edges)
 in the current revision. That is: -1 means one column removed;
 0 means no columns added or removed; 1 means one column added.
 """
-base = [0, 0]
+idx, edges, ncols, coldiff = coldata
-for idx, type, (char, text), edges, ncols, coldiff in dag:
+assert -2 < coldiff < 2
+if coldiff == -1:
-assert -2 < coldiff < 2
+# Transform
-if coldiff == -1:
-# Transform
-#
-#     | | |        | | |
-#     o | |  into  o---+
-#     |X /         |/ /
-#     | |          | |
-fix_long_right_edges(edges)
-# add_padding_line says whether to rewrite
 #
-#     | | | |        | | | |
+#     | | |        | | |
-#     | o---+  into  | o---+
+#     o | |  into  o---+
-#     |  / /         |   | |  # <--- padding line
+#     |X /         |/ /
-#     o | |          |  / /
+#     | |          | |
-#                    o | |
+fix_long_right_edges(edges)
-add_padding_line = (len(text) > 2 and
-coldiff == -1 and
+# add_padding_line says whether to rewrite
-[x for (x, y) in edges if x + 1 < y])
+#
+#     | | | |        | | | |
-# fix_nodeline_tail says whether to rewrite
+#     | o---+  into  | o---+
-#
+#     |  / /         |   | |  # <--- padding line
-#     | | o | |        | | o | |
+#     o | |          |  / /
-#     | | |/ /         | | |/ /
+#                    o | |
-#     | o | |    into  | o / /   # <--- fixed nodeline tail
+add_padding_line = (len(text) > 2 and coldiff == -1 and
-#     | |/ /           | |/ /
+[x for (x, y) in edges if x + 1 < y])
-#     o | |            o | |
-fix_nodeline_tail = len(text) <= 2 and not add_padding_line
+# fix_nodeline_tail says whether to rewrite
+#
-# nodeline is the line containing the node character (typically o)
+#     | | o | |        | | o | |
-nodeline = ["|", " "] * idx
+#     | | |/ /         | | |/ /
-nodeline.extend([char, " "])
+#     | o | |    into  | o / /   # <--- fixed nodeline tail
+#     | |/ /           | |/ /
-nodeline.extend(
+#     o | |            o | |
-get_nodeline_edges_tail(idx, base[1], ncols, coldiff,
+fix_nodeline_tail = len(text) <= 2 and not add_padding_line
-base[0], fix_nodeline_tail))
+# nodeline is the line containing the node character (typically o)
-# shift_interline is the line containing the non-vertical
+nodeline = ["|", " "] * idx
-# edges between this entry and the next
+nodeline.extend([char, " "])
-shift_interline = ["|", " "] * idx
-if coldiff == -1:
+nodeline.extend(
-n_spaces = 1
+get_nodeline_edges_tail(idx, base[1], ncols, coldiff,
-edge_ch = "/"
+base[0], fix_nodeline_tail))
-elif coldiff == 0:
-n_spaces = 2
+# shift_interline is the line containing the non-vertical
-edge_ch = "|"
+# edges between this entry and the next
-else:
+shift_interline = ["|", " "] * idx
-n_spaces = 3
+if coldiff == -1:
-edge_ch = "\\"
+n_spaces = 1
-shift_interline.extend(n_spaces * [" "])
+edge_ch = "/"
-shift_interline.extend([edge_ch, " "] * (ncols - idx - 1))
+elif coldiff == 0:
+n_spaces = 2
-# draw edges from the current node to its parents
+edge_ch = "|"
-draw_edges(edges, nodeline, shift_interline)
+else:
+n_spaces = 3
-# lines is the list of all graph lines to print
+edge_ch = "\\"
-lines = [nodeline]
+shift_interline.extend(n_spaces * [" "])
-if add_padding_line:
+shift_interline.extend([edge_ch, " "] * (ncols - idx - 1))
-lines.append(get_padding_line(idx, ncols, edges))
-lines.append(shift_interline)
+# draw edges from the current node to its parents
+draw_edges(edges, nodeline, shift_interline)
-# make sure that there are as many graph lines as there are
-# log strings
+# lines is the list of all graph lines to print
-while len(text) < len(lines):
+lines = [nodeline]
-text.append("")
+if add_padding_line:
-if len(lines) < len(text):
+lines.append(get_padding_line(idx, ncols, edges))
-extra_interline = ["|", " "] * (ncols + coldiff)
+lines.append(shift_interline)
-while len(lines) < len(text):
-lines.append(extra_interline)
+# make sure that there are as many graph lines as there are
+# log strings
-# print lines
+while len(text) < len(lines):
-indentation_level = max(ncols, ncols + coldiff)
+text.append("")
-for (line, logstr) in zip(lines, text):
+if len(lines) < len(text):
-ln = "%-*s %s" % (2 * indentation_level, "".join(line), logstr)
+extra_interline = ["|", " "] * (ncols + coldiff)
-ui.write(ln.rstrip() + '\n')
+while len(lines) < len(text):
+lines.append(extra_interline)
-# ... and start over
-base[0] = coldiff
+# print lines
-base[1] = idx
+indentation_level = max(ncols, ncols + coldiff)
+for (line, logstr) in zip(lines, text):
+ln = "%-*s %s" % (2 * indentation_level, "".join(line), logstr)
+ui.write(ln.rstrip() + '\n')
+# ... and start over
+base[0] = coldiff
+base[1] = idx
 def get_revs(repo, rev_opt):
 if rev_opt:
 revs = revrange(repo, rev_opt)
 return (max(revs), min(revs))
 "only_merges", "user", "only_branch", "prune", "newest_first",
 "no_merges", "include", "exclude"]:
 if op in opts and opts[op]:
 raise util.Abort(_("--graph option is incompatible with --%s") % op)
-def generate(dag, displayer, showparents, edgefn):
+def generate(ui, dag, displayer, showparents, edgefn):
-seen = []
+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)
+ascii(ui, base, type, char, lines, edgefn(seen, rev, parents))
-yield cols[0], type, (char, lines), cols[1], cols[2], cols[3]
 def graphlog(ui, repo, path=None, **opts):
 """show revision history alongside an ASCII revision graph
 Print a revision history alongside a revision graph drawn with
 else:
 revdag = graphmod.revisions(repo, start, stop)
 displayer = show_changeset(ui, repo, opts, buffered=True)
 showparents = [ctx.node() for ctx in repo[None].parents()]
-gen = generate(revdag, displayer, showparents, asciiedges)
+generate(ui, revdag, displayer, showparents, asciiedges)
-ascii(ui, gen)
 def graphrevs(repo, nodes, opts):
 limit = cmdutil.loglimit(opts)
 nodes.reverse()
 if limit < sys.maxint:
 o = repo.changelog.nodesbetween(o, revs)[0]
 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)
+generate(ui, revdag, displayer, showparents, asciiedges)
-ascii(ui, gen)
 def gincoming(ui, repo, source="default", **opts):
 """show the incoming changesets alongside an ASCII revision graph
 Print the incoming changesets alongside a revision graph drawn with
 chlist = other.changelog.nodesbetween(incoming, revs)[0]
 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)
+generate(ui, revdag, displayer, showparents, asciiedges)
-ascii(ui, gen)
 finally:
 if hasattr(other, 'close'):
 other.close()
 if cleanup:

changeset 9371	571a7acb4544
parent 9370	b360addfbe0e
child 9631	1c34fca5d785