/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 14:19:44 UTC
  • Revision ID: jelmer@samba.org-20070203141944-oa6iqhetsy0slqo0
Fix references to dialog.

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 = ", ".join(revision.get_apparent_authors())
 
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._get_nick(local=True)
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
 
        self.find_button = self._create_find_button()
216
 
        hbox.pack_start(self.find_button, expand=False, fill=True)
217
 
        self.goto_button = self._create_goto_button()
218
 
        hbox.pack_start(self.goto_button, expand=False, fill=True)
219
 
        hbox.show()
220
 
        vbox.pack_start(hbox, expand=False, fill=True)
221
199
        
222
200
        self.pane = pane = gtk.VPaned()
223
 
        pane.add1(swbox)
224
 
        pane.add2(self.revisionview)
 
201
        pane.add1(sw)
 
202
        pane.add2(self.logview)
225
203
        pane.show()
226
204
        vbox.pack_start(pane, expand=True, fill=True)
227
205
 
228
206
        self._search = SearchBox()
229
 
        swbox.pack_start(self._search, expand=False, fill=True)
 
207
        vbox.pack_start(self._search, expand=False, fill=True)
230
208
        accels = gtk.AccelGroup()
231
209
        accels.connect_group(gtk.keysyms.f, gtk.gdk.CONTROL_MASK,
232
210
                             gtk.ACCEL_LOCKED,
236
214
                             self._search_by_line)
237
215
        self.add_accel_group(accels)
238
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
 
239
223
        self.add(vbox)
240
224
 
241
 
    def _search_by_text(self, *ignored): # (accel_group, window, key, modifiers):
 
225
    def _search_by_text(self, accel_group, window, key, modifiers):
242
226
        self._search.show_for('text')
243
227
        self._search.set_target(self.annoview, TEXT_LINE_COL)
244
228
 
245
 
    def _search_by_line(self, *ignored): # accel_group, window, key, modifiers):
 
229
    def _search_by_line(self, accel_group, window, key, modifiers):
246
230
        self._search.show_for('line')
247
231
        self._search.set_target(self.annoview, LINE_NUM_COL)
248
232
 
249
 
    def line_diff(self, tv, path, tvc):
 
233
    def row_diff(self, tv, path, tvc):
250
234
        row = path[0]
251
235
        revision = self.annotations[row]
252
236
        repository = self.branch.repository
261
245
                tree2 = repository.revision_tree(NULL_REVISION)
262
246
        from bzrlib.plugins.gtk.diff import DiffWindow
263
247
        window = DiffWindow()
264
 
        window.set_diff("Diff for line %d" % (row+1), tree1, tree2)
 
248
        window.set_diff("Diff for row %d" % (row+1), tree1, tree2)
265
249
        window.set_file(tree1.id2path(self.file_id))
266
250
        window.show()
267
251
 
269
253
    def _create_annotate_view(self):
270
254
        tv = gtk.TreeView()
271
255
        tv.set_rules_hint(False)
272
 
        tv.connect("cursor-changed", self._activate_selected_revision)
 
256
        tv.connect("cursor-changed", self._show_log)
273
257
        tv.show()
274
 
        tv.connect("row-activated", self.line_diff)
 
258
        tv.connect("row-activated", self.row_diff)
275
259
 
276
260
        cell = gtk.CellRendererText()
277
261
        cell.set_property("xalign", 1.0)
325
309
        return tv
326
310
 
327
311
    def _create_log_view(self):
328
 
        lv = RevisionView(self._branch)
 
312
        lv = LogView()
329
313
        lv.show()
330
314
        return lv
331
315
 
332
 
    def _create_back_button(self):
 
316
    def _create_button_box(self):
 
317
        box = gtk.HButtonBox()
 
318
        box.set_layout(gtk.BUTTONBOX_END)
 
319
        box.show()
 
320
 
 
321
        button = gtk.Button()
 
322
        button.set_use_stock(True)
 
323
        button.set_label("gtk-close")
 
324
        button.connect("clicked", lambda w: self.destroy())
 
325
        button.show()
 
326
 
 
327
        box.pack_start(button, expand=False, fill=False)
 
328
 
 
329
        return box
 
330
 
 
331
    def _create_prev_button(self):
 
332
        box = gtk.HButtonBox()
 
333
        box.set_layout(gtk.BUTTONBOX_START)
 
334
        box.show()
 
335
        
333
336
        button = gtk.Button()
334
337
        button.set_use_stock(True)
335
338
        button.set_label("gtk-go-back")
