/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to annotate/gannotate.py

  • Committer: Jelmer Vernooij
  • Date: 2007-02-03 11:52:13 UTC
  • Revision ID: jelmer@samba.org-20070203115213-qz5549tkrt2wsz05
Move more code to top-level directory. 
Import (last proposed) logo for Bazaar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate/gannotate.py
28
28
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
29
29
 
30
30
from colormap import AnnotateColorMap, AnnotateColorSaturation
31
 
from bzrlib.plugins.gtk.revisionview import RevisionView
32
 
from bzrlib.plugins.gtk.window import Window
 
31
from bzrlib.plugins.gtk.logview import LogView
33
32
 
34
33
 
35
34
(
42
41
) = range(6)
43
42
 
44
43
 
45
 
class GAnnotateWindow(Window):
 
44
class GAnnotateWindow(gtk.Window):
46
45
    """Annotate window."""
47
46
 
48
 
    def __init__(self, all=False, plain=False, parent=None, branch=None):
 
47
    def __init__(self, all=False, plain=False):
49
48
        self.all = all
50
49
        self.plain = plain
51
 
        self._branch = branch
52
50
        
53
 
        Window.__init__(self, parent)
 
51
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
54
52
        
55
53
        self.set_icon(self.render_icon(gtk.STOCK_FIND, gtk.ICON_SIZE_BUTTON))
56
54
        self.annotate_colormap = AnnotateColorSaturation()
57
55
 
58
56
        self._create()
59
57
        self.revisions = {}
60
 
        self.history = []
61
 
        self._no_back = set()
62
58
 
63
59
    def annotate(self, tree, branch, file_id):
64
60
        self.annotations = []
65
61
        self.branch = branch
66
62
        self.tree = tree
67
63
        self.file_id = file_id
68
 
        self.revisionview.set_file_id(file_id)
69
64
        self.revision_id = getattr(tree, 'get_revision_id', 
70
65
                                   lambda: CURRENT_REVISION)()
71
66
        
72
 
        # [revision id, line number, author, revno, highlight color, line]
 
67
        # [revision id, line number, committer, revno, highlight color, line]
