Mercurial > public > mercurial-scm > hg-stable
annotate hgext/graphlog.py @ 7325:f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
This allows extensions like pbranch to use asciigraph() to graph dependencies
for patch branches, but could be used for basically any DAG.
| author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
|---|---|
| date | Fri, 07 Nov 2008 10:37:20 +0100 |
| parents | 3a2cbf68e2f1 |
| children | ba7ab8c4a577 |
| rev | line source |
|---|---|
| 4344 | 1 # ASCII graph log extension for Mercurial |
| 2 # | |
| 3 # Copyright 2007 Joel Rosdahl <joel@rosdahl.net> | |
|
4516
96d8a56d4ef9
Removed trailing whitespace and tabs from python files
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4509
diff
changeset
|
4 # |
| 4344 | 5 # This software may be used and distributed according to the terms of |
| 6 # the GNU General Public License, incorporated herein by reference. | |
|
6666
53465a7464e2
convert comments to docstrings in a bunch of extensions
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6212
diff
changeset
|
7 '''show revision graphs in terminal windows''' |
| 4344 | 8 |
|
5938
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
9 import os |
| 4344 | 10 import sys |
| 11 from mercurial.cmdutil import revrange, show_changeset | |
|
6192
cd65a67aff31
Introduce templateopts and logopts to reduce duplicate option definitions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5968
diff
changeset
|
12 from mercurial.commands import templateopts |
| 4344 | 13 from mercurial.i18n import _ |
| 6212 | 14 from mercurial.node import nullrev |
|
5938
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
15 from mercurial.util import Abort, canonpath |
| 6762 | 16 from mercurial import util |
| 4344 | 17 |
| 18 def revision_grapher(repo, start_rev, stop_rev): | |
| 19 """incremental revision grapher | |
| 20 | |
| 21 This generator function walks through the revision history from | |
| 22 revision start_rev to revision stop_rev (which must be less than | |
| 23 or equal to start_rev) and for each revision emits tuples with the | |
| 24 following elements: | |
| 25 | |
| 26 - Current revision. | |
| 27 - Current node. | |
| 28 - Column of the current node in the set of ongoing edges. | |
| 29 - Edges; a list of (col, next_col) indicating the edges between | |
| 30 the current node and its parents. | |
| 31 - Number of columns (ongoing edges) in the current revision. | |
| 32 - The difference between the number of columns (ongoing edges) | |
| 33 in the next revision and the number of columns (ongoing edges) | |
| 34 in the current revision. That is: -1 means one column removed; | |
| 35 0 means no columns added or removed; 1 means one column added. | |
| 36 """ | |
| 37 | |
| 38 assert start_rev >= stop_rev | |
| 39 curr_rev = start_rev | |
| 40 revs = [] | |
| 41 while curr_rev >= stop_rev: | |
| 42 node = repo.changelog.node(curr_rev) | |
| 43 | |
| 44 # Compute revs and next_revs. | |
| 45 if curr_rev not in revs: | |
| 46 # New head. | |
| 47 revs.append(curr_rev) | |
| 48 rev_index = revs.index(curr_rev) | |
| 49 next_revs = revs[:] | |
| 50 | |
| 51 # Add parents to next_revs. | |
| 52 parents = get_rev_parents(repo, curr_rev) | |
| 53 parents_to_add = [] | |
| 54 for parent in parents: | |
| 55 if parent not in next_revs: | |
| 56 parents_to_add.append(parent) | |
| 6762 | 57 next_revs[rev_index:rev_index + 1] = util.sort(parents_to_add) |
| 4344 | 58 |
| 59 edges = [] | |
| 60 for parent in parents: | |
| 61 edges.append((rev_index, next_revs.index(parent))) | |
| 62 | |
| 63 n_columns_diff = len(next_revs) - len(revs) | |
| 64 yield (curr_rev, node, rev_index, edges, len(revs), n_columns_diff) | |
| 65 | |
| 66 revs = next_revs | |
| 67 curr_rev -= 1 | |
| 68 | |
|
5938
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
69 def filelog_grapher(repo, path, start_rev, stop_rev): |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
70 """incremental file log grapher |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
71 |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
72 This generator function walks through the revision history of a |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
73 single file from revision start_rev to revision stop_rev (which must |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
74 be less than or equal to start_rev) and for each revision emits |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
75 tuples with the following elements: |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
76 |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
77 - Current revision. |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
78 - Current node. |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
79 - Column of the current node in the set of ongoing edges. |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
80 - Edges; a list of (col, next_col) indicating the edges between |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
81 the current node and its parents. |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
82 - Number of columns (ongoing edges) in the current revision. |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
83 - The difference between the number of columns (ongoing edges) |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
84 in the next revision and the number of columns (ongoing edges) |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
85 in the current revision. That is: -1 means one column removed; |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
86 0 means no columns added or removed; 1 means one column added. |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
87 """ |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
88 |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
89 assert start_rev >= stop_rev |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
90 revs = [] |
|
6750
fb42030d79d6
add __len__ and __iter__ methods to repo and revlog
Matt Mackall <mpm@selenic.com>
parents:
6666
diff
changeset
|
91 filerev = len(repo.file(path)) - 1 |
|
5938
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
92 while filerev >= 0: |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
93 fctx = repo.filectx(path, fileid=filerev) |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
94 |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
95 # Compute revs and next_revs. |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
96 if filerev not in revs: |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
97 revs.append(filerev) |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
98 rev_index = revs.index(filerev) |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
99 next_revs = revs[:] |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
100 |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
101 # Add parents to next_revs. |
|
5968
6dcc190ffc36
graphlog: skip filectx parents in other filelogs
Steve Borho <steve@borho.org>
parents:
5942
diff
changeset
|
102 parents = [f.filerev() for f in fctx.parents() if f.path() == path] |
|
5938
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
103 parents_to_add = [] |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
104 for parent in parents: |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
105 if parent not in next_revs: |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
106 parents_to_add.append(parent) |
| 6762 | 107 next_revs[rev_index:rev_index + 1] = util.sort(parents_to_add) |
|
5938
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
108 |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
109 edges = [] |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
110 for parent in parents: |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
111 edges.append((rev_index, next_revs.index(parent))) |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
112 |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
113 changerev = fctx.linkrev() |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
114 if changerev <= start_rev: |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
115 node = repo.changelog.node(changerev) |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
116 n_columns_diff = len(next_revs) - len(revs) |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
117 yield (changerev, node, rev_index, edges, len(revs), n_columns_diff) |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
118 if changerev <= stop_rev: |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
119 break |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
120 revs = next_revs |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
121 filerev -= 1 |
|
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
122 |
| 4344 | 123 def get_rev_parents(repo, rev): |
| 124 return [x for x in repo.changelog.parentrevs(rev) if x != nullrev] | |
| 125 | |
| 126 def fix_long_right_edges(edges): | |
| 127 for (i, (start, end)) in enumerate(edges): | |
| 128 if end > start: | |
| 129 edges[i] = (start, end + 1) | |
| 130 | |
| 131 def draw_edges(edges, nodeline, interline): | |
| 132 for (start, end) in edges: | |
| 133 if start == end + 1: | |
| 134 interline[2 * end + 1] = "/" | |
| 135 elif start == end - 1: | |
| 136 interline[2 * start + 1] = "\\" | |
| 137 elif start == end: | |
| 138 interline[2 * start] = "|" | |
| 139 else: | |
| 140 nodeline[2 * end] = "+" | |
| 141 if start > end: | |
| 142 (start, end) = (end,start) | |
| 143 for i in range(2 * start + 1, 2 * end): | |
| 144 if nodeline[i] != "+": | |
| 145 nodeline[i] = "-" | |
| 146 | |
| 147 def format_line(line, level, logstr): | |
| 148 text = "%-*s %s" % (2 * level, "".join(line), logstr) | |
| 149 return "%s\n" % text.rstrip() | |
| 150 | |
| 151 def get_nodeline_edges_tail( | |
| 152 node_index, p_node_index, n_columns, n_columns_diff, p_diff, fix_tail): | |
| 153 if fix_tail and n_columns_diff == p_diff and n_columns_diff != 0: | |
| 154 # Still going in the same non-vertical direction. | |
| 155 if n_columns_diff == -1: | |
| 156 start = max(node_index + 1, p_node_index) | |
| 157 tail = ["|", " "] * (start - node_index - 1) | |
| 158 tail.extend(["/", " "] * (n_columns - start)) | |
| 159 return tail | |
| 160 else: | |
| 161 return ["\\", " "] * (n_columns - node_index - 1) | |
| 162 else: | |
| 163 return ["|", " "] * (n_columns - node_index - 1) | |
| 164 | |
| 165 def get_padding_line(ni, n_columns, edges): | |
| 166 line = [] | |
| 167 line.extend(["|", " "] * ni) | |
| 168 if (ni, ni - 1) in edges or (ni, ni) in edges: | |
| 169 # (ni, ni - 1) (ni, ni) | |
| 170 # | | | | | | | | | |
| 171 # +---o | | o---+ | |
| 172 # | | c | | c | | | |
| 173 # | |/ / | |/ / | |
| 174 # | | | | | | | |
| 175 c = "|" | |
| 176 else: | |
| 177 c = " " | |
| 178 line.extend([c, " "]) | |
| 179 line.extend(["|", " "] * (n_columns - ni - 1)) | |
| 180 return line | |
| 181 | |
| 182 def get_limit(limit_opt): | |
| 183 if limit_opt: | |
| 184 try: | |
| 185 limit = int(limit_opt) | |
| 186 except ValueError: | |
| 187 raise Abort(_("limit must be a positive integer")) | |
| 188 if limit <= 0: | |
| 189 raise Abort(_("limit must be positive")) | |
| 190 else: | |
| 191 limit = sys.maxint | |
| 192 return limit | |
| 193 | |
| 194 def get_revs(repo, rev_opt): | |
| 195 if rev_opt: | |
| 196 revs = revrange(repo, rev_opt) | |
| 197 return (max(revs), min(revs)) | |
| 198 else: | |
|
6750
fb42030d79d6
add __len__ and __iter__ methods to repo and revlog
Matt Mackall <mpm@selenic.com>
parents:
6666
diff
changeset
|
199 return (len(repo) - 1, 0) |
| 4344 | 200 |
|
7325
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
201 def ascii(ui, grapher): |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
202 """prints an ASCII graph of the DAG returned by the grapher |
| 4344 | 203 |
|
7325
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
204 grapher is a generator that emits tuples with the following elements: |
| 4344 | 205 |
|
7325
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
206 - Character to use as node's symbol. |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
207 - List of lines to display as the node's text. |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
208 - Column of the current node in the set of ongoing edges. |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
209 - Edges; a list of (col, next_col) indicating the edges between |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
210 the current node and its parents. |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
211 - Number of columns (ongoing edges) in the current revision. |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
212 - The difference between the number of columns (ongoing edges) |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
213 in the next revision and the number of columns (ongoing edges) |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
214 in the current revision. That is: -1 means one column removed; |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
215 0 means no columns added or removed; 1 means one column added. |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
216 """ |
| 4344 | 217 prev_n_columns_diff = 0 |
| 218 prev_node_index = 0 | |
|
7325
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
219 for (node_ch, node_lines, node_index, edges, n_columns, n_columns_diff) in grapher: |
|
7324
3a2cbf68e2f1
graphlog: rename some vars prior to refactoring
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7323
diff
changeset
|
220 # node_lines is the list of all text lines to draw alongside the graph |
| 4344 | 221 |
| 222 if n_columns_diff == -1: | |
| 223 # Transform | |
| 224 # | |
| 225 # | | | | | | | |
| 226 # o | | into o---+ | |
| 227 # |X / |/ / | |
| 228 # | | | | | |
| 229 fix_long_right_edges(edges) | |
| 230 | |
| 231 # add_padding_line says whether to rewrite | |
| 232 # | |
| 233 # | | | | | | | | | |
| 234 # | o---+ into | o---+ | |
| 235 # | / / | | | # <--- padding line | |
| 236 # o | | | / / | |
| 237 # o | | | |
|
7324
3a2cbf68e2f1
graphlog: rename some vars prior to refactoring
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7323
diff
changeset
|
238 add_padding_line = (len(node_lines) > 2 and |
|
4633
ff7253a0d1da
Cleanup of whitespace, indentation and line continuation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
239 n_columns_diff == -1 and |
|
ff7253a0d1da
Cleanup of whitespace, indentation and line continuation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
240 [x for (x, y) in edges if x + 1 < y]) |
| 4344 | 241 |
| 242 # fix_nodeline_tail says whether to rewrite | |
| 243 # | |
| 244 # | | o | | | | o | | | |
| 245 # | | |/ / | | |/ / | |
| 246 # | o | | into | o / / # <--- fixed nodeline tail | |
| 247 # | |/ / | |/ / | |
| 248 # o | | o | | | |
|
7324
3a2cbf68e2f1
graphlog: rename some vars prior to refactoring
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7323
diff
changeset
|
249 fix_nodeline_tail = len(node_lines) <= 2 and not add_padding_line |
| 4344 | 250 |
|
7323
1c9f7aa7c8a5
graphlog: make some comment lines more like others in punctuation
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7280
diff
changeset
|
251 # nodeline is the line containing the node character (typically o) |
| 4344 | 252 nodeline = ["|", " "] * node_index |
| 253 nodeline.extend([node_ch, " "]) | |
| 254 | |
| 255 nodeline.extend( | |
| 256 get_nodeline_edges_tail( | |
| 257 node_index, prev_node_index, n_columns, n_columns_diff, | |
| 258 prev_n_columns_diff, fix_nodeline_tail)) | |
| 259 | |
| 260 # shift_interline is the line containing the non-vertical | |
|
7323
1c9f7aa7c8a5
graphlog: make some comment lines more like others in punctuation
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7280
diff
changeset
|
261 # edges between this entry and the next |
| 4344 | 262 shift_interline = ["|", " "] * node_index |
| 263 if n_columns_diff == -1: | |
| 264 n_spaces = 1 | |
| 265 edge_ch = "/" | |
| 266 elif n_columns_diff == 0: | |
| 267 n_spaces = 2 | |
| 268 edge_ch = "|" | |
| 269 else: | |
| 270 n_spaces = 3 | |
| 271 edge_ch = "\\" | |
| 272 shift_interline.extend(n_spaces * [" "]) | |
| 273 shift_interline.extend([edge_ch, " "] * (n_columns - node_index - 1)) | |
| 274 | |
|
7323
1c9f7aa7c8a5
graphlog: make some comment lines more like others in punctuation
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7280
diff
changeset
|
275 # draw edges from the current node to its parents |
| 4344 | 276 draw_edges(edges, nodeline, shift_interline) |
| 277 | |
|
7323
1c9f7aa7c8a5
graphlog: make some comment lines more like others in punctuation
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7280
diff
changeset
|
278 # lines is the list of all graph lines to print |
| 4344 | 279 lines = [nodeline] |
| 280 if add_padding_line: | |
| 281 lines.append(get_padding_line(node_index, n_columns, edges)) | |
| 282 lines.append(shift_interline) | |
| 283 | |
|
7323
1c9f7aa7c8a5
graphlog: make some comment lines more like others in punctuation
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7280
diff
changeset
|
284 # make sure that there are as many graph lines as there are |
|
1c9f7aa7c8a5
graphlog: make some comment lines more like others in punctuation
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7280
diff
changeset
|
285 # log strings |
|
7324
3a2cbf68e2f1
graphlog: rename some vars prior to refactoring
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7323
diff
changeset
|
286 while len(node_lines) < len(lines): |
|
3a2cbf68e2f1
graphlog: rename some vars prior to refactoring
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7323
diff
changeset
|
287 node_lines.append("") |
|
3a2cbf68e2f1
graphlog: rename some vars prior to refactoring
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7323
diff
changeset
|
288 if len(lines) < len(node_lines): |
| 4344 | 289 extra_interline = ["|", " "] * (n_columns + n_columns_diff) |
|
7324
3a2cbf68e2f1
graphlog: rename some vars prior to refactoring
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7323
diff
changeset
|
290 while len(lines) < len(node_lines): |
| 4344 | 291 lines.append(extra_interline) |
| 292 | |
|
7323
1c9f7aa7c8a5
graphlog: make some comment lines more like others in punctuation
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7280
diff
changeset
|
293 # print lines |
| 4344 | 294 indentation_level = max(n_columns, n_columns + n_columns_diff) |
|
7324
3a2cbf68e2f1
graphlog: rename some vars prior to refactoring
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7323
diff
changeset
|
295 for (line, logstr) in zip(lines, node_lines): |
| 4344 | 296 ui.write(format_line(line, indentation_level, logstr)) |
| 297 | |
|
7323
1c9f7aa7c8a5
graphlog: make some comment lines more like others in punctuation
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7280
diff
changeset
|
298 # ... and start over |
| 4344 | 299 prev_node_index = node_index |
| 300 prev_n_columns_diff = n_columns_diff | |
| 301 | |
|
7325
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
302 def graphlog(ui, repo, path=None, **opts): |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
303 """show revision history alongside an ASCII revision graph |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
304 |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
305 Print a revision history alongside a revision graph drawn with |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
306 ASCII characters. |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
307 |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
308 Nodes printed as an @ character are parents of the working |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
309 directory. |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
310 """ |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
311 |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
312 limit = get_limit(opts["limit"]) |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
313 (start_rev, stop_rev) = get_revs(repo, opts["rev"]) |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
314 stop_rev = max(stop_rev, start_rev - limit + 1) |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
315 if start_rev == nullrev: |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
316 return |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
317 if path: |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
318 path = canonpath(repo.root, os.getcwd(), path) |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
319 if path: |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
320 revgrapher = filelog_grapher(repo, path, start_rev, stop_rev) |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
321 else: |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
322 revgrapher = revision_grapher(repo, start_rev, stop_rev) |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
323 |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
324 repo_parents = repo.dirstate.parents() |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
325 cs_printer = show_changeset(ui, repo, opts) |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
326 def grapher(): |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
327 for (rev, node, node_index, edges, n_columns, n_columns_diff) in revgrapher: |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
328 # log_strings is the list of all log strings to draw alongside |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
329 # the graph. |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
330 ui.pushbuffer() |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
331 cs_printer.show(rev, node) |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
332 log_strings = ui.popbuffer().split("\n")[:-1] |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
333 if node in repo_parents: |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
334 node_ch = "@" |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
335 else: |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
336 node_ch = "o" |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
337 yield (node_ch, log_strings, node_index, edges, n_columns, n_columns_diff) |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
338 |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
339 ascii(ui, grapher()) |
|
f9985108d4e4
graphlog: split the actual DAG grapher out into a separate method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7324
diff
changeset
|
340 |
| 4344 | 341 cmdtable = { |
| 342 "glog": | |
|
4730
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4633
diff
changeset
|
343 (graphlog, |
|
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4633
diff
changeset
|
344 [('l', 'limit', '', _('limit number of changes displayed')), |
|
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4633
diff
changeset
|
345 ('p', 'patch', False, _('show patch')), |
|
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4633
diff
changeset
|
346 ('r', 'rev', [], _('show the specified revision or range')), |
|
6192
cd65a67aff31
Introduce templateopts and logopts to reduce duplicate option definitions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5968
diff
changeset
|
347 ] + templateopts, |
|
5942
b75105de8573
glog shows at most one file: correct synopsis
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5940
diff
changeset
|
348 _('hg glog [OPTION]... [FILE]')), |
| 4344 | 349 } |