← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to graph.py

  • Committer: Aaron Bentley
  • Date: 2007-07-24 17:10:08 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070724171008-b3ygal61ec5dojub
Better error when shelving binary files

Show diffs side-by-side

added added

removed removed

Lines of Context:
graph.py
56
56
    for me, my_parents in ancestors.iteritems():
57
57
        if me in skip:
58
58
            continue
59
 
        new_ancestors[me] = {} 
 
59
        new_ancestors[me] = {}
60
60
        for parent in my_parents:
61
 
            new_parent = parent 
 
61
            new_parent = parent
62
62
            distance = 0
63
63
            while can_skip(new_parent, descendants, ancestors):
64
64
                if new_parent in exceptions:
69
69
                new_parent = list(ancestors[new_parent])[0]
70
70
                distance += 1
71
71
            new_ancestors[me][new_parent] = distance
72
 
    return new_ancestors    
 
72
    return new_ancestors
73
73
 
74
74
def get_rev_info(rev_id, source):
75
75
    """Return the committer, message, and date of a revision."""
126
126
            self.common = []
127
127
 
128
128
        self.n_history = branch.revision_history()
129
 
        self.distances = node_distances(self.descendants, self.ancestors, 
 
129
        self.distances = node_distances(self.descendants, self.ancestors,
130
130
                                        self.root)
131
131
        if other_branch is not None:
132
132
            self.base = select_farthest(self.distances, self.common)
133
 
            self.m_history = other_branch.revision_history() 
 
133
            self.m_history = other_branch.revision_history()
 
134
            new_graph = getattr(branch.repository, 'get_graph', lambda: None)()
 
135
            if new_graph is None:
 
136
                self.new_base = None
 
137
                self.lcas = set()
 
138
            else:
 
139
                self.new_base = new_graph.find_unique_lca(revision_a,
 
140
                                                          revision_b)
 
141
                self.lcas = new_graph.find_lca(revision_a, revision_b)
134
142
        else:
135
143
            self.base = None
 
144
            self.new_base = None
 
145
            self.lcas = set()
136
146
            self.m_history = []
137
147
 
138
148
    def dot_node(self, node, num):
171
181
            assert m_rev is not None
172
182
            cluster = "other_history"
173
183
            color = "#ff0000"
 
184
        if node in self.lcas:
 
185
            color = "#9933cc"
174
186
        if node == self.base:
175
 
            color = "#33ff99"
 
187
            color = "#669933"
 
188
            if node == self.new_base:
 
189
                color = "#33ff33"
 
190
        if node == self.new_base:
 
191
            color = '#33cc99'
176
192
 
177
193
        label = [name]
178
 
        committer, message, nick, date = get_rev_info(node, 
 
194
        committer, message, nick, date = get_rev_info(node,
179
195
                                                      self.branch.repository)
180
196
        if committer is not None:
181
197
            label.append(committer)
192
208
        else:
193
209
            rank = None
194
210
 
195
 
        d_node = Node("n%d" % num, color=color, label="\\n".join(label), 
 
211
        d_node = Node("n%d" % num, color=color, label="\\n".join(label),
196
212
                    rev_id=node, cluster=cluster, message=message,
197
213
                    date=date)
198
214
        d_node.rank = rank
201
217
            d_node.node_style.append('dotted')
202
218
 
203
219
        return d_node
204
 
       
 
220
 
205
221
    def get_relations(self, collapse=False, max_distance=None):
206
222
        dot_nodes = {}
207
223
        node_relations = []
208
224
        num = 0
209
225
        if collapse:
210
 
            visible_ancestors = compact_ancestors(self.descendants, 
211
 
                                                  self.ancestors, (self.base,))
 
226
            exceptions = self.lcas.union([self.base, self.new_base])
 
227
            visible_ancestors = compact_ancestors(self.descendants,
 
228
                                                  self.ancestors,
 
229
                                                  exceptions)
212
230
        else:
213
 
            visible_ancestors = self.ancestors
 
231
            visible_ancestors = {}
 
232
            for revision, parents in self.ancestors.iteritems():
 
233
                visible_ancestors[revision] = dict((p, 0) for p in parents)
214
234
        if max_distance is not None:
215
235
            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)
 
236
            visible_ancestors = dict((n, p) for n, p in
 
237
                                     visible_ancestors.iteritems() if
 
238
                                     self.distances[n] >= min_distance)
218
239
        for node, parents in visible_ancestors.iteritems():
219
240
            if node not in dot_nodes:
220
241
                dot_nodes[node] = self.dot_node(node, num)
221
242
                num += 1
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:
 
243
            for parent, skipped in parents.iteritems():
227
244
                if parent not in dot_nodes:
228
245
                    dot_nodes[parent] = self.dot_node(parent, num)
229
246
                    num += 1
259
276
    done = False
260
277
    if ext not in RSVG_OUTPUT_TYPES:
261
278
        antialias = False
262
 
    if antialias: 
 
279
    if antialias:
263
280
        output = list(output)
264
281
        try:
265
282
            invoke_dot_aa(output, filename, ext)