73
68
        self.annomodel = gtk.ListStore(gobject.TYPE_STRING,
74
69
                                       gobject.TYPE_STRING,
75
70
                                       gobject.TYPE_STRING,
81
76
        try:
82
77
            branch.lock_read()
83
78
            branch.repository.lock_read()
84
 
            self.dotted = {}
85
 
            revno_map = self.branch.get_revision_id_to_revno_map()
86
 
            for revision_id, revno in revno_map.iteritems():
87
 
                self.dotted[revision_id] = '.'.join(str(num) for num in revno)
88
79
            for line_no, (revision, revno, line)\
89
80
                    in enumerate(self._annotate(tree, file_id)):
90
81
                if revision.revision_id == last_seen and not self.all:
91
 
                    revno = author = ""
 
82
                    revno = committer = ""
92
83
                else:
93
84
                    last_seen = revision.revision_id
94
 
                    author = revision.get_apparent_author()
 
85
                    committer = revision.committer
95
86
 
96
87
                if revision.revision_id not in self.revisions:
97
88
                    self.revisions[revision.revision_id] = revision
98
89
 
99
90
                self.annomodel.append([revision.revision_id,
100
91
                                       line_no + 1,
101
 
                                       author,
 
92
                                       committer,
102
93
                                       revno,
103
94
                                       None,
104
95
                                       line.rstrip("\r\n")
114
105
 
115
106
        self.annoview.set_model(self.annomodel)
116
107
        self.annoview.grab_focus()
117
 
        my_revno = self.dotted.get(self.revision_id, 'current')
118
 
        title = '%s (%s) - gannotate' % (self.tree.id2path(file_id), my_revno)
119
 
        self.set_title(title)
120
108
 
121
109
    def jump_to_line(self, lineno):
122
110
        if lineno > len(self.annomodel) or lineno < 1:
132
120
        self.annoview.set_cursor(row)
133
121
        self.annoview.scroll_to_cell(row, use_align=True)
134
122
 
 
123
    def _dotted_revnos(self, repository, revision_id):
 
124
        """Return a dict of revision_id -> dotted revno
 
125
        
 
126
        :param repository: The repository to get the graph from
 
127
        :param revision_id: The last revision for which this info is needed
 
128
        """
 
129
        graph = repository.get_revision_graph(revision_id)
 
130
        dotted = {}
 
131
        for n, revision_id, d, revno, e in tsort.merge_sort(graph, 
 
132
            revision_id, generate_revno=True):
 
133
            dotted[revision_id] = '.'.join(str(num) for num in revno)
 
134
        return dotted
135
135
 
136
136
    def _annotate(self, tree, file_id):
137
137
        current_revision = FakeRevision(CURRENT_REVISION)
139
139
        current_revision.timestamp = time.time()
140
140
        current_revision.message = '[Not yet committed]'
141
141
        current_revision.parent_ids = tree.get_parent_ids()
142
 
        current_revision.properties['branch-nick'] = self.branch.nick
143
142
        current_revno = '%d?' % (self.branch.revno() + 1)
144
143
        repository = self.branch.repository
145
144
        if self.revision_id == CURRENT_REVISION:
146
145
            revision_id = self.branch.last_revision()
147
146
        else:
148
147
            revision_id = self.revision_id
 
148
        dotted = self._dotted_revnos(repository, revision_id)
149
149
        revision_cache = RevisionCache(repository, self.revisions)
150
150
        for origin, text in tree.annotate_iter(file_id):
151
151
            rev_id = origin
155
155
            else:
156
156
                try:
157
157
                    revision = revision_cache.get_revision(rev_id)
158
 
                    revno = self.dotted.get(rev_id, 'merge')
 
158
                    revno = dotted.get(rev_id, 'merge')
159
159
                    if len(revno) > 15:
160
160
                        revno = 'merge'
161
161
                except NoSuchRevision:
176
176
            return None
177
177
        return self.annomodel[path][REVISION_ID_COL]
178
178
 
179
 
    def _activate_selected_revision(self, w):
 
179
    def _show_log(self, w):
180
180
        rev_id = self._selected_revision()
181
 
        if not rev_id or rev_id == NULL_REVISION:
 
181
        if rev_id is None:
182
182
            return
183
 
        selected = self.revisions[rev_id]
184
 
        self.revisionview.set_revision(selected)
185
 
        if (len(selected.parent_ids) != 0 and selected.parent_ids[0] not in
186
 
            self._no_back):
187
 
            enable_back = True
188
 
        else:
189
 
            enable_back = False
190
 
        self.back_button.set_sensitive(enable_back)
 
183
        self.logview.set_revision(self.revisions[rev_id])
191
184
 
192
185
    def _create(self):
193
 
        self.revisionview = self._create_log_view()
 
186
        self.logview = self._create_log_view()
194
187
        self.annoview = self._create_annotate_view()
195
188
 
196
 
        vbox = gtk.VBox(False)
 
189
        vbox = gtk.VBox(False, 12)
 
190
        vbox.set_border_width(12)
197
191
        vbox.show()
198
192
 
199
193
        sw = gtk.ScrolledWindow()
202
196
        sw.add(self.annoview)
203
197
        self.annoview.gwindow = self
204
198
        sw.show()
205
 
 
206
 
        swbox = gtk.VBox()
207
 
        swbox.pack_start(sw)
208
 
        swbox.show()
209
 
 
210
 
        hbox = gtk.HBox(False, 6)
211
 
        self.back_button = self._create_back_button()
212
 
        hbox.pack_start(self.back_button, expand=False, fill=True)
213
 
        self.forward_button = self._create_forward_button()
214
 
        hbox.pack_start(self.forward_button, expand=False, fill=True)
215
 
        hbox.show()
216
 
        vbox.pack_start(hbox, expand=False, fill=True)
217
199
        
218
200
        self.pane = pane = gtk.VPaned()
219
 
        pane.add1(swbox)
220
 
        pane.add2(self.revisionview)
 
201
        pane.add1(sw)
 
202
        pane.add2(self.logview)
221
203
        pane.show()
222
204
        vbox.pack_start(pane, expand=True, fill=True)
223
205
 
224
206
        self._search = SearchBox()
225
 
        swbox.pack_start(self._search, expand=False, fill=True)
 
207
        vbox.pack_start(self._search, expand=False, fill=True)
226
208
        accels = gtk.AccelGroup()
227
209
        accels.connect_group(gtk.keysyms.f, gtk.gdk.CONTROL_MASK,
228
210
                             gtk.ACCEL_LOCKED,
232
214
                             self._search_by_line)
233
215
        self.add_accel_group(accels)
234
216
 
 
217
        hbox = gtk.HBox(True, 6)
 
218
        hbox.pack_start(self._create_prev_button(), expand=False, fill=True)
 
219
        hbox.pack_end(self._create_button_box(), expand=False, fill=True)
 
220
        hbox.show()
 
221
        vbox.pack_start(hbox, expand=False, fill=True)
 
222
 
235
223
        self.add(vbox)
236
224
 
237
225
    def _search_by_text(self, accel_group, window, key, modifiers):
242
230
        self._search.show_for('line')
243
231
        self._search.set_target(self.annoview, LINE_NUM_COL)
244
232
 
245
 
    def line_diff(self, tv, path, tvc):
 
233
    def row_diff(self, tv, path, tvc):
246
234
        row = path[0]
247
235
        revision = self.annotations[row]
248
236
        repository = self.branch.repository
255
243
                tree2 = repository.revision_tree(revision.parent_ids[0])
256
244
            else:
257
245
                tree2 = repository.revision_tree(NULL_REVISION)
258
 
        from bzrlib.plugins.gtk.diff import DiffWindow
 
246
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
259
247
        window = DiffWindow()
260
 
        window.set_diff("Diff for line %d" % (row+1), tree1, tree2)
 
248
        window.set_diff("Diff for row %d" % (row+1), tree1, tree2)
261
249
        window.set_file(tree1.id2path(self.file_id))
262
250
        window.show()
263
251
 
265
253
    def _create_annotate_view(self):
266
254
        tv = gtk.TreeView()
267
255
        tv.set_rules_hint(False)
268
 
        tv.connect("cursor-changed", self._activate_selected_revision)
 
256
        tv.connect("cursor-changed", self._show_log)
269
257
        tv.show()
270
 
        tv.connect("row-activated", self.line_diff)
 
258
        tv.connect("row-activated", self.row_diff)
271
259
 
272
260
        cell = gtk.CellRendererText()
273
261
        cell.set_property("xalign", 1.0)
321
309
        return tv
322
310
 
323
311
    def _create_log_view(self):
324
 
        lv = RevisionView(self._branch)
 
312
        lv = LogView()
325
313
        lv.show()
 
314
 
326
315
        return lv
327
316
 
328
 
    def _create_back_button(self):
 
317
    def _create_button_box(self):
 
318
        box = gtk.HButtonBox()
 
319
        box.set_layout(gtk.BUTTONBOX_END)
 
320
        box.show()
 
321
 
 
322
        button = gtk.Button()
 
323
        button.set_use_stock(True)
 
324
        button.set_label("gtk-close")
 
325
        button.connect("clicked", lambda w: self.destroy())
 
326
        button.show()
 
327
 
 
328
        box.pack_start(button, expand=False, fill=False)
 
329
 
 
330
        return box
 
331
 
 
332
    def _create_prev_button(self):
 
333
        box = gtk.HButtonBox()
 
334
        box.set_layout(gtk.BUTTONBOX_START)
 
335
        box.show()
 
336
        
329
337
        button = gtk.Button()
330
338
        button.set_use_stock(True)
331
339
        button.set_label("gtk-go-back")
332
340
        button.connect("clicked", lambda w: self.go_back())
333
 
        button.set_relief(gtk.RELIEF_NONE)
334
 
        button.show()
335
 
        return button
336
 
 
337
 
    def _create_forward_button(self):
338
 
        button = gtk.Button()
339
 
        button.set_use_stock(True)
340
 
        button.set_label("gtk-go-forward")
341
 
        button.connect("clicked", lambda w: self.go_forward())
342
 
        button.set_relief(gtk.RELIEF_NONE)
343
 
        button.show()
344
 
        button.set_sensitive(False)
345
 
        return button
 
341
        button.show()
 
342
        box.pack_start(button, expand=False, fill=False)
 
343
        return box
346
344
 
347
345
    def go_back(self):
348
 
        last_tree = self.tree
349
346
        rev_id = self._selected_revision()
350
347
        parent_id = self.revisions[rev_id].parent_ids[0]
351
 
        target_tree = self.branch.repository.revision_tree(parent_id)
352
 
        if self._go(target_tree):
353
 
            self.history.append(last_tree)
354
 
            self.forward_button.set_sensitive(True)
355
 
        else:
356
 
            self._no_back.add(parent_id)
357
 
            self.back_button.set_sensitive(False)
358
 
 
359
 
    def go_forward(self):
360
 
        if len(self.history) == 0:
361
 
            return
362
 
        target_tree = self.history.pop()
363
 
        if len(self.history) == 0:
364
 
            self.forward_button.set_sensitive(False)
365
 
        self._go(target_tree)
366
 
 
367
 
    def _go(self, target_tree):
368
 
        rev_id = self._selected_revision()
369
 
        if self.file_id in target_tree:
370
 
            offset = self.get_scroll_offset(target_tree)
 
348
        tree = self.branch.repository.revision_tree(parent_id)
 
349
        if self.file_id in tree:
 
350
            offset = self.get_scroll_offset(tree)
371
351
            (row,), col = self.annoview.get_cursor()
372
 
            self.annotate(target_tree, self.branch, self.file_id)
373
 
            new_row = row+offset
374
 
            if new_row < 0:
375
 
                new_row = 0
376
 
            self.annoview.set_cursor(new_row)
377
 
            return True
378
 
        else:
379
 
            return False
 
352
            self.annotate(tree, self.branch, self.file_id)
 
353
            self.annoview.set_cursor(row+offset)
380
354
 
381
355
    def get_scroll_offset(self, tree):
382
356
        old = self.tree.get_file(self.file_id)
389
363
                return j - i
390
364
 
391
365
 
 
366
 
392
367
class FakeRevision:
393
368
    """ A fake revision.
394
369
 
395
370
    For when a revision is referenced but not present.
396
371
    """
397
372
 
398
 
    def __init__(self, revision_id, committer='?', nick=None):
 
373
    def __init__(self, revision_id, committer='?'):
399
374
        self.revision_id = revision_id
400
375
        self.parent_ids = []
401
376
        self.committer = committer
402
377
        self.message = "?"
403
378
        self.timestamp = 0.0
404
379
        self.timezone = 0
405
 
        self.properties = {}
406
 
 
407
 
    def get_apparent_author(self):
408
 
        return self.committer
409
380
 
410
381
 
411
382
class RevisionCache(object):