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
21
from bzrlib.branch import Branch
22
from bzrlib.errors import BzrCommandError, NoSuchRevision
23
from bzrlib.revision import NULL_REVISION
17
25
from bzrtools import short_committer
18
from dotgraph import Node, dot_output, invoke_dot, invoke_dot_aa, NoDot, NoRsvg
19
from dotgraph import RSVG_OUTPUT_TYPES, DOT_OUTPUT_TYPES, Edge, invoke_dot_html
20
from bzrlib.branch import Branch
21
from bzrlib.errors import BzrCommandError, NoCommonRoot, NoSuchRevision
22
from bzrlib.fetch import greedy_fetch
23
from bzrlib.graph import node_distances, select_farthest
24
from bzrlib.revision import combined_graph, revision_graph
25
from bzrlib.revision import MultipleRevisionSources
26
from dotgraph import (
40
def max_distance(node, ancestors, distances, root_descendants):
41
"""Calculate the max distance to an ancestor.
42
Return None if not all possible ancestors have known distances"""
45
best = distances[node]
46
for ancestor in ancestors[node]:
47
# skip ancestors we will never traverse:
48
if root_descendants is not None and ancestor not in root_descendants:
50
# An ancestor which is not listed in ancestors will never be in
51
# distances, so we pretend it never existed.
52
if ancestor not in ancestors:
54
if ancestor not in distances:
56
if best is None or distances[ancestor]+1 > best:
57
best = distances[ancestor] + 1
61
def node_distances(graph, ancestors, start, root_descendants=None):
62
"""Produce a list of nodes, sorted by distance from a start node.
63
This is an algorithm devised by Aaron Bentley, because applying Dijkstra
64
backwards seemed too complicated.
66
For each node, we walk its descendants. If all the descendant's ancestors
67
have a max-distance-to-start, (excluding ones that can never reach start),
68
we calculate their max-distance-to-start, and schedule their descendants.
70
So when a node's last parent acquires a distance, it will acquire a
71
distance on the next iteration.
73
Once we know the max distances for all nodes, we can return a list sorted
74
by distance, farthest first.
76
distances = {start: 0}
81
line_descendants = graph[line]
82
for descendant in line_descendants:
83
distance = max_distance(descendant, ancestors, distances,
87
distances[descendant] = distance
88
new_lines.add(descendant)
93
def nodes_by_distance(distances):
94
"""Return a list of nodes sorted by distance"""
98
node_list = distances.keys()
99
node_list.sort(key=by_distance, reverse=True)
103
def select_farthest(distances, common):
104
"""Return the farthest common node, or None if no node qualifies."""
105
node_list = nodes_by_distance(distances)
106
for node in node_list:
31
111
mail_map = {'aaron.bentley@utoronto.ca' : 'Aaron Bentley',
32
112
'abentley@panoramicfeedback.com': 'Aaron Bentley',
70
150
new_parent = list(ancestors[new_parent])[0]
72
152
new_ancestors[me][new_parent] = distance
75
155
def get_rev_info(rev_id, source):
76
"""Return the committer, message, and date of a revision."""
156
"""Return the committer, message, nick and date of a revision."""
80
161
if rev_id == 'null:':
81
return None, 'Null Revision', None
162
return None, 'Null Revision', None, None
83
164
rev = source.get_revision(rev_id)
84
165
except NoSuchRevision:
86
167
committer = '-'.join(rev_id.split('-')[:-2]).strip(' ')
87
168
if committer == '':
88
return None, None, None
169
return None, None, None, None
89
170
except ValueError:
90
return None, None, None
171
return None, None, None, None
92
173
committer = short_committer(rev.committer)
93
174
if rev.message is not None:
94
175
message = rev.message.split('\n')[0]
95
176
gmtime = time.gmtime(rev.timestamp + (rev.timezone or 0))
96
177
date = time.strftime('%Y/%m/%d', gmtime)
178
nick = rev.properties.get('branch-nick')
97
179
if '@' in committer:
99
181
committer = mail_map[committer]
103
185
committer = committer_alias[committer]
106
return committer, message, date
188
return committer, message, nick, date
108
190
class Grapher(object):
109
192
def __init__(self, branch, other_branch=None):
110
193
object.__init__(self)
111
194
self.branch = branch
112
195
self.other_branch = other_branch
196
if other_branch is not None:
197
other_repo = other_branch.repository
198
revision_b = self.other_branch.last_revision()
202
self.graph = self.branch.repository.get_graph(other_repo)
113
203
revision_a = self.branch.last_revision()
114
if other_branch is not None:
115
greedy_fetch(branch, other_branch)
116
revision_b = self.other_branch.last_revision()
118
self.root, self.ancestors, self.descendants, self.common = \
119
combined_graph(revision_a, revision_b,
120
self.branch.repository)
121
except bzrlib.errors.NoCommonRoot:
122
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
124
self.root, self.ancestors, self.descendants = \
125
revision_graph(revision_a, branch.repository)
128
self.n_history = branch.revision_history()
129
self.distances = node_distances(self.descendants, self.ancestors,
204
self.scan_graph(revision_a, revision_b)
205
self.n_history = list(self.graph.iter_lefthand_ancestry(revision_a))
206
self.n_history.reverse()
207
self.n_revnos = branch.get_revision_id_to_revno_map()
208
self.distances = node_distances(self.descendants, self.ancestors,
131
210
if other_branch is not None:
132
211
self.base = select_farthest(self.distances, self.common)
133
self.m_history = other_branch.revision_history()
212
self.m_history = self.graph.iter_lefthand_ancestry(revision_b)
213
self.m_history = list(self.m_history)
214
self.m_history.reverse()
215
self.m_revnos = other_branch.get_revision_id_to_revno_map()
216
self.new_base = self.graph.find_unique_lca(revision_a,
218
self.lcas = self.graph.find_lca(revision_a, revision_b)
136
223
self.m_history = []
226
def scan_graph(self, revision_a, revision_b):
227
a_ancestors = dict(self.graph.iter_ancestry([revision_a]))
228
self.ancestors = a_ancestors
229
self.root = NULL_REVISION
230
if revision_b is not None:
231
b_ancestors = dict(self.graph.iter_ancestry([revision_b]))
232
self.common = set(a_ancestors.keys())
233
self.common.intersection_update(b_ancestors)
234
self.ancestors.update(b_ancestors)
238
self.descendants = {}
240
for revision, parents in self.ancestors.iteritems():
241
self.descendants.setdefault(revision, [])
244
parents = [NULL_REVISION]
245
for parent in parents:
246
self.descendants.setdefault(parent, []).append(revision)
248
self.ancestors[ghost] = [NULL_REVISION]
251
def _get_revno_str(prefix, revno_map, revision_id):
253
revno = revno_map[revision_id]
256
return '%s%s' % (prefix, '.'.join(str(n) for n in revno))
138
258
def dot_node(self, node, num):
197
331
d_node.node_style.append('dotted')
201
def get_relations(self, collapse=False):
335
def get_relations(self, collapse=False, max_distance=None):
203
337
node_relations = []
206
visible_ancestors = compact_ancestors(self.descendants,
207
self.ancestors, (self.base,))
340
exceptions = self.lcas.union([self.base, self.new_base])
341
visible_ancestors = compact_ancestors(self.descendants,
209
visible_ancestors = self.ancestors
345
visible_ancestors = {}
346
for revision, parents in self.ancestors.iteritems():
347
visible_ancestors[revision] = dict((p, 0) for p in parents)
348
if max_distance is not None:
349
min_distance = max(self.distances.values()) - max_distance
350
visible_ancestors = dict((n, p) for n, p in
351
visible_ancestors.iteritems() if
352
self.distances[n] >= min_distance)
210
353
for node, parents in visible_ancestors.iteritems():
211
354
if node not in dot_nodes:
212
355
dot_nodes[node] = self.dot_node(node, num)
214
if visible_ancestors is self.ancestors:
215
parent_iter = ((f, 0) for f in parents)
217
parent_iter = (f for f in parents.iteritems())
218
for parent, skipped in parent_iter:
357
for parent, skipped in parents.iteritems():
219
358
if parent not in dot_nodes:
220
359
dot_nodes[parent] = self.dot_node(parent, num)
271
410
raise BzrCommandError("Can't find 'dot'. Please ensure Graphviz"\
272
" is installed correctly, or use --noantialias")
411
" is installed correctly.")
273
412
elif ext == 'dot' and not done:
274
413
my_file = file(filename, 'wb')
275
414
for fragment in output:
276
my_file.write(fragment)
415
my_file.write(fragment.encode('utf-8'))
277
416
elif ext == 'html':
279
418
invoke_dot_html(output, filename)
281
420
raise BzrCommandError("Can't find 'dot'. Please ensure Graphviz"\
282
" is installed correctly, or use --noantialias")
421
" is installed correctly.")
284
423
print "Unknown file extension: %s" % ext
added
removed
graph.py
