← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to graph.py

  • Committer: Aaron Bentley
  • Date: 2005-12-14 14:33:05 UTC
  • Revision ID: abentley@panoramicfeedback.com-20051214143305-42718d97f27c03bd
Avoided leaving junk all over the place when running standalone tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
graph.py
19
19
from dotgraph import RSVG_OUTPUT_TYPES, DOT_OUTPUT_TYPES, Edge, invoke_dot_html
20
20
from bzrlib.branch import Branch
21
21
from bzrlib.errors import BzrCommandError, NoCommonRoot, NoSuchRevision
 
22
from bzrlib.fetch import greedy_fetch
22
23
from bzrlib.graph import node_distances, select_farthest
23
24
from bzrlib.revision import combined_graph, revision_graph
24
25
from bzrlib.revision import MultipleRevisionSources
56
57
    for me, my_parents in ancestors.iteritems():
57
58
        if me in skip:
58
59
            continue
59
 
        new_ancestors[me] = {}
 
60
        new_ancestors[me] = {} 
60
61
        for parent in my_parents:
61
 
            new_parent = parent
 
62
            new_parent = parent 
62
63
            distance = 0
63
64
            while can_skip(new_parent, descendants, ancestors):
64
65
                if new_parent in exceptions:
69
70
                new_parent = list(ancestors[new_parent])[0]
70
71
                distance += 1
71
72
            new_ancestors[me][new_parent] = distance
72
 
    return new_ancestors
 
73
    return new_ancestors    
73
74
 
74
75
def get_rev_info(rev_id, source):
75
76
    """Return the committer, message, and date of a revision."""
77
78
    message = None
78
79
    date = None
79
80
    if rev_id == 'null:':
80
 
        return None, 'Null Revision', None, None
 
81
        return None, 'Null Revision', None
81
82
    try:
82
83
        rev = source.get_revision(rev_id)
83
84
    except NoSuchRevision:
84
85
        try:
85
86
            committer = '-'.join(rev_id.split('-')[:-2]).strip(' ')
86
87
            if committer == '':
87
 
                return None, None, None, None
 
88
                return None, None, None
88
89
        except ValueError:
89
 
            return None, None, None, None
 
90
            return None, None, None
90
91
    else:
91
92
        committer = short_committer(rev.committer)
92
93
        if rev.message is not None:
93
94
            message = rev.message.split('\n')[0]
94
95
        gmtime = time.gmtime(rev.timestamp + (rev.timezone or 0))
95
96
        date = time.strftime('%Y/%m/%d', gmtime)
96
 
        nick = rev.properties.get('branch-nick')
97
97
    if '@' in committer:
98
98
        try:
99
99
            committer = mail_map[committer]
103
103
        committer = committer_alias[committer]
104
104
    except KeyError:
105
105
        pass
106
 
    return committer, message, nick, date
 
106
    return committer, message, date
107
107
 
108
108
class Grapher(object):
109
109
    def __init__(self, branch, other_branch=None):
112
112
        self.other_branch = other_branch
113
113
        revision_a = self.branch.last_revision()
114
114
        if other_branch is not None:
115
 
            branch.fetch(other_branch)
 
115
            greedy_fetch(branch, other_branch)
116
116
            revision_b = self.other_branch.last_revision()
117
117
            try:
118
118
                self.root, self.ancestors, self.descendants, self.common = \
119
 
                    combined_graph(revision_a, revision_b,
120
 
                                   self.branch.repository)
 
119
                    combined_graph(revision_a, revision_b, self.branch)
121
120
            except bzrlib.errors.NoCommonRoot:
122
121
                raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
123
122
        else:
124
123
            self.root, self.ancestors, self.descendants = \
125
 
                revision_graph(revision_a, branch.repository)
 
124
                revision_graph(revision_a, branch)
126
125
            self.common = []
127
126
 
128
127
        self.n_history = branch.revision_history()
129
 
        self.distances = node_distances(self.descendants, self.ancestors,
 
128
        self.distances = node_distances(self.descendants, self.ancestors, 
130
129
                                        self.root)
131
130
        if other_branch is not None:
132
131
            self.base = select_farthest(self.distances, self.common)
133
 
            self.m_history = other_branch.revision_history()
 
132
            self.m_history = other_branch.revision_history() 
134
133
        else:
135
134
            self.base = None
136
135
            self.m_history = []
175
174
            color = "#33ff99"
176
175
 
177
176
        label = [name]
178
 
        committer, message, nick, date = get_rev_info(node,
179
 
                                                      self.branch.repository)
 
177
        committer, message, date = get_rev_info(node, self.branch)
180
178
        if committer is not None:
181
179
            label.append(committer)
182
180
 
183
 
        if nick is not None:
184
 
            label.append(nick)
185
 
 
186
181
        if date is not None:
187
182
            label.append(date)
188
183
 
192
187
        else:
193
188
            rank = None
194
189
 
195
 
        d_node = Node("n%d" % num, color=color, label="\\n".join(label),
 
190
        d_node = Node("n%d" % num, color=color, label="\\n".join(label), 
196
191
                    rev_id=node, cluster=cluster, message=message,
197
192
                    date=date)
198
193
        d_node.rank = rank
201
196
            d_node.node_style.append('dotted')
202
197
 
203
198
        return d_node
204
 
 
205
 
    def get_relations(self, collapse=False, max_distance=None):
 
199
        
 
200
    def get_relations(self, collapse=False):
206
201
        dot_nodes = {}
207
202
        node_relations = []
208
203
        num = 0
209
204
        if collapse:
210
 
            visible_ancestors = compact_ancestors(self.descendants,
 
205
            visible_ancestors = compact_ancestors(self.descendants, 
211
206
                                                  self.ancestors, (self.base,))
212
207
        else:
213
208
            visible_ancestors = self.ancestors
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)
218
209
        for node, parents in visible_ancestors.iteritems():
219
210
            if node not in dot_nodes:
220
211
                dot_nodes[node] = self.dot_node(node, num)
235
226
 
236
227
 
237
228
def write_ancestry_file(branch, filename, collapse=True, antialias=True,
238
 
                        merge_branch=None, ranking="forced", max_distance=None):
 
229
                        merge_branch=None, ranking="forced"):
239
230
    b = Branch.open_containing(branch)[0]
240
231
    if merge_branch is not None:
241
232
        m = Branch.open_containing(merge_branch)[0]
242
233
    else:
243
234
        m = None
244
 
    b.lock_write()
 
235
    b.lock_read()
245
236
    try:
246
237
        if m is not None:
247
238
            m.lock_read()
248
239
        try:
249
240
            grapher = Grapher(b, m)
250
 
            relations = grapher.get_relations(collapse, max_distance)
 
241
            relations = grapher.get_relations(collapse)
251
242
        finally:
252
243
            if m is not None:
253
244
                m.unlock()
259
250
    done = False
260
251
    if ext not in RSVG_OUTPUT_TYPES:
261
252
        antialias = False
262
 
    if antialias:
 
253
    if antialias: 
263
254
        output = list(output)
264
255
        try:
265
256
            invoke_dot_aa(output, filename, ext)
281
272
    elif ext == 'dot' and not done:
282
273
        my_file = file(filename, 'wb')
283
274
        for fragment in output:
284
 
            my_file.write(fragment.encode('utf-8'))
 
275
            my_file.write(fragment)
285
276
    elif ext == 'html':
286
277
        try:
287
278
            invoke_dot_html(output, filename)