1
# Copyright (C) 2005, 2008 Aaron Bentley
1
# Copyright (C) 2005 Aaron Bentley
2
2
# <aaron@aaronbentley.com>
4
4
# This program is free software; you can redistribute it and/or modify
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
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
21
20
from bzrlib.branch import Branch
22
from bzrlib.errors import BzrCommandError, NoSuchRevision
21
from bzrlib.errors import BzrCommandError, NoCommonRoot, NoSuchRevision
23
22
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 (
23
from bzrlib.revision import combined_graph, revision_graph
24
from bzrlib.revision import MultipleRevisionSources
41
30
mail_map = {'aaron.bentley@utoronto.ca' : 'Aaron Bentley',
42
31
'abentley@panoramicfeedback.com': 'Aaron Bentley',
117
106
return committer, message, nick, date
119
108
class Grapher(object):
121
109
def __init__(self, branch, other_branch=None):
122
110
object.__init__(self)
123
111
self.branch = branch
124
112
self.other_branch = other_branch
113
revision_a = self.branch.last_revision()
125
114
if other_branch is not None:
126
other_repo = other_branch.repository
115
branch.fetch(other_branch)
127
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)
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)
124
self.root, self.ancestors, self.descendants = \
125
revision_graph(revision_a, branch.repository)
134
128
self.n_history = branch.revision_history()
135
129
self.n_revnos = branch.get_revision_id_to_revno_map()
136
130
self.distances = node_distances(self.descendants, self.ancestors,
139
133
self.base = select_farthest(self.distances, self.common)
140
134
self.m_history = other_branch.revision_history()
141
135
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)
136
new_graph = getattr(branch.repository, 'get_graph', lambda: None)()
137
if new_graph is None:
141
self.new_base = new_graph.find_unique_lca(revision_a,
143
self.lcas = new_graph.find_lca(revision_a, revision_b)
147
146
self.new_base = None
149
148
self.m_history = []
150
149
self.m_revnos = {}
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
152
def _get_revno_str(prefix, revno_map, revision_id):