← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to graph.py

  • Committer: Aaron Bentley
  • Date: 2006-12-12 16:50:31 UTC
  • Revision ID: abentley@panoramicfeedback.com-20061212165031-51w8gjy1eps1vnw0
update NEWS

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."""
77
77
    message = None
78
78
    date = None
79
79
    if rev_id == 'null:':
80
 
        return None, 'Null Revision', None, None
 
80
        return None, 'Null Revision', None
81
81
    try:
82
82
        rev = source.get_revision(rev_id)
83
83
    except NoSuchRevision:
84
84
        try:
85
85
            committer = '-'.join(rev_id.split('-')[:-2]).strip(' ')
86
86
            if committer == '':
87
 
                return None, None, None, None
 
87
                return None, None, None
88
88
        except ValueError:
89
 
            return None, None, None, None
 
89
            return None, None, None
90
90
    else:
91
91
        committer = short_committer(rev.committer)
92
92
        if rev.message is not None:
93
93
            message = rev.message.split('\n')[0]
94
94
        gmtime = time.gmtime(rev.timestamp + (rev.timezone or 0))
95
95
        date = time.strftime('%Y/%m/%d', gmtime)
96
 
        nick = rev.properties.get('branch-nick')
97
96
    if '@' in committer:
98
97
        try:
99
98
            committer = mail_map[committer]
103
102
        committer = committer_alias[committer]
104
103
    except KeyError:
105
104
        pass
106
 
    return committer, message, nick, date
 
105
    return committer, message, date
107
106
 
108
107
class Grapher(object):
109
108
    def __init__(self, branch, other_branch=None):
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()
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)
 
132
            self.m_history = other_branch.revision_history() 
142
133
        else:
143
134
            self.base = None
144
 
            self.new_base = None
145
 
            self.lcas = set()
146
135
            self.m_history = []
147
136
 
148
137
    def dot_node(self, node, num):
181
170
            assert m_rev is not None
182
171
            cluster = "other_history"
183
172
            color = "#ff0000"
184
 
        if node in self.lcas:
185
 
            color = "#9933cc"
186
173
        if node == self.base:
187
 
            color = "#669933"
188
 
            if node == self.new_base:
189
 
                color = "#33ff33"
190
 
        if node == self.new_base:
191
 
            color = '#33cc99'
 
174
            color = "#33ff99"
192
175
 
193
176
        label = [name]
194
 
        committer, message, nick, date = get_rev_info(node,
195
 
                                                      self.branch.repository)
 
177
        committer, message, date = get_rev_info(node, self.branch.repository)
196
178
        if committer is not None:
197
179
            label.append(committer)
198
180
 
199
 
        if nick is not None:
200
 
            label.append(nick)
201
 
 
202
181
        if date is not None:
203
182
            label.append(date)
204
183
 
208
187
        else:
209
188
            rank = None
210
189
 
211
 
        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), 
212
191
                    rev_id=node, cluster=cluster, message=message,
213
192
                    date=date)
214
193
        d_node.rank = rank
217
196
            d_node.node_style.append('dotted')
218
197
 
219
198
        return d_node
220
 
 
221
 
    def get_relations(self, collapse=False, max_distance=None):
 
199
        
 
200
    def get_relations(self, collapse=False):
222
201
        dot_nodes = {}
223
202
        node_relations = []
224
203
        num = 0
225
204
        if collapse:
226
 
            exceptions = self.lcas.union([self.base, self.new_base])
227
 
            visible_ancestors = compact_ancestors(self.descendants,
228
 
                                                  self.ancestors,
229
 
                                                  exceptions)
 
205
            visible_ancestors = compact_ancestors(self.descendants, 
 
206
                                                  self.ancestors, (self.base,))
230
207
        else:
231
 
            visible_ancestors = {}
232
 
            for revision, parents in self.ancestors.iteritems():
233
 
                visible_ancestors[revision] = dict((p, 0) for p in parents)
234
 
        if max_distance is not None:
235
 
            min_distance = max(self.distances.values()) - max_distance
236
 
            visible_ancestors = dict((n, p) for n, p in
237
 
                                     visible_ancestors.iteritems() if
238
 
                                     self.distances[n] >= min_distance)
 
208
            visible_ancestors = self.ancestors
239
209
        for node, parents in visible_ancestors.iteritems():
240
210
            if node not in dot_nodes:
241
211
                dot_nodes[node] = self.dot_node(node, num)
242
212
                num += 1
243
 
            for parent, skipped in parents.iteritems():
 
213
            if visible_ancestors is self.ancestors:
 
214
                parent_iter = ((f, 0) for f in parents)
 
215
            else:
 
216
                parent_iter = (f for f in parents.iteritems())
 
217
            for parent, skipped in parent_iter:
244
218
                if parent not in dot_nodes:
245
219
                    dot_nodes[parent] = self.dot_node(parent, num)
246
220
                    num += 1
252
226
 
253
227
 
254
228
def write_ancestry_file(branch, filename, collapse=True, antialias=True,
255
 
                        merge_branch=None, ranking="forced", max_distance=None):
 
229
                        merge_branch=None, ranking="forced"):
256
230
    b = Branch.open_containing(branch)[0]
257
231
    if merge_branch is not None:
258
232
        m = Branch.open_containing(merge_branch)[0]
264
238
            m.lock_read()
265
239
        try:
266
240
            grapher = Grapher(b, m)
267
 
            relations = grapher.get_relations(collapse, max_distance)
 
241
            relations = grapher.get_relations(collapse)
268
242
        finally:
269
243
            if m is not None:
270
244
                m.unlock()
276
250
    done = False
277
251
    if ext not in RSVG_OUTPUT_TYPES:
278
252
        antialias = False
279
 
    if antialias:
 
253
    if antialias: 
280
254
        output = list(output)
281
255
        try:
282
256
            invoke_dot_aa(output, filename, ext)