Show More
@@ -100,11 +100,13 b' def get_padding_line(ni, n_columns, edge' | |||
|
100 | 100 | line.extend(["|", " "] * (n_columns - ni - 1)) |
|
101 | 101 | return line |
|
102 | 102 | |
|
103 | def ascii(ui, dag): | |
|
103 | def ascii(ui, base, type, char, text, coldata): | |
|
104 | 104 | """prints an ASCII graph of the DAG |
|
105 | 105 | |
|
106 | dag is a generator that emits tuples with the following elements: | |
|
106 | takes the following arguments (one call per node in the graph): | |
|
107 | 107 | |
|
108 | - ui to write to | |
|
109 | - A list we can keep the needed state in | |
|
108 | 110 | - Column of the current node in the set of ongoing edges. |
|
109 | 111 | - Type indicator of node data == ASCIIDATA. |
|
110 | 112 | - Payload: (char, lines): |
@@ -119,89 +121,86 b' def ascii(ui, dag):' | |||
|
119 | 121 | 0 means no columns added or removed; 1 means one column added. |
|
120 | 122 | """ |
|
121 | 123 | |
|
122 | base = [0, 0] | |
|
123 | for idx, type, (char, text), edges, ncols, coldiff in dag: | |
|
124 | ||
|
125 | assert -2 < coldiff < 2 | |
|
126 | if coldiff == -1: | |
|
127 | # Transform | |
|
128 | # | |
|
129 | # | | | | | | | |
|
130 | # o | | into o---+ | |
|
131 | # |X / |/ / | |
|
132 | # | | | | | |
|
133 | fix_long_right_edges(edges) | |
|
134 | ||
|
135 | # add_padding_line says whether to rewrite | |
|
124 | idx, edges, ncols, coldiff = coldata | |
|
125 | assert -2 < coldiff < 2 | |
|
126 | if coldiff == -1: | |
|
127 | # Transform | |
|
136 | 128 | # |
|
137 |
# | | | |
|
|
138 |
# |
|
|
139 |
# | |
|
|
140 |
# |
|
|
141 | # o | | | |
|
142 | add_padding_line = (len(text) > 2 and | |
|
143 | coldiff == -1 and | |
|
144 | [x for (x, y) in edges if x + 1 < y]) | |
|
129 | # | | | | | | | |
|
130 | # o | | into o---+ | |
|
131 | # |X / |/ / | |
|
132 | # | | | | | |
|
133 | fix_long_right_edges(edges) | |
|
134 | ||
|
135 | # add_padding_line says whether to rewrite | |
|
136 | # | |
|
137 | # | | | | | | | | | |
|
138 | # | o---+ into | o---+ | |
|
139 | # | / / | | | # <--- padding line | |
|
140 | # o | | | / / | |
|
141 | # o | | | |
|
142 | add_padding_line = (len(text) > 2 and coldiff == -1 and | |
|
143 | [x for (x, y) in edges if x + 1 < y]) | |
|
145 | 144 | |
|
146 |
|
|
|
147 |
|
|
|
148 |
|
|
|
149 |
|
|
|
150 |
|
|
|
151 |
|
|
|
152 |
|
|
|
153 |
|
|
|
145 | # fix_nodeline_tail says whether to rewrite | |
|
146 | # | |
|
147 | # | | o | | | | o | | | |
|
148 | # | | |/ / | | |/ / | |
|
149 | # | o | | into | o / / # <--- fixed nodeline tail | |
|
150 | # | |/ / | |/ / | |
|
151 | # o | | o | | | |
|
152 | fix_nodeline_tail = len(text) <= 2 and not add_padding_line | |
|
154 | 153 | |
|
155 |
|
|
|
156 |
|
|
|
157 |
|
|
|
154 | # nodeline is the line containing the node character (typically o) | |
|
155 | nodeline = ["|", " "] * idx | |
|
156 | nodeline.extend([char, " "]) | |
|
158 | 157 | |
|
159 |
|
|
|
160 |
|
|
|
161 |
|
|
|
158 | nodeline.extend( | |
|
159 | get_nodeline_edges_tail(idx, base[1], ncols, coldiff, | |
|
160 | base[0], fix_nodeline_tail)) | |
|
162 | 161 | |
|
163 |
|
|
|
164 |
|
|
|
165 |
|
|
|
166 |
|
|
|
167 |
|
|
|
168 |
|
|
|
169 |
|
|
|
170 |
|
|
|
171 |
|
|
|
172 |
|
|
|
173 |
|
|
|
174 |
|
|
|
175 |
|
|
|
176 |
|
|
|
162 | # shift_interline is the line containing the non-vertical | |
|
163 | # edges between this entry and the next | |
|
164 | shift_interline = ["|", " "] * idx | |
|
165 | if coldiff == -1: | |
|
166 | n_spaces = 1 | |
|
167 | edge_ch = "/" | |
|
168 | elif coldiff == 0: | |
|
169 | n_spaces = 2 | |
|
170 | edge_ch = "|" | |
|
171 | else: | |
|
172 | n_spaces = 3 | |
|
173 | edge_ch = "\\" | |
|
174 | shift_interline.extend(n_spaces * [" "]) | |
|
175 | shift_interline.extend([edge_ch, " "] * (ncols - idx - 1)) | |
|
177 | 176 | |
|
178 |
|
|
|
179 |
|
|
|
177 | # draw edges from the current node to its parents | |
|
178 | draw_edges(edges, nodeline, shift_interline) | |
|
180 | 179 | |
|
181 |
|
|
|
182 |
|
|
|
183 |
|
|
|
184 |
|
|
|
185 |
|
|
|
180 | # lines is the list of all graph lines to print | |
|
181 | lines = [nodeline] | |
|
182 | if add_padding_line: | |
|
183 | lines.append(get_padding_line(idx, ncols, edges)) | |
|
184 | lines.append(shift_interline) | |
|
186 | 185 | |
|
187 |
|
|
|
188 |
|
|
|
189 |
|
|
|
190 |
|
|
|
191 |
|
|
|
192 |
|
|
|
193 |
|
|
|
194 |
|
|
|
186 | # make sure that there are as many graph lines as there are | |
|
187 | # log strings | |
|
188 | while len(text) < len(lines): | |
|
189 | text.append("") | |
|
190 | if len(lines) < len(text): | |
|
191 | extra_interline = ["|", " "] * (ncols + coldiff) | |
|
192 | while len(lines) < len(text): | |
|
193 | lines.append(extra_interline) | |
|
195 | 194 | |
|
196 |
|
|
|
197 |
|
|
|
198 |
|
|
|
199 |
|
|
|
200 |
|
|
|
195 | # print lines | |
|
196 | indentation_level = max(ncols, ncols + coldiff) | |
|
197 | for (line, logstr) in zip(lines, text): | |
|
198 | ln = "%-*s %s" % (2 * indentation_level, "".join(line), logstr) | |
|
199 | ui.write(ln.rstrip() + '\n') | |
|
201 | 200 | |
|
202 |
|
|
|
203 |
|
|
|
204 |
|
|
|
201 | # ... and start over | |
|
202 | base[0] = coldiff | |
|
203 | base[1] = idx | |
|
205 | 204 | |
|
206 | 205 | def get_revs(repo, rev_opt): |
|
207 | 206 | if rev_opt: |
@@ -217,14 +216,13 b' def check_unsupported_flags(opts):' | |||
|
217 | 216 | if op in opts and opts[op]: |
|
218 | 217 | raise util.Abort(_("--graph option is incompatible with --%s") % op) |
|
219 | 218 | |
|
220 | def generate(dag, displayer, showparents, edgefn): | |
|
221 | seen = [] | |
|
219 | def generate(ui, dag, displayer, showparents, edgefn): | |
|
220 | seen, base = [], [0, 0] | |
|
222 | 221 | for rev, type, ctx, parents in dag: |
|
223 | 222 | char = ctx.node() in showparents and '@' or 'o' |
|
224 | 223 | displayer.show(ctx) |
|
225 | 224 | lines = displayer.hunk.pop(rev).split('\n')[:-1] |
|
226 |
|
|
|
227 | yield cols[0], type, (char, lines), cols[1], cols[2], cols[3] | |
|
225 | ascii(ui, base, type, char, lines, edgefn(seen, rev, parents)) | |
|
228 | 226 | |
|
229 | 227 | def graphlog(ui, repo, path=None, **opts): |
|
230 | 228 | """show revision history alongside an ASCII revision graph |
@@ -252,8 +250,7 b' def graphlog(ui, repo, path=None, **opts' | |||
|
252 | 250 | |
|
253 | 251 | displayer = show_changeset(ui, repo, opts, buffered=True) |
|
254 | 252 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
255 |
|
|
|
256 | ascii(ui, gen) | |
|
253 | generate(ui, revdag, displayer, showparents, asciiedges) | |
|
257 | 254 | |
|
258 | 255 | def graphrevs(repo, nodes, opts): |
|
259 | 256 | limit = cmdutil.loglimit(opts) |
@@ -289,8 +286,7 b' def goutgoing(ui, repo, dest=None, **opt' | |||
|
289 | 286 | revdag = graphrevs(repo, o, opts) |
|
290 | 287 | displayer = show_changeset(ui, repo, opts, buffered=True) |
|
291 | 288 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
292 |
|
|
|
293 | ascii(ui, gen) | |
|
289 | generate(ui, revdag, displayer, showparents, asciiedges) | |
|
294 | 290 | |
|
295 | 291 | def gincoming(ui, repo, source="default", **opts): |
|
296 | 292 | """show the incoming changesets alongside an ASCII revision graph |
@@ -340,8 +336,7 b' def gincoming(ui, repo, source="default"' | |||
|
340 | 336 | revdag = graphrevs(other, chlist, opts) |
|
341 | 337 | displayer = show_changeset(ui, other, opts, buffered=True) |
|
342 | 338 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
343 |
|
|
|
344 | ascii(ui, gen) | |
|
339 | generate(ui, revdag, displayer, showparents, asciiedges) | |
|
345 | 340 | |
|
346 | 341 | finally: |
|
347 | 342 | if hasattr(other, 'close'): |
General Comments 0
You need to be logged in to leave comments.
Login now