Mercurial > hg
annotate hgext/graphlog.py @ 6061:de08788511d7
test-keyword: make it run under Windows
- don't cat symlink, content differs
- rewrite OS specific messages
- generate symlink with a bundle
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 09 Feb 2008 20:17:09 +0100 |
parents | 6dcc190ffc36 |
children | cd65a67aff31 |
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. | |
7 | |
5938
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
8 import os |
4344 | 9 import sys |
10 from mercurial.cmdutil import revrange, show_changeset | |
11 from mercurial.i18n import _ | |
12 from mercurial.node import nullid, nullrev | |
5938
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
13 from mercurial.util import Abort, canonpath |
4344 | 14 |
15 def revision_grapher(repo, start_rev, stop_rev): | |
16 """incremental revision grapher | |
17 | |
18 This generator function walks through the revision history from | |
19 revision start_rev to revision stop_rev (which must be less than | |
20 or equal to start_rev) and for each revision emits tuples with the | |
21 following elements: | |
22 | |
23 - Current revision. | |
24 - Current node. | |
25 - Column of the current node in the set of ongoing edges. | |
26 - Edges; a list of (col, next_col) indicating the edges between | |
27 the current node and its parents. | |
28 - Number of columns (ongoing edges) in the current revision. | |
29 - The difference between the number of columns (ongoing edges) | |
30 in the next revision and the number of columns (ongoing edges) | |
31 in the current revision. That is: -1 means one column removed; | |
32 0 means no columns added or removed; 1 means one column added. | |
33 """ | |
34 | |
35 assert start_rev >= stop_rev | |
36 curr_rev = start_rev | |
37 revs = [] | |
38 while curr_rev >= stop_rev: | |
39 node = repo.changelog.node(curr_rev) | |
40 | |
41 # Compute revs and next_revs. | |
42 if curr_rev not in revs: | |
43 # New head. | |
44 revs.append(curr_rev) | |
45 rev_index = revs.index(curr_rev) | |
46 next_revs = revs[:] | |
47 | |
48 # Add parents to next_revs. | |
49 parents = get_rev_parents(repo, curr_rev) | |
50 parents_to_add = [] | |
51 for parent in parents: | |
52 if parent not in next_revs: | |
53 parents_to_add.append(parent) | |
54 parents_to_add.sort() | |
55 next_revs[rev_index:rev_index + 1] = parents_to_add | |
56 | |
57 edges = [] | |
58 for parent in parents: | |
59 edges.append((rev_index, next_revs.index(parent))) | |
60 | |
61 n_columns_diff = len(next_revs) - len(revs) | |
62 yield (curr_rev, node, rev_index, edges, len(revs), n_columns_diff) | |
63 | |
64 revs = next_revs | |
65 curr_rev -= 1 | |
66 | |
5938
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
67 def filelog_grapher(repo, path, start_rev, stop_rev): |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
68 """incremental file log grapher |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
69 |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
70 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
|
71 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
|
72 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
|
73 tuples with the following elements: |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
74 |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
75 - Current revision. |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
76 - Current node. |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
77 - 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
|
78 - 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
|
79 the current node and its parents. |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
80 - Number of columns (ongoing edges) in the current revision. |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
81 - The difference between the number of columns (ongoing edges) |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
82 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
|
83 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
|
84 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
|
85 """ |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
86 |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
87 assert start_rev >= stop_rev |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
88 curr_rev = start_rev |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
89 revs = [] |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
90 filerev = repo.file(path).count() - 1 |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
91 while filerev >= 0: |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
92 fctx = repo.filectx(path, fileid=filerev) |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
93 |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
94 # Compute revs and next_revs. |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
95 if filerev not in revs: |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
96 revs.append(filerev) |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
97 rev_index = revs.index(filerev) |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
98 next_revs = revs[:] |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
99 |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
100 # Add parents to next_revs. |
5968
6dcc190ffc36
graphlog: skip filectx parents in other filelogs
Steve Borho <steve@borho.org>
parents:
5942
diff
changeset
|
101 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
|
102 parents_to_add = [] |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
103 for parent in parents: |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
104 if parent not in next_revs: |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
105 parents_to_add.append(parent) |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
106 parents_to_add.sort() |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
107 next_revs[rev_index:rev_index + 1] = parents_to_add |
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: | |
199 return (repo.changelog.count() - 1, 0) | |
200 | |
5938
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
201 def graphlog(ui, repo, path=None, **opts): |
4344 | 202 """show revision history alongside an ASCII revision graph |
203 | |
204 Print a revision history alongside a revision graph drawn with | |
205 ASCII characters. | |
206 | |
4583
11cf78983961
Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4516
diff
changeset
|
207 Nodes printed as an @ character are parents of the working |
4344 | 208 directory. |
209 """ | |
210 | |
211 limit = get_limit(opts["limit"]) | |
212 (start_rev, stop_rev) = get_revs(repo, opts["rev"]) | |
213 stop_rev = max(stop_rev, start_rev - limit + 1) | |
214 if start_rev == nullrev: | |
215 return | |
216 cs_printer = show_changeset(ui, repo, opts) | |
5938
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
217 if path: |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
218 cpath = canonpath(repo.root, os.getcwd(), path) |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
219 grapher = filelog_grapher(repo, cpath, start_rev, stop_rev) |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
220 else: |
9ed100559851
graphlog: add filelog revision grapher
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
221 grapher = revision_grapher(repo, start_rev, stop_rev) |
4344 | 222 repo_parents = repo.dirstate.parents() |
223 prev_n_columns_diff = 0 | |
224 prev_node_index = 0 | |
225 | |
226 for (rev, node, node_index, edges, n_columns, n_columns_diff) in grapher: | |
227 # log_strings is the list of all log strings to draw alongside | |
228 # the graph. | |
229 ui.pushbuffer() | |
230 cs_printer.show(rev, node) | |
231 log_strings = ui.popbuffer().split("\n")[:-1] | |
232 | |
233 if n_columns_diff == -1: | |
234 # Transform | |
235 # | |
236 # | | | | | | | |
237 # o | | into o---+ | |
238 # |X / |/ / | |
239 # | | | | | |
240 fix_long_right_edges(edges) | |
241 | |
242 # add_padding_line says whether to rewrite | |
243 # | |
244 # | | | | | | | | | |
245 # | o---+ into | o---+ | |
246 # | / / | | | # <--- padding line | |
247 # o | | | / / | |
248 # o | | | |
4633
ff7253a0d1da
Cleanup of whitespace, indentation and line continuation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
249 add_padding_line = (len(log_strings) > 2 and |
ff7253a0d1da
Cleanup of whitespace, indentation and line continuation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
250 n_columns_diff == -1 and |
ff7253a0d1da
Cleanup of whitespace, indentation and line continuation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
251 [x for (x, y) in edges if x + 1 < y]) |
4344 | 252 |
253 # fix_nodeline_tail says whether to rewrite | |
254 # | |
255 # | | o | | | | o | | | |
256 # | | |/ / | | |/ / | |
257 # | o | | into | o / / # <--- fixed nodeline tail | |
258 # | |/ / | |/ / | |
259 # o | | o | | | |
260 fix_nodeline_tail = len(log_strings) <= 2 and not add_padding_line | |
261 | |
4583
11cf78983961
Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4516
diff
changeset
|
262 # nodeline is the line containing the node character (@ or o). |
4344 | 263 nodeline = ["|", " "] * node_index |
264 if node in repo_parents: | |
4583
11cf78983961
Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4516
diff
changeset
|
265 node_ch = "@" |
4344 | 266 else: |
267 node_ch = "o" | |
268 nodeline.extend([node_ch, " "]) | |
269 | |
270 nodeline.extend( | |
271 get_nodeline_edges_tail( | |
272 node_index, prev_node_index, n_columns, n_columns_diff, | |
273 prev_n_columns_diff, fix_nodeline_tail)) | |
274 | |
275 # shift_interline is the line containing the non-vertical | |
276 # edges between this entry and the next. | |
277 shift_interline = ["|", " "] * node_index | |
278 if n_columns_diff == -1: | |
279 n_spaces = 1 | |
280 edge_ch = "/" | |
281 elif n_columns_diff == 0: | |
282 n_spaces = 2 | |
283 edge_ch = "|" | |
284 else: | |
285 n_spaces = 3 | |
286 edge_ch = "\\" | |
287 shift_interline.extend(n_spaces * [" "]) | |
288 shift_interline.extend([edge_ch, " "] * (n_columns - node_index - 1)) | |
289 | |
290 # Draw edges from the current node to its parents. | |
291 draw_edges(edges, nodeline, shift_interline) | |
292 | |
293 # lines is the list of all graph lines to print. | |
294 lines = [nodeline] | |
295 if add_padding_line: | |
296 lines.append(get_padding_line(node_index, n_columns, edges)) | |
297 lines.append(shift_interline) | |
298 | |
299 # Make sure that there are as many graph lines as there are | |
300 # log strings. | |
301 while len(log_strings) < len(lines): | |
302 log_strings.append("") | |
303 if len(lines) < len(log_strings): | |
304 extra_interline = ["|", " "] * (n_columns + n_columns_diff) | |
305 while len(lines) < len(log_strings): | |
306 lines.append(extra_interline) | |
307 | |
308 # Print lines. | |
309 indentation_level = max(n_columns, n_columns + n_columns_diff) | |
310 for (line, logstr) in zip(lines, log_strings): | |
311 ui.write(format_line(line, indentation_level, logstr)) | |
312 | |
313 # ...and start over. | |
314 prev_node_index = node_index | |
315 prev_n_columns_diff = n_columns_diff | |
316 | |
317 cmdtable = { | |
318 "glog": | |
4730
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4633
diff
changeset
|
319 (graphlog, |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4633
diff
changeset
|
320 [('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
|
321 ('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
|
322 ('r', 'rev', [], _('show the specified revision or range')), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4633
diff
changeset
|
323 ('', 'style', '', _('display using template map file')), |
eadfaa9ec487
Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4633
diff
changeset
|
324 ('', 'template', '', _('display with template'))], |
5942
b75105de8573
glog shows at most one file: correct synopsis
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5940
diff
changeset
|
325 _('hg glog [OPTION]... [FILE]')), |
4344 | 326 } |