~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to graph.py

  • Committer: Aaron Bentley
  • Date: 2005-11-17 16:39:52 UTC
  • Revision ID: abentley@panoramicfeedback.com-20051117163952-e916bbbc3580c727
Added shell docstring

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
#    You should have received a copy of the GNU General Public License
15
15
#    along with this program; if not, write to the Free Software
16
16
#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
 
from bzrtools import short_committer
18
17
from dotgraph import Node, dot_output, invoke_dot, invoke_dot_aa, NoDot, NoRsvg
19
18
from dotgraph import RSVG_OUTPUT_TYPES, DOT_OUTPUT_TYPES, Edge, invoke_dot_html
20
19
from bzrlib.branch import Branch
21
20
from bzrlib.errors import BzrCommandError, NoCommonRoot, NoSuchRevision
 
21
from bzrlib.fetch import greedy_fetch
22
22
from bzrlib.graph import node_distances, select_farthest
23
23
from bzrlib.revision import combined_graph, revision_graph
24
24
from bzrlib.revision import MultipleRevisionSources
36
36
            }
37
37
 
38
38
committer_alias = {'abentley': 'Aaron Bentley'}
 
39
def short_committer(committer):
 
40
    new_committer = re.sub('<.*>', '', committer).strip(' ')
 
41
    if len(new_committer) < 2:
 
42
        return committer
 
43
    return new_committer
 
44
 
39
45
def can_skip(rev_id, descendants, ancestors):
40
46
    if rev_id not in descendants:
41
47
        return False
56
62
    for me, my_parents in ancestors.iteritems():
57
63
        if me in skip:
58
64
            continue
59
 
        new_ancestors[me] = {}
 
65
        new_ancestors[me] = {} 
60
66
        for parent in my_parents:
61
 
            new_parent = parent
 
67
            new_parent = parent 
62
68
            distance = 0
63
69
            while can_skip(new_parent, descendants, ancestors):
64
70
                if new_parent in exceptions:
69
75
                new_parent = list(ancestors[new_parent])[0]
70
76
                distance += 1
71
77
            new_ancestors[me][new_parent] = distance
72
 
    return new_ancestors
 
78
    return new_ancestors    
73
79
 
74
80
def get_rev_info(rev_id, source):
75
81
    """Return the committer, message, and date of a revision."""
77
83
    message = None
78
84
    date = None
79
85
    if rev_id == 'null:':
80
 
        return None, 'Null Revision', None, None
 
86
        return None, 'Null Revision', None
81
87
    try:
82
88
        rev = source.get_revision(rev_id)
83
89
    except NoSuchRevision:
84
90
        try:
85
91
            committer = '-'.join(rev_id.split('-')[:-2]).strip(' ')
86
92
            if committer == '':
87
 
                return None, None, None, None
 
93
                return None, None, None
88
94
        except ValueError:
89
 
            return None, None, None, None
 
95
            return None, None, None
90
96
    else:
91
97
        committer = short_committer(rev.committer)
92
98
        if rev.message is not None:
93
99
            message = rev.message.split('\n')[0]
94
100
        gmtime = time.gmtime(rev.timestamp + (rev.timezone or 0))
95
101
        date = time.strftime('%Y/%m/%d', gmtime)
96
 
        nick = rev.properties.get('branch-nick')
97
102
    if '@' in committer:
98
103
        try:
99
104
            committer = mail_map[committer]
103
108
        committer = committer_alias[committer]
104
109
    except KeyError:
105
110
        pass
106
 
    return committer, message, nick, date
 
111
    return committer, message, date
107
112
 
108
113
class Grapher(object):
109
114
    def __init__(self, branch, other_branch=None):
112
117
        self.other_branch = other_branch
113
118
        revision_a = self.branch.last_revision()
114
119
        if other_branch is not None:
115
 
            branch.fetch(other_branch)
 
120
            greedy_fetch(branch, other_branch)
116
121
            revision_b = self.other_branch.last_revision()
117
122
            try:
118
123
                self.root, self.ancestors, self.descendants, self.common = \
