This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3655

graph: add outputgraph() function, called by ascii() to print the graph to the ui.
ClosedPublic

Authored by johnstiles on May 25 2018, 2:14 AM.

Details

Reviewers
spectral
pulkit
Group Reviewers
hg-reviewers
Commits
rHG24e517600b29: graph: add outputgraph() function, called by ascii() to print
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

johnstiles created this revision.May 25 2018, 2:14 AM
spectral accepted this revision.May 25 2018, 3:18 PM
spectral added a subscriber: spectral.

lgtm, and as long as there's no test differences seems fine. (I don't have ability to accept the patch, and this is from another Googler anyway, so this is just first-stage review).

pulkit accepted this revision.May 25 2018, 3:37 PM
Closed by commit rHG24e517600b29: graph: add outputgraph() function, called by ascii() to print (authored by johnstiles). · Explain WhyMay 25 2018, 3:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/graphmod.py (21 lines)

Diff 8895

mercurial/graphmod.py

'seen': [], 'seen': [],
'edges': {}, 'edges': {},
'lastcoldiff': 0, 'lastcoldiff': 0,
'lastindex': 0, 'lastindex': 0,
'styles': EDGES.copy(), 'styles': EDGES.copy(),
'graphshorten': False, '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): def ascii(ui, state, type, char, text, coldata):
"""prints an ASCII graph of the DAG """prints an ASCII graph of the DAG
takes the following arguments (one call per node in the graph): takes the following arguments (one call per node in the graph):
- ui to write to - ui to write to
- Somewhere to keep the needed state in (init to asciistate()) - Somewhere to keep the needed state in (init to asciistate())
- Column of the current node in the set of ongoing edges. - Column of the current node in the set of ongoing edges.
return -num <= i if num < 0 else (len(lines) - i) <= num return -num <= i if num < 0 else (len(lines) - i) <= num
for i, line in enumerate(lines): for i, line in enumerate(lines):
line[:] = [c[-1:] if _drawgp(c, i) else parent for c in line] line[:] = [c[-1:] if _drawgp(c, i) else parent for c in line]
edgemap.update( edgemap.update(
(e, (c if len(c) < 2 else parent)) for e, c in edgemap.items()) (e, (c if len(c) < 2 else parent)) for e, c in edgemap.items())
# print lines # print lines
indentation_level = max(ncols, ncols + coldiff) indentation_level = max(ncols, ncols + coldiff)
for (line, logstr) in zip(lines, text): lines = ["%-*s " % (2 * indentation_level, "".join(line)) for line in lines]
ln = "%-*s %s" % (2 * indentation_level, "".join(line), logstr) outputgraph(ui, zip(lines, text))
ui.write(ln.rstrip() + '\n')
# ... and start over # ... and start over
state['lastcoldiff'] = coldiff state['lastcoldiff'] = coldiff
state['lastindex'] = idx state['lastindex'] = idx