14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from bzrtools import short_committer
18
17
from dotgraph import Node, dot_output, invoke_dot, invoke_dot_aa, NoDot, NoRsvg
19
18
from dotgraph import RSVG_OUTPUT_TYPES, DOT_OUTPUT_TYPES, Edge, invoke_dot_html
20
19
from bzrlib.branch import Branch
21
20
from bzrlib.errors import BzrCommandError, NoCommonRoot, NoSuchRevision
21
from bzrlib.fetch import greedy_fetch
22
22
from bzrlib.graph import node_distances, select_farthest
23
23
from bzrlib.revision import combined_graph, revision_graph
24
24
from bzrlib.revision import MultipleRevisionSources
38
38
committer_alias = {'abentley': 'Aaron Bentley'}
39
def short_committer(committer):
40
new_committer = re.sub('<.*>', '', committer).strip(' ')
41
if len(new_committer) < 2:
39
45
def can_skip(rev_id, descendants, ancestors):
40
46
if rev_id not in descendants:
56
62
for me, my_parents in ancestors.iteritems():
59
new_ancestors[me] = {}
65
new_ancestors[me] = {}
60
66
for parent in my_parents:
63
69
while can_skip(new_parent, descendants, ancestors):
64
70
if new_parent in exceptions:
69
75
new_parent = list(ancestors[new_parent])[0]
71
77
new_ancestors[me][new_parent] = distance
74
80
def get_rev_info(rev_id, source):
75
81
"""Return the committer, message, and date of a revision."""
79
85
if rev_id == 'null:':
80
return None, 'Null Revision', None, None
86
return None, 'Null Revision', None
82
88
rev = source.get_revision(rev_id)
83
89
except NoSuchRevision:
85
91
committer = '-'.join(rev_id.split('-')[:-2]).strip(' ')
86
92
if committer == '':
87
return None, None, None, None
93
return None, None, None
89
return None, None, None, None
95
return None, None, None
91
97
committer = short_committer(rev.committer)
92
98
if rev.message is not None:
93
99
message = rev.message.split('\n')[0]
94
100
gmtime = time.gmtime(rev.timestamp + (rev.timezone or 0))
95
101
date = time.strftime('%Y/%m/%d', gmtime)
96
nick = rev.properties.get('branch-nick')
97
102
if '@' in committer:
99
104
committer = mail_map[committer]
103
108
committer = committer_alias[committer]
106
return committer, message, nick, date
111
return committer, message, date
108
113
class Grapher(object):
109
114
def __init__(self, branch, other_branch=None):
112
117
self.other_branch = other_branch
113
118
revision_a = self.branch.last_revision()
114
119
if other_branch is not None:
115
branch.fetch(other_branch)
120
greedy_fetch(branch, other_branch)
116
121
revision_b = self.other_branch.last_revision()
118
123
self.root, self.ancestors, self.descendants, self.common = \
119
combined_graph(revision_a, revision_b,
120
self.branch.repository)
124
combined_graph(revision_a, revision_b, self.branch)
121
125
except bzrlib.errors.NoCommonRoot:
122
126
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
124
128
self.root, self.ancestors, self.descendants = \
125
revision_graph(revision_a, branch.repository)
129
revision_graph(revision_a, branch)
128
132
self.n_history = branch.revision_history()
129
self.distances = node_distances(self.descendants, self.ancestors,
133
self.distances = node_distances(self.descendants, self.ancestors,
131
135
if other_branch is not None:
132
136
self.base = select_farthest(self.distances, self.common)
133
self.m_history = other_branch.revision_history()
134
new_graph = getattr(branch.repository, 'get_graph', lambda: None)()
135
if new_graph is None:
139
self.new_base = new_graph.find_unique_lca(revision_a,
141
self.lcas = new_graph.find_lca(revision_a, revision_b)
137
self.m_history = other_branch.revision_history()
146
140
self.m_history = []
148
142
def dot_node(self, node, num):
181
175
assert m_rev is not None
182
176
cluster = "other_history"
183
177
color = "#ff0000"
184
if node in self.lcas:
186
178
if node == self.base:
188
if node == self.new_base:
190
if node == self.new_base:
194
committer, message, nick, date = get_rev_info(node,
195
self.branch.repository)
182
committer, message, date = get_rev_info(node, self.branch)
196
183
if committer is not None:
197
184
label.append(committer)
202
186
if date is not None:
203
187
label.append(date)
211
d_node = Node("n%d" % num, color=color, label="\\n".join(label),
195
d_node = Node("n%d" % num, color=color, label="\\n".join(label),
212
196
rev_id=node, cluster=cluster, message=message,
214
198
d_node.rank = rank
217
201
d_node.node_style.append('dotted')
221
def get_relations(self, collapse=False, max_distance=None):
205
def get_relations(self, collapse=False):
223
207
node_relations = []
226
exceptions = self.lcas.union([self.base, self.new_base])
227
visible_ancestors = compact_ancestors(self.descendants,
210
visible_ancestors = compact_ancestors(self.descendants,
211
self.ancestors, (self.base,))
231
visible_ancestors = {}
232
for revision, parents in self.ancestors.iteritems():
233
visible_ancestors[revision] = dict((p, 0) for p in parents)
234
if max_distance is not None:
235
min_distance = max(self.distances.values()) - max_distance
236
visible_ancestors = dict((n, p) for n, p in
237
visible_ancestors.iteritems() if
238
self.distances[n] >= min_distance)
213
visible_ancestors = self.ancestors
239
214
for node, parents in visible_ancestors.iteritems():
240
215
if node not in dot_nodes:
241
216
dot_nodes[node] = self.dot_node(node, num)
243
for parent, skipped in parents.iteritems():
218
if visible_ancestors is self.ancestors:
219
parent_iter = ((f, 0) for f in parents)
221
parent_iter = (f for f in parents.iteritems())
222
for parent, skipped in parent_iter:
244
223
if parent not in dot_nodes:
245
224
dot_nodes[parent] = self.dot_node(parent, num)
254
233
def write_ancestry_file(branch, filename, collapse=True, antialias=True,
255
merge_branch=None, ranking="forced", max_distance=None):
234
merge_branch=None, ranking="forced"):
256
235
b = Branch.open_containing(branch)[0]
257
236
if merge_branch is not None:
258
237
m = Branch.open_containing(merge_branch)[0]
263
242
if m is not None:
266
245
grapher = Grapher(b, m)
267
relations = grapher.get_relations(collapse, max_distance)
246
relations = grapher.get_relations(collapse)
269
248
if m is not None:
298
277
elif ext == 'dot' and not done:
299
278
my_file = file(filename, 'wb')
300
279
for fragment in output:
301
my_file.write(fragment.encode('utf-8'))
280
my_file.write(fragment)
302
281
elif ext == 'html':
304
283
invoke_dot_html(output, filename)
added
removed
graph.py
