# HG changeset patch # User John Stiles # Date 2018-05-25 06:05:12 # Node ID 24e517600b2986a3d5855456b3cdf0830ea0a79e # Parent d1690a64268e6c2120e7a5ab241f72dbe9e10153 graph: add outputgraph() function, called by ascii() to print the graph to the ui. This allows a cleaner entrypoint for extensions to tweak the graph output without needing to rewrite all of ascii(), or needing to manually guess where the graph nodes/edges end and the rev note portion begins. This patch does not affect graph output or behavior in any way. Differential Revision: https://phab.mercurial-scm.org/D3655 diff --git a/mercurial/graphmod.py b/mercurial/graphmod.py --- a/mercurial/graphmod.py +++ b/mercurial/graphmod.py @@ -341,6 +341,22 @@ def asciistate(): 'graphshorten': False, } +def outputgraph(ui, graph): + """outputs an ASCII graph of a DAG + + this is a helper function for 'ascii' below. + + takes the following arguments: + + - ui to write to + - graph data: list of { graph nodes/edges, text } + + this function can be monkey-patched by extensions to alter graph display + without needing to mimic all of the edge-fixup logic in ascii() + """ + for (ln, logstr) in graph: + ui.write((ln + logstr).rstrip() + "\n") + def ascii(ui, state, type, char, text, coldata): """prints an ASCII graph of the DAG @@ -469,9 +485,8 @@ def ascii(ui, state, type, char, text, c # print lines 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') + lines = ["%-*s " % (2 * indentation_level, "".join(line)) for line in lines] + outputgraph(ui, zip(lines, text)) # ... and start over state['lastcoldiff'] = coldiff