336
339
        button.connect("clicked", lambda w: self.go_back())
337
 
        button.set_relief(gtk.RELIEF_NONE)
338
 
        button.show()
339
 
        return button
340
 
 
341
 
    def _create_forward_button(self):
342
 
        button = gtk.Button()
343
 
        button.set_use_stock(True)
344
 
        button.set_label("gtk-go-forward")
345
 
        button.connect("clicked", lambda w: self.go_forward())
346
 
        button.set_relief(gtk.RELIEF_NONE)
347
 
        button.show()
348
 
        button.set_sensitive(False)
349
 
        return button
350
 
 
351
 
    def _create_find_button(self):
352
 
        button = gtk.Button()
353
 
        button.set_use_stock(True)
354
 
        button.set_label("gtk-find")
355
 
        button.set_tooltip_text("Search for text (Ctrl+F)")
356
 
        button.connect("clicked", self._search_by_text)
357
 
        button.set_relief(gtk.RELIEF_NONE)
358
 
        button.show()
359
 
        button.set_sensitive(True)
360
 
        return button
361
 
 
362
 
    def _create_goto_button(self):
363
 
        button = gtk.Button()
364
 
        button.set_label("Goto Line")
365
 
        button.set_tooltip_text("Scroll to a line by entering its number (Ctrl+G)")
366
 
        button.connect("clicked", self._search_by_line)
367
 
        button.set_relief(gtk.RELIEF_NONE)
368
 
        button.show()
369
 
        button.set_sensitive(True)
370
 
        return button
 
340
        button.show()
 
341
        box.pack_start(button, expand=False, fill=False)
 
342
        return box
371
343
 
372
344
    def go_back(self):
373
 
        last_tree = self.tree
374
345
        rev_id = self._selected_revision()
375
346
        parent_id = self.revisions[rev_id].parent_ids[0]
376
 
        target_tree = self.branch.repository.revision_tree(parent_id)
377
 
        if self._go(target_tree):
378
 
            self.history.append(last_tree)
379
 
            self.forward_button.set_sensitive(True)
380
 
        else:
381
 
            self._no_back.add(parent_id)
382
 
            self.back_button.set_sensitive(False)
383
 
 
384
 
    def go_forward(self):
385
 
        if len(self.history) == 0:
386
 
            return
387
 
        target_tree = self.history.pop()
388
 
        if len(self.history) == 0:
389
 
            self.forward_button.set_sensitive(False)
390
 
        self._go(target_tree)
391
 
 
392
 
    def _go(self, target_tree):
393
 
        rev_id = self._selected_revision()
394
 
        if self.file_id in target_tree:
395
 
            offset = self.get_scroll_offset(target_tree)
 
347
        tree = self.branch.repository.revision_tree(parent_id)
 
348
        if self.file_id in tree:
 
349
            offset = self.get_scroll_offset(tree)
396
350
            (row,), col = self.annoview.get_cursor()
397
 
            self.annotate(target_tree, self.branch, self.file_id)
398
 
            new_row = row+offset
399
 
            if new_row < 0:
400
 
                new_row = 0
401
 
            self.annoview.set_cursor(new_row)
402
 
            return True
403
 
        else:
404
 
            return False
 
351
            self.annotate(tree, self.branch, self.file_id)
 
352
            self.annoview.set_cursor(row+offset)
405
353
 
406
354
    def get_scroll_offset(self, tree):
407
355
        old = self.tree.get_file(self.file_id)
414
362
                return j - i
415
363
 
416
364
 
417
 
class FakeRevision(object):
 
365
 
 
366
class FakeRevision:
418
367
    """ A fake revision.
419
368
 
420
369
    For when a revision is referenced but not present.
421
370
    """
422
371
 
423
 
    def __init__(self, revision_id, committer='?', nick=None):
 
372
    def __init__(self, revision_id, committer='?'):
424
373
        self.revision_id = revision_id
425
374
        self.parent_ids = []
426
375
        self.committer = committer
427
376
        self.message = "?"
428
377
        self.timestamp = 0.0
429
378
        self.timezone = 0
430
 
        self.properties = {}
431
 
 
432
 
    def get_apparent_authors(self):
433
 
        return [self.committer]
 
379
        self.properties = []
434
380
 
435
381
 
436
382
class RevisionCache(object):
437
383
    """A caching revision source"""
438
 
 
439
384
    def __init__(self, real_source, seed_cache=None):
440
385
        self.__real_source = real_source
441
386
        if seed_cache is None: