~abentley/bzrtools/bzrtools.dev

257.1.2 by Aaron Bentley
Updated GPL notices
1
# Copyright (C) 2005 Aaron Bentley
2
# <aaron.bentley@utoronto.ca>
3
#
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.
8
#
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.
13
#
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
292 by Aaron Bentley
Introduced branch-history command
17
from bzrtools import short_committer
194 by Aaron Bentley
tweaked Meinel's changes
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
128 by Aaron Bentley
Got initial graphing functionality working
20
from bzrlib.branch import Branch
161 by Aaron Bentley
Added committer names to nodes
21
from bzrlib.errors import BzrCommandError, NoCommonRoot, NoSuchRevision
156 by Aaron Bentley
Switched to merge base pick graphing temporarily
22
from bzrlib.graph import node_distances, select_farthest
180 by Aaron Bentley
Use Grapher for both kinds of graphs
23
from bzrlib.revision import combined_graph, revision_graph
24
from bzrlib.revision import MultipleRevisionSources
128 by Aaron Bentley
Got initial graphing functionality working
25
import bzrlib.errors
130 by Aaron Bentley
Added committer to revisions
26
import re
142 by Aaron Bentley
Clustered the branch revision history
27
import os.path
189.1.1 by John Arbash Meinel
Adding an html target.
28
import time
128 by Aaron Bentley
Got initial graphing functionality working
29
183 by Aaron Bentley
Code cleanup
30
mail_map = {'aaron.bentley@utoronto.ca'     : 'Aaron Bentley',
31
            'abentley@panoramicfeedback.com': 'Aaron Bentley',
32
            'abentley@lappy'                : 'Aaron Bentley',
33
            'john@arbash-meinel.com'        : 'John Arbash Meinel',
34
            'mbp@sourcefrog.net'            : 'Martin Pool',
35
            'robertc@robertcollins.net'     : 'Robert Collins',
36
            }
140 by Aaron Bentley
Mapped some email addresses to names
37
166 by Aaron Bentley
Fixed username-in-ancestry-graph issue
38
committer_alias = {'abentley': 'Aaron Bentley'}
145 by aaron.bentley at utoronto
Reduced graph-collapsing aggressivness
39
def can_skip(rev_id, descendants, ancestors):
40
    if rev_id not in descendants:
41
        return False
174 by Aaron Bentley
Added ancestry collapsing to graphs
42
    elif rev_id not in ancestors:
43
        return False
145 by aaron.bentley at utoronto
Reduced graph-collapsing aggressivness
44
    elif len(ancestors[rev_id]) != 1:
45
        return False
174 by Aaron Bentley
Added ancestry collapsing to graphs
46
    elif len(descendants[list(ancestors[rev_id])[0]]) != 1:
145 by aaron.bentley at utoronto
Reduced graph-collapsing aggressivness
47
        return False
48
    elif len(descendants[rev_id]) != 1:
49
        return False
50
    else:
51
        return True
136 by Aaron Bentley
Allowed disabling ancestry collapsing
52
176 by Aaron Bentley
Added skip labels to edges
53
def compact_ancestors(descendants, ancestors, exceptions=()):
174 by Aaron Bentley
Added ancestry collapsing to graphs
54
    new_ancestors={}
55
    skip = set()
56
    for me, my_parents in ancestors.iteritems():
57
        if me in skip:
58
            continue
176 by Aaron Bentley
Added skip labels to edges
59
        new_ancestors[me] = {} 
174 by Aaron Bentley
Added ancestry collapsing to graphs
60
        for parent in my_parents:
61
            new_parent = parent 
176 by Aaron Bentley
Added skip labels to edges
62
            distance = 0
174 by Aaron Bentley
Added ancestry collapsing to graphs
63
            while can_skip(new_parent, descendants, ancestors):
176 by Aaron Bentley
Added skip labels to edges
64
                if new_parent in exceptions:
65
                    break
174 by Aaron Bentley
Added ancestry collapsing to graphs
66
                skip.add(new_parent)
67
                if new_parent in new_ancestors:
68
                    del new_ancestors[new_parent]
69
                new_parent = list(ancestors[new_parent])[0]
176 by Aaron Bentley
Added skip labels to edges
70
                distance += 1
71
            new_ancestors[me][new_parent] = distance
174 by Aaron Bentley
Added ancestry collapsing to graphs
72
    return new_ancestors    
73
189.1.1 by John Arbash Meinel
Adding an html target.
74
def get_rev_info(rev_id, source):
75
    """Return the committer, message, and date of a revision."""
76
    committer = None
77
    message = None
78
    date = None
79
    if rev_id == 'null:':
476.1.1 by Aaron Bentley
graph-ancestry shows branch nick
80
        return None, 'Null Revision', None, None
161 by Aaron Bentley
Added committer names to nodes
81
    try:
189.1.1 by John Arbash Meinel
Adding an html target.
82
        rev = source.get_revision(rev_id)
161 by Aaron Bentley
Added committer names to nodes
83
    except NoSuchRevision:
84
        try:
173 by Aaron Bentley
Fixed empty committer for null revision
85
            committer = '-'.join(rev_id.split('-')[:-2]).strip(' ')
86
            if committer == '':
476.1.1 by Aaron Bentley
graph-ancestry shows branch nick
87
                return None, None, None, None
161 by Aaron Bentley
Added committer names to nodes
88
        except ValueError:
476.1.1 by Aaron Bentley
graph-ancestry shows branch nick
89
            return None, None, None, None
189.1.1 by John Arbash Meinel
Adding an html target.
90
    else:
91
        committer = short_committer(rev.committer)
92
        if rev.message is not None:
93
            message = rev.message.split('\n')[0]
194 by Aaron Bentley
tweaked Meinel's changes
94
        gmtime = time.gmtime(rev.timestamp + (rev.timezone or 0))
197 by Aaron Bentley
Restored slashes in date, because my rsvg-bin is borken wrt hyphens
95
        date = time.strftime('%Y/%m/%d', gmtime)
476.1.1 by Aaron Bentley
graph-ancestry shows branch nick
96
        nick = rev.properties.get('branch-nick')
166 by Aaron Bentley
Fixed username-in-ancestry-graph issue
97
    if '@' in committer:
98
        try:
99
            committer = mail_map[committer]
100
        except KeyError:
101
            pass
102
    try:
103
        committer = committer_alias[committer]
104
    except KeyError:
105
        pass
476.1.1 by Aaron Bentley
graph-ancestry shows branch nick
106
    return committer, message, nick, date
161 by Aaron Bentley
Added committer names to nodes
107
177 by Aaron Bentley
Restructured graph code as an object
108
class Grapher(object):
180 by Aaron Bentley
Use Grapher for both kinds of graphs
109
    def __init__(self, branch, other_branch=None):
177 by Aaron Bentley
Restructured graph code as an object
110
        object.__init__(self)
111
        self.branch = branch
112
        self.other_branch = other_branch
208 by Aaron Bentley
Fixed last_revision calls
113
        revision_a = self.branch.last_revision()
180 by Aaron Bentley
Use Grapher for both kinds of graphs
114
        if other_branch is not None:
317 by Aaron Bentley
Fixed fetching code to use Branch.fetch
115
            branch.fetch(other_branch)
208 by Aaron Bentley
Fixed last_revision calls
116
            revision_b = self.other_branch.last_revision()
180 by Aaron Bentley
Use Grapher for both kinds of graphs
117
            try:
118
                self.root, self.ancestors, self.descendants, self.common = \
309 by Aaron Bentley
Fixed graph-ancestry
119
                    combined_graph(revision_a, revision_b,
120
                                   self.branch.repository)
180 by Aaron Bentley
Use Grapher for both kinds of graphs
121
            except bzrlib.errors.NoCommonRoot:
122
                raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
123
        else:
124
            self.root, self.ancestors, self.descendants = \
309 by Aaron Bentley
Fixed graph-ancestry
125
                revision_graph(revision_a, branch.repository)
180 by Aaron Bentley
Use Grapher for both kinds of graphs
126
            self.common = []
127
128
        self.n_history = branch.revision_history()
177 by Aaron Bentley
Restructured graph code as an object
129
        self.distances = node_distances(self.descendants, self.ancestors, 
130
                                        self.root)
180 by Aaron Bentley
Use Grapher for both kinds of graphs
131
        if other_branch is not None:
132
            self.base = select_farthest(self.distances, self.common)
133
            self.m_history = other_branch.revision_history() 
134
        else:
135
            self.base = None
136
            self.m_history = []
161 by Aaron Bentley
Added committer names to nodes
137
177 by Aaron Bentley
Restructured graph code as an object
138
    def dot_node(self, node, num):
156 by Aaron Bentley
Switched to merge base pick graphing temporarily
139
        try:
177 by Aaron Bentley
Restructured graph code as an object
140
            n_rev = self.n_history.index(node) + 1
156 by Aaron Bentley
Switched to merge base pick graphing temporarily
141
        except ValueError:
142
            n_rev = None
143
        try:
177 by Aaron Bentley
Restructured graph code as an object
144
            m_rev = self.m_history.index(node) + 1
156 by Aaron Bentley
Switched to merge base pick graphing temporarily
145
        except ValueError:
146
            m_rev = None
155 by Aaron Bentley
Did a bunch of work on merge-base graphs
147
        if (n_rev, m_rev) == (None, None):
168 by Aaron Bentley
lengthened graph node name to include null:
148
            name = node[-5:]
155 by Aaron Bentley
Did a bunch of work on merge-base graphs
149
            cluster = None
150
        elif n_rev == m_rev:
151
            name = "rR%d" % n_rev
152
        else:
153
            namelist = []
164 by Aaron Bentley
Fixed varname reuse generating nodes
154
            for prefix, revno in (('r', n_rev), ('R', m_rev)):
155
                if revno is not None:
156
                    namelist.append("%s%d" % (prefix, revno))
155 by Aaron Bentley
Did a bunch of work on merge-base graphs
157
            name = ' '.join(namelist)
158
        if None not in (n_rev, m_rev):
159
            cluster = "common_history"
160
            color = "#ff9900"
161
        elif (None, None) == (n_rev, m_rev):
162
            cluster = None
177 by Aaron Bentley
Restructured graph code as an object
163
            if node in self.common:
155 by Aaron Bentley
Did a bunch of work on merge-base graphs
164
                color = "#6699ff"
165
            else:
190 by Aaron Bentley
Set normal revisions to white
166
                color = "white"
155 by Aaron Bentley
Did a bunch of work on merge-base graphs
167
        elif n_rev is not None:
168
            cluster = "my_history"
169
            color = "#ffff00"
170
        else:
171
            assert m_rev is not None
172
            cluster = "other_history"
173
            color = "#ff0000"
177 by Aaron Bentley
Restructured graph code as an object
174
        if node == self.base:
155 by Aaron Bentley
Did a bunch of work on merge-base graphs
175
            color = "#33ff99"
176
177
        label = [name]
476.1.1 by Aaron Bentley
graph-ancestry shows branch nick
178
        committer, message, nick, date = get_rev_info(node, 
179
                                                      self.branch.repository)
161 by Aaron Bentley
Added committer names to nodes
180
        if committer is not None:
181
            label.append(committer)
182
476.1.1 by Aaron Bentley
graph-ancestry shows branch nick
183
        if nick is not None:
184
            label.append(nick)
185
189.1.1 by John Arbash Meinel
Adding an html target.
186
        if date is not None:
187
            label.append(date)
188 by Aaron Bentley
Added dates to graph
188
177 by Aaron Bentley
Restructured graph code as an object
189
        if node in self.distances:
178 by Aaron Bentley
Switched from clusters to forced ranking
190
            rank = self.distances[node]
177 by Aaron Bentley
Restructured graph code as an object
191
            label.append('d%d' % self.distances[node])
178 by Aaron Bentley
Switched from clusters to forced ranking
192
        else:
193
            rank = None
172 by Aaron Bentley
Marked missing nodes
194
195
        d_node = Node("n%d" % num, color=color, label="\\n".join(label), 
189.1.1 by John Arbash Meinel
Adding an html target.
196
                    rev_id=node, cluster=cluster, message=message,
197
                    date=date)
178 by Aaron Bentley
Switched from clusters to forced ranking
198
        d_node.rank = rank
199
177 by Aaron Bentley
Restructured graph code as an object
200
        if node not in self.ancestors:
172 by Aaron Bentley
Marked missing nodes
201
            d_node.node_style.append('dotted')
202
203
        return d_node
476.1.2 by Aaron Bentley
graph-ancestry can restrict the number of nodes shown by distance
204
       
205
    def get_relations(self, collapse=False, max_distance=None):
177 by Aaron Bentley
Restructured graph code as an object
206
        dot_nodes = {}
207
        node_relations = []
208
        num = 0
209
        if collapse:
210
            visible_ancestors = compact_ancestors(self.descendants, 
211
                                                  self.ancestors, (self.base,))
176 by Aaron Bentley
Added skip labels to edges
212
        else:
177 by Aaron Bentley
Restructured graph code as an object
213
            visible_ancestors = self.ancestors
476.1.2 by Aaron Bentley
graph-ancestry can restrict the number of nodes shown by distance
214
        if max_distance is not None:
215
            min_distance = max(self.distances.values()) - max_distance
216
            visible_ancestors = dict((n, p) for n, p in visible_ancestors.iteritems() if
217
                    self.distances[n] >= min_distance)
177 by Aaron Bentley
Restructured graph code as an object
218
        for node, parents in visible_ancestors.iteritems():
219
            if node not in dot_nodes:
220
                dot_nodes[node] = self.dot_node(node, num)
176 by Aaron Bentley
Added skip labels to edges
221
                num += 1
177 by Aaron Bentley
Restructured graph code as an object
222
            if visible_ancestors is self.ancestors:
223
                parent_iter = ((f, 0) for f in parents)
224
            else:
225
                parent_iter = (f for f in parents.iteritems())
226
            for parent, skipped in parent_iter:
227
                if parent not in dot_nodes:
228
                    dot_nodes[parent] = self.dot_node(parent, num)
229
                    num += 1
230
                edge = Edge(dot_nodes[parent], dot_nodes[node])
231
                if skipped != 0:
232
                    edge.label = "%d" % skipped
233
                node_relations.append(edge)
234
        return node_relations
155 by Aaron Bentley
Did a bunch of work on merge-base graphs
235
236
160 by Aaron Bentley
Restored old graph-ancestry functionality
237
def write_ancestry_file(branch, filename, collapse=True, antialias=True,
476.1.2 by Aaron Bentley
graph-ancestry can restrict the number of nodes shown by distance
238
                        merge_branch=None, ranking="forced", max_distance=None):
234 by Aaron Bentley
Adopted Branch.open_containing's new format
239
    b = Branch.open_containing(branch)[0]
180 by Aaron Bentley
Use Grapher for both kinds of graphs
240
    if merge_branch is not None:
234 by Aaron Bentley
Adopted Branch.open_containing's new format
241
        m = Branch.open_containing(merge_branch)[0]
180 by Aaron Bentley
Use Grapher for both kinds of graphs
242
    else:
243
        m = None
309 by Aaron Bentley
Fixed graph-ancestry
244
    b.lock_write()
258 by Aaron Bentley
Added locking to graph-ancestry
245
    try:
246
        if m is not None:
247
            m.lock_read()
248
        try:
249
            grapher = Grapher(b, m)
476.1.2 by Aaron Bentley
graph-ancestry can restrict the number of nodes shown by distance
250
            relations = grapher.get_relations(collapse, max_distance)
258 by Aaron Bentley
Added locking to graph-ancestry
251
        finally:
252
            if m is not None:
253
                m.unlock()
254
    finally:
255
        b.unlock()
160 by Aaron Bentley
Restored old graph-ancestry functionality
256
134 by Aaron Bentley
support multiple image formats for graph-ancestry
257
    ext = filename.split('.')[-1]
178 by Aaron Bentley
Switched from clusters to forced ranking
258
    output = dot_output(relations, ranking)
186 by Aaron Bentley
Warn instead of failing when librsvg is not installed
259
    done = False
187 by Aaron Bentley
Fixed output handling for non-antialiased types
260
    if ext not in RSVG_OUTPUT_TYPES:
261
        antialias = False
262
    if antialias: 
186 by Aaron Bentley
Warn instead of failing when librsvg is not installed
263
        output = list(output)
143 by Aaron Bentley
Used rsvga for nice antialiasing
264
        try:
178 by Aaron Bentley
Switched from clusters to forced ranking
265
            invoke_dot_aa(output, filename, ext)
186 by Aaron Bentley
Warn instead of failing when librsvg is not installed
266
            done = True
143 by Aaron Bentley
Used rsvga for nice antialiasing
267
        except NoDot, e:
268
            raise BzrCommandError("Can't find 'dot'.  Please ensure Graphviz"\
269
                " is installed correctly.")
270
        except NoRsvg, e:
186 by Aaron Bentley
Warn instead of failing when librsvg is not installed
271
            print "Not antialiasing because rsvg (from librsvg-bin) is not"\
272
                " installed."
273
            antialias = False
274
    if ext in DOT_OUTPUT_TYPES and not antialias and not done:
139 by Aaron Bentley
Tweaked missing-dot handling
275
        try:
178 by Aaron Bentley
Switched from clusters to forced ranking
276
            invoke_dot(output, filename, ext)
186 by Aaron Bentley
Warn instead of failing when librsvg is not installed
277
            done = True
139 by Aaron Bentley
Tweaked missing-dot handling
278
        except NoDot, e:
279
            raise BzrCommandError("Can't find 'dot'.  Please ensure Graphviz"\
143 by Aaron Bentley
Used rsvga for nice antialiasing
280
                " is installed correctly, or use --noantialias")
194 by Aaron Bentley
tweaked Meinel's changes
281
    elif ext == 'dot' and not done:
178 by Aaron Bentley
Switched from clusters to forced ranking
282
        my_file = file(filename, 'wb')
283
        for fragment in output:
321.1.1 by Aaron Bentley
Forced dot output to UTF-8
284
            my_file.write(fragment.encode('utf-8'))
194 by Aaron Bentley
tweaked Meinel's changes
285
    elif ext == 'html':
189.1.1 by John Arbash Meinel
Adding an html target.
286
        try:
287
            invoke_dot_html(output, filename)
288
        except NoDot, e:
289
            raise BzrCommandError("Can't find 'dot'.  Please ensure Graphviz"\
290
                " is installed correctly, or use --noantialias")
186 by Aaron Bentley
Warn instead of failing when librsvg is not installed
291
    elif not done:
134 by Aaron Bentley
support multiple image formats for graph-ancestry
292
        print "Unknown file extension: %s" % ext
131 by Aaron Bentley
Added required filename parameter
293