← 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-10-27 05:19:16 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20051027051916-0c47bc829ce54fdc
Got command completion working

Show diffs side-by-side

added added

removed removed

Lines of Context:
graph.py
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
17
 
from bzrtools import short_committer
18
1
from dotgraph import Node, dot_output, invoke_dot, invoke_dot_aa, NoDot, NoRsvg
19
2
from dotgraph import RSVG_OUTPUT_TYPES, DOT_OUTPUT_TYPES, Edge, invoke_dot_html
20
3
from bzrlib.branch import Branch
21
4
from bzrlib.errors import BzrCommandError, NoCommonRoot, NoSuchRevision
 
5
from bzrlib.fetch import greedy_fetch
22
6
from bzrlib.graph import node_distances, select_farthest
23
7
from bzrlib.revision import combined_graph, revision_graph
24
8
from bzrlib.revision import MultipleRevisionSources
36
20
            }
37
21
 
38
22
committer_alias = {'abentley': 'Aaron Bentley'}
 
23
def short_committer(committer):
 
24
    new_committer = re.sub('<.*>', '', committer).strip(' ')
 
25
    if len(new_committer) < 2:
 
26
        return committer
 
27
    return new_committer
 
28
 
39
29
def can_skip(rev_id, descendants, ancestors):
40
30
    if rev_id not in descendants:
41
31
        return False
111
101
        self.other_branch = other_branch
112
102
        revision_a = self.branch.last_revision()
113
103
        if other_branch is not None:
114
 
            branch.fetch(other_branch)
 
104
            greedy_fetch(branch, other_branch)
115
105
            revision_b = self.other_branch.last_revision()
116
106
            try:
117
107
                self.root, self.ancestors, self.descendants, self.common = \
118
 
                    combined_graph(revision_a, revision_b,
119
 
                                   self.branch.repository)
 
108
                    combined_graph(revision_a, revision_b, self.branch)
120
109
            except bzrlib.errors.NoCommonRoot:
121
110
                raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
122
111
        else:
123
112
            self.root, self.ancestors, self.descendants = \
124
 
                revision_graph(revision_a, branch.repository)
 
113
                revision_graph(revision_a, branch)
125
114
            self.common = []
126
115
 
127
116
        self.n_history = branch.revision_history()
174
163
            color = "#33ff99"
175
164
 
176
165
        label = [name]
177
 
        committer, message, date = get_rev_info(node, self.branch.repository)
 
166
        committer, message, date = get_rev_info(node, self.branch)
178
167
        if committer is not None:
179
168
            label.append(committer)
180
169
 
232
221
        m = Branch.open_containing(merge_branch)[0]
233
222
    else:
234
223
        m = None
235
 
    b.lock_write()
236
 
    try:
237
 
        if m is not None:
238
 
            m.lock_read()
239
 
        try:
240
 
            grapher = Grapher(b, m)
241
 
            relations = grapher.get_relations(collapse)
242
 
        finally:
243
 
            if m is not None:
244
 
                m.unlock()
245
 
    finally:
246
 
        b.unlock()
 
224
    grapher = Grapher(b, m)
 
225
    relations = grapher.get_relations(collapse)
247
226
 
248
227
    ext = filename.split('.')[-1]
249
228
    output = dot_output(relations, ranking)
272
251
    elif ext == 'dot' and not done:
273
252
        my_file = file(filename, 'wb')
274
253
        for fragment in output:
275
 
            my_file.write(fragment.encode('utf-8'))
 
254
            my_file.write(fragment)
276
255
    elif ext == 'html':
277
256
        try:
278
257
            invoke_dot_html(output, filename)