1
# Copyright (C) 2005, 2008 Aaron Bentley
2
# <aaron@aaronbentley.com>
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1
from dotgraph import Node, dot_output, invoke_dot, invoke_dot_aa, NoDot, NoRsvg
2
from dotgraph import mail_map
21
3
from bzrlib.branch import Branch
22
from bzrlib.errors import BzrCommandError, NoSuchRevision
23
from bzrlib.graph import node_distances, select_farthest
24
from bzrlib.revision import NULL_REVISION
26
from bzrtools import short_committer
27
from dotgraph import (
41
mail_map = {'aaron.bentley@utoronto.ca' : 'Aaron Bentley',
42
'abentley@panoramicfeedback.com': 'Aaron Bentley',
43
'abentley@lappy' : 'Aaron Bentley',
44
'john@arbash-meinel.com' : 'John Arbash Meinel',
45
'mbp@sourcefrog.net' : 'Martin Pool',
46
'robertc@robertcollins.net' : 'Robert Collins',
49
committer_alias = {'abentley': 'Aaron Bentley'}
4
from bzrlib.errors import BzrCommandError
9
mail_map.update({'aaron.bentley@utoronto.ca' : 'Aaron Bentley',
10
'abentley@panoramicfeedback.com': 'Aaron Bentley',
11
'abentley@lappy' : 'Aaron Bentley',
12
'john@arbash-meinel.com' : 'John Arbash Meinel',
13
'mbp@sourcefrog.net' : 'Martin Pool',
14
'robertc@robertcollins.net' : 'Robert Collins',
17
def add_relations(rev_id):
18
if rev_id in ancestors:
21
if rev_id not in nodes:
22
nodes[rev_id] = Node("n%d" % counter, label = rev_id)
24
revision = branch.get_revision(rev_id)
25
ancestors [rev_id] = []
26
for p in (p.revision_id for p in revision.parents):
28
if p not in descendants:
30
descendants[p].append(rev_id)
31
ancestors [rev_id].append(rev_id)
33
def short_committer(committer):
34
new_committer = re.sub('<.*>', '', committer).strip(' ')
35
if len(new_committer) < 2:
50
39
def can_skip(rev_id, descendants, ancestors):
51
40
if rev_id not in descendants:
53
elif rev_id not in ancestors:
55
42
elif len(ancestors[rev_id]) != 1:
57
elif len(descendants[list(ancestors[rev_id])[0]]) != 1:
44
elif len(descendants[ancestors[rev_id][0]]) != 1:
59
46
elif len(descendants[rev_id]) != 1:
64
def compact_ancestors(descendants, ancestors, exceptions=()):
51
def compact_descendants(descendants, ancestors):
67
for me, my_parents in ancestors.iteritems():
54
for me, my_descendants in descendants.iteritems():
70
new_ancestors[me] = {}
71
for parent in my_parents:
74
while can_skip(new_parent, descendants, ancestors):
75
if new_parent in exceptions:
78
if new_parent in new_ancestors:
79
del new_ancestors[new_parent]
80
new_parent = list(ancestors[new_parent])[0]
82
new_ancestors[me][new_parent] = distance
85
def get_rev_info(rev_id, source):
86
"""Return the committer, message, and date of a revision."""
91
return None, 'Null Revision', None, None
93
rev = source.get_revision(rev_id)
94
except NoSuchRevision:
96
committer = '-'.join(rev_id.split('-')[:-2]).strip(' ')
98
return None, None, None, None
100
return None, None, None, None
102
committer = short_committer(rev.committer)
103
if rev.message is not None:
104
message = rev.message.split('\n')[0]
105
gmtime = time.gmtime(rev.timestamp + (rev.timezone or 0))
106
date = time.strftime('%Y/%m/%d', gmtime)
107
nick = rev.properties.get('branch-nick')
110
committer = mail_map[committer]
114
committer = committer_alias[committer]
117
return committer, message, nick, date
119
class Grapher(object):
121
def __init__(self, branch, other_branch=None):
122
object.__init__(self)
124
self.other_branch = other_branch
125
if other_branch is not None:
126
other_repo = other_branch.repository
127
revision_b = self.other_branch.last_revision()
131
self.graph = self.branch.repository.get_graph(other_repo)
132
revision_a = self.branch.last_revision()
133
self.scan_graph(revision_a, revision_b)
134
self.n_history = branch.revision_history()
135
self.n_revnos = branch.get_revision_id_to_revno_map()
136
self.distances = node_distances(self.descendants, self.ancestors,
138
if other_branch is not None:
139
self.base = select_farthest(self.distances, self.common)
140
self.m_history = other_branch.revision_history()
141
self.m_revnos = other_branch.get_revision_id_to_revno_map()
142
self.new_base = self.graph.find_unique_lca(revision_a,
144
self.lcas = self.graph.find_lca(revision_a, revision_b)
152
def scan_graph(self, revision_a, revision_b):
153
a_ancestors = dict(self.graph.iter_ancestry([revision_a]))
154
self.ancestors = a_ancestors
155
self.root = NULL_REVISION
156
if revision_b is not None:
157
b_ancestors = dict(self.graph.iter_ancestry([revision_b]))
158
self.common = set(a_ancestors.keys())
159
self.common.intersection_update(b_ancestors)
160
self.ancestors.update(b_ancestors)
164
self.descendants = {}
166
for revision, parents in self.ancestors.iteritems():
167
self.descendants.setdefault(revision, [])
170
parents = [NULL_REVISION]
171
for parent in parents:
172
self.descendants.setdefault(parent, []).append(revision)
174
self.ancestors[ghost] = [NULL_REVISION]
177
def _get_revno_str(prefix, revno_map, revision_id):
179
revno = revno_map[revision_id]
182
return '%s%s' % (prefix, '.'.join(str(n) for n in revno))
184
def dot_node(self, node, num):
186
n_rev = self.n_history.index(node) + 1
190
m_rev = self.m_history.index(node) + 1
193
if (n_rev, m_rev) == (None, None):
194
name = self._get_revno_str('r', self.n_revnos, node)
196
name = self._get_revno_str('R', self.m_revnos, node)
201
name = "rR%d" % n_rev
204
for prefix, revno in (('r', n_rev), ('R', m_rev)):
205
if revno is not None:
206
namelist.append("%s%d" % (prefix, revno))
207
name = ' '.join(namelist)
208
if None not in (n_rev, m_rev):
209
cluster = "common_history"
211
elif (None, None) == (n_rev, m_rev):
213
if node in self.common:
217
elif n_rev is not None:
218
cluster = "my_history"
221
assert m_rev is not None
222
cluster = "other_history"
224
if node in self.lcas:
226
if node == self.base:
228
if node == self.new_base:
230
if node == self.new_base:
234
committer, message, nick, date = get_rev_info(node,
235
self.branch.repository)
236
if committer is not None:
237
label.append(committer)
245
if node in self.distances:
246
rank = self.distances[node]
247
label.append('d%d' % self.distances[node])
251
d_node = Node("n%d" % num, color=color, label="\\n".join(label),
252
rev_id=node, cluster=cluster, message=message,
256
if node not in self.ancestors:
257
d_node.node_style.append('dotted')
261
def get_relations(self, collapse=False, max_distance=None):
266
exceptions = self.lcas.union([self.base, self.new_base])
267
visible_ancestors = compact_ancestors(self.descendants,
271
visible_ancestors = {}
272
for revision, parents in self.ancestors.iteritems():
273
visible_ancestors[revision] = dict((p, 0) for p in parents)
274
if max_distance is not None:
275
min_distance = max(self.distances.values()) - max_distance
276
visible_ancestors = dict((n, p) for n, p in
277
visible_ancestors.iteritems() if
278
self.distances[n] >= min_distance)
279
for node, parents in visible_ancestors.iteritems():
280
if node not in dot_nodes:
281
dot_nodes[node] = self.dot_node(node, num)
283
for parent, skipped in parents.iteritems():
284
if parent not in dot_nodes:
285
dot_nodes[parent] = self.dot_node(parent, num)
287
edge = Edge(dot_nodes[parent], dot_nodes[node])
289
edge.label = "%d" % skipped
290
node_relations.append(edge)
291
return node_relations
294
def write_ancestry_file(branch, filename, collapse=True, antialias=True,
295
merge_branch=None, ranking="forced", max_distance=None):
296
b = Branch.open_containing(branch)[0]
297
if merge_branch is not None:
298
m = Branch.open_containing(merge_branch)[0]
306
grapher = Grapher(b, m)
307
relations = grapher.get_relations(collapse, max_distance)
57
new_descendants[me] = []
58
for descendant in my_descendants:
59
new_descendant = descendant
60
while can_skip(new_descendant, descendants, ancestors):
61
skip.add(new_descendant)
62
if new_descendant in new_descendants:
63
del new_descendants[new_descendant]
64
new_descendant = descendants[new_descendant][0]
65
new_descendants[me].append(new_descendant)
66
return new_descendants
69
def graph_ancestry(branch, collapse=True):
71
q = ((i+1, n) for (i, n) in enumerate(branch.revision_history()))
74
branch_name = os.path.basename(branch.base)
75
except AttributeError:
77
for (revno, rev_id) in q:
78
nodes[rev_id] = Node("R%d" % revno, color="#ffff00", rev_id=rev_id,
84
lines = [branch.last_patch()]
88
if rev_id not in nodes:
89
nodes[rev_id] = Node("n%d" % counter, label=rev_id,
94
revision = branch.get_revision(rev_id)
95
except bzrlib.errors.NoSuchRevision:
96
nodes[rev_id].node_style.append('dotted')
98
if nodes[rev_id].committer is None:
99
nodes[rev_id].committer = short_committer(revision.committer)
100
parent_ids = [r.revision_id for r in revision.parents]
101
ancestors [rev_id] = parent_ids
102
for parent in parent_ids:
103
if parent not in ancestors:
104
new_lines.add(parent)
105
descendants[parent] = []
106
descendants[parent].append(rev_id)
111
visible_descendants = compact_descendants(descendants, ancestors)
113
visible_descendants = descendants
115
for key, values in visible_descendants.iteritems():
117
node_relations.append((nodes[key], nodes[value]))
118
return node_relations
120
def write_ancestry_file(branch, filename, collapse=True, antialias=True):
122
relations = graph_ancestry(b, collapse)
314
123
ext = filename.split('.')[-1]
315
output = dot_output(relations, ranking)
317
if ext not in RSVG_OUTPUT_TYPES:
320
output = list(output)
124
if antialias and ext in ('png', 'jpg'):
322
invoke_dot_aa(output, filename, ext)
126
invoke_dot_aa(dot_output(relations), filename, ext)
325
128
raise BzrCommandError("Can't find 'dot'. Please ensure Graphviz"\
326
129
" is installed correctly.")
327
130
except NoRsvg, e:
328
print "Not antialiasing because rsvg (from librsvg-bin) is not"\
331
if ext in DOT_OUTPUT_TYPES and not antialias and not done:
333
invoke_dot(output, filename, ext)
336
raise BzrCommandError("Can't find 'dot'. Please ensure Graphviz"\
337
" is installed correctly.")
338
elif ext == 'dot' and not done:
339
my_file = file(filename, 'wb')
340
for fragment in output:
341
my_file.write(fragment.encode('utf-8'))
344
invoke_dot_html(output, filename)
346
raise BzrCommandError("Can't find 'dot'. Please ensure Graphviz"\
347
" is installed correctly.")
131
raise BzrCommandError("Can't find 'rsvg'. Please ensure "\
132
"librsvg-bin is installed correctly, or use --noantialias.")
133
elif ext in ('svg', 'svgz', 'gif', 'jpg', 'ps', 'fig', 'mif', 'png'):
135
invoke_dot(dot_output(relations), filename, ext)
137
raise BzrCommandError("Can't find 'dot'. Please ensure Graphviz"\
138
" is installed correctly, or use --noantialias")
140
file(filename, 'wb').write("".join(list(dot_output(relations))))
349
142
print "Unknown file extension: %s" % ext
added
removed
graph.py