119
 
                    combined_graph(revision_a, revision_b,
120
 
                                   self.branch.repository)
 
124
                    combined_graph(revision_a, revision_b, self.branch)
121
125
            except bzrlib.errors.NoCommonRoot:
122
126
                raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
123
127
        else:
124
128
            self.root, self.ancestors, self.descendants = \
125
 
                revision_graph(revision_a, branch.repository)
 
129
                revision_graph(revision_a, branch)
126
130
            self.common = []
127
131
 
128
132
        self.n_history = branch.revision_history()
129
 
        self.distances = node_distances(self.descendants, self.ancestors,
 
133
        self.distances = node_distances(self.descendants, self.ancestors, 
130
134
                                        self.root)
131
135
        if other_branch is not None:
132
136
            self.base = select_farthest(self.distances, self.common)
133
 
            self.m_history = other_branch.revision_history()
 
137
            self.m_history = other_branch.revision_history() 
134
138
        else:
135
139
            self.base = None
136
140
            self.m_history = []
175
179
            color = "#33ff99"
176
180
 
177
181
        label = [name]
178
 
        committer, message, nick, date = get_rev_info(node,
179
 
                                                      self.branch.repository)
 
182
        committer, message, date = get_rev_info(node, self.branch)
180
183
        if committer is not None:
181
184
            label.append(committer)
182
185
 
183
 
        if nick is not None:
184
 
            label.append(nick)
185
 
 
186
186
        if date is not None:
187
187
            label.append(date)
188
188
 
192
192
        else:
193
193
            rank = None
194
194
 
195
 
        d_node = Node("n%d" % num, color=color, label="\\n".join(label),
 
195
        d_node = Node("n%d" % num, color=color, label="\\n".join(label), 
196
196
                    rev_id=node, cluster=cluster, message=message,
197
197
                    date=date)
198
198
        d_node.rank = rank
201
201
            d_node.node_style.append('dotted')
202
202
 
203
203
        return d_node
204
 
 
205
 
    def get_relations(self, collapse=False, max_distance=None):
 
204
        
 
205
    def get_relations(self, collapse=False):
206
206
        dot_nodes = {}
207
207
        node_relations = []
208
208
        num = 0
209
209
        if collapse:
210
 
            visible_ancestors = compact_ancestors(self.descendants,
 
210
            visible_ancestors = compact_ancestors(self.descendants, 
211
211
                                                  self.ancestors, (self.base,))
212
212
        else:
213
213
            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
214
        for node, parents in visible_ancestors.iteritems():
219
215
            if node not in dot_nodes:
220
216
                dot_nodes[node] = self.dot_node(node, num)
235
231
 
236
232
 
237
233
def write_ancestry_file(branch, filename, collapse=True, antialias=True,
238
 
                        merge_branch=None, ranking="forced", max_distance=None):
 
234
                        merge_branch=None, ranking="forced"):
239
235
    b = Branch.open_containing(branch)[0]
240
236
    if merge_branch is not None:
241
237
        m = Branch.open_containing(merge_branch)[0]
242
238
    else:
243
239
        m = None
244
 
    b.lock_write()
 
240
    b.lock_read()
245
241
    try:
246
242
        if m is not None:
247
243
            m.lock_read()
248
244
        try:
249
245
            grapher = Grapher(b, m)
250
 
            relations = grapher.get_relations(collapse, max_distance)
 
246
            relations = grapher.get_relations(collapse)
251
247
        finally:
252
248
            if m is not None:
253
249
                m.unlock()
259
255
    done = False
260
256
    if ext not in RSVG_OUTPUT_TYPES:
261
257
        antialias = False
262
 
    if antialias:
 
258
    if antialias: 
263
259
        output = list(output)
264
260
        try:
265
261
            invoke_dot_aa(output, filename, ext)
281
277
    elif ext == 'dot' and not done:
282
278
        my_file = file(filename, 'wb')
283
279
        for fragment in output:
284
 
            my_file.write(fragment.encode('utf-8'))
 
280
            my_file.write(fragment)
285
281
    elif ext == 'html':
286
282
        try:
287
283
            invoke_dot_html(output, filename)