/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-03-13 16:48:48 UTC
  • Revision ID: jelmer@samba.org-20070313164848-x8j21t8u7ege6ml0
Initial work on a preferences dialog in GTK+, including a list of plugins with metadata browser.

Screenshot at http://samba.org/~jelmer/bzr/bzr-pluginlist.png

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate/gannotate.py
21
21
import gobject
22
22
import gtk
23
23
import pango
 
24
import re
24
25
 
25
 
from bzrlib import tsort
 
26
from bzrlib import patiencediff, tsort
26
27
from bzrlib.errors import NoSuchRevision
27
 
from bzrlib.revision import NULL_REVISION
 
28
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
28
29
 
29
30
from colormap import AnnotateColorMap, AnnotateColorSaturation
30
 
from logview import LogView
31
 
from spanselector import SpanSelector
 
31
from bzrlib.plugins.gtk.logview import LogView
32
32
 
33
33
 
34
34
(
54
54
        self.annotate_colormap = AnnotateColorSaturation()
55
55
 
56
56
        self._create()
57
 
 
58
 
        if self.plain:
59
 
            self.span_selector.hide()
60
 
 
61
 
    def annotate(self, branch, file_id, revision_id=None):
62
57
        self.revisions = {}
 
58
 
 
59
    def annotate(self, tree, branch, file_id):
63
60
        self.annotations = []
64
61
        self.branch = branch
 
62
        self.tree = tree
65
63
        self.file_id = file_id
66
 
        self.revision_id = revision_id
 
64
        self.revision_id = getattr(tree, 'get_revision_id', 
 
65
                                   lambda: CURRENT_REVISION)()
67
66
        
68
67
        # [revision id, line number, committer, revno, highlight color, line]
69
68
        self.annomodel = gtk.ListStore(gobject.TYPE_STRING,
78
77
            branch.lock_read()
79
78
            branch.repository.lock_read()
80
79
            for line_no, (revision, revno, line)\
81
 
                    in enumerate(self._annotate(branch, file_id, revision_id)):
 
80
                    in enumerate(self._annotate(tree, file_id)):
82
81
                if revision.revision_id == last_seen and not self.all:
83
82
                    revno = committer = ""
84
83
                else:
98
97
                self.annotations.append(revision)
99
98
 
100
99
            if not self.plain:
101
 
                self._set_oldest_newest()
102
 
                # Recall that calling activate_default will emit "span-changed",
103
 
                # so self._span_changed_cb will take care of initial highlighting
104
 
                self.span_selector.activate_default()
 
100
                now = time.time()
 
101
                self.annomodel.foreach(self._highlight_annotation, now)
105
102
        finally:
106
103
            branch.repository.unlock()
107
104
            branch.unlock()
136
133
            dotted[revision_id] = '.'.join(str(num) for num in revno)
137
134
        return dotted
138
135
 
139
 
    def _annotate(self, branch, file_id, revision_id):
140
 
        repository = branch.repository
141
 
        if revision_id is None:
142
 
            revision_id = branch.last_revision()
 
136
    def _annotate(self, tree, file_id):
 
137
        current_revision = FakeRevision(CURRENT_REVISION)
 
138
        current_revision.committer = self.branch.get_config().username()
 
139
        current_revision.timestamp = time.time()
 
140
        current_revision.message = '[Not yet committed]'
 
141
        current_revision.parent_ids = tree.get_parent_ids()
 
142
        current_revision.properties['branch-nick'] = self.branch.nick
 
143
        current_revno = '%d?' % (self.branch.revno() + 1)
 
144
        repository = self.branch.repository
 
145
        if self.revision_id == CURRENT_REVISION:
 
146
            revision_id = self.branch.last_revision()
 
147
        else:
 
148
            revision_id = self.revision_id
143
149
        dotted = self._dotted_revnos(repository, revision_id)
144
 
        rev_tree = repository.revision_tree(revision_id)
145
 
        revision_id = rev_tree.inventory[file_id].revision
146
 
        weave = repository.weave_store.get_weave(file_id,
147
 
                                                 branch.get_transaction())
148
 
        
149
 
        revision_cache = RevisionCache(repository)
150
 
        for origin, text in weave.annotate_iter(revision_id):
 
150
        revision_cache = RevisionCache(repository, self.revisions)
 
151
        for origin, text in tree.annotate_iter(file_id):
151
152
            rev_id = origin
152
 
            try:
153
 
                revision = revision_cache.get_revision(rev_id)
154
 
                revno = dotted.get(rev_id, 'merge')
155
 
                if len(revno) > 15:
156
 
                    revno = 'merge'
157
 
            except NoSuchRevision:
158
 
                revision = NoneRevision(rev_id)
159
 
                revno = "?"
 
153
            if rev_id == CURRENT_REVISION:
 
154
                revision = current_revision
 
155
                revno = current_revno
 
156
            else:
 
157
                try:
 
158
                    revision = revision_cache.get_revision(rev_id)
 
159
                    revno = dotted.get(rev_id, 'merge')
 
160
                    if len(revno) > 15:
 
161
                        revno = 'merge'
 
162
                except NoSuchRevision:
 
163
                    revision = FakeRevision(rev_id)
 
164
                    revno = "?"
160
165
 
161
166
            yield revision, revno, text
162
167
 
163
 
    def _set_oldest_newest(self):
164
 
        rev_dates = map(lambda i: self.revisions[i].timestamp, self.revisions)
165
 
        if len(rev_dates) == 0:
166
 
            return
167
 
        oldest = min(rev_dates)
168
 
        newest = max(rev_dates)
169
 
 
170
 
        span = self._span_from_seconds(time.time() - oldest)
171
 
        self.span_selector.set_to_oldest_span(span)
172
 
        
173
 
        span = self._span_from_seconds(newest - oldest)
174
 
        self.span_selector.set_newest_to_oldest_span(span)
175
 
 
176
 
    def _span_from_seconds(self, seconds):
177
 
        return (seconds / (24 * 60 * 60))
178
 
    
179
 
    def _span_changed_cb(self, w, span):
180
 
        self.annotate_colormap.set_span(span)
181
 
        now = time.time()
182
 
        self.annomodel.foreach(self._highlight_annotation, now)
183
 
 
184
168
    def _highlight_annotation(self, model, path, iter, now):
185
169
        revision_id, = model.get(iter, REVISION_ID_COL)
186
170
        revision = self.revisions[revision_id]
187
171
        model.set(iter, HIGHLIGHT_COLOR_COL,
188
172
                  self.annotate_colormap.get_color(revision, now))
189
173
 
190
 
    def _show_log(self, w):
 
174
    def _selected_revision(self):
191
175
        (path, col) = self.annoview.get_cursor()
192
176
        if path is None:
 
177
            return None
 
178
        return self.annomodel[path][REVISION_ID_COL]
 
179
 
 
180
    def _show_log(self, w):
 
181
        rev_id = self._selected_revision()
 
182
        if rev_id is None:
193
183
            return
194
 
        rev_id = self.annomodel[path][REVISION_ID_COL]
195
184
        self.logview.set_revision(self.revisions[rev_id])
196
185
 
197
186
    def _create(self):
198
187
        self.logview = self._create_log_view()
199
188
        self.annoview = self._create_annotate_view()
200
 
        self.span_selector = self._create_span_selector()
201
189
 
202
190
        vbox = gtk.VBox(False, 12)
203
191
        vbox.set_border_width(12)
215
203
        pane.add2(self.logview)
216
204
        pane.show()
217
205
        vbox.pack_start(pane, expand=True, fill=True)
218
 
        
 
206
 
 
207
        self._search = SearchBox()
 
208
        vbox.pack_start(self._search, expand=False, fill=True)
 
209
        accels = gtk.AccelGroup()
 
210
        accels.connect_group(gtk.keysyms.f, gtk.gdk.CONTROL_MASK,
 
211
                             gtk.ACCEL_LOCKED,
 
212
                             self._search_by_text)
 
213
        accels.connect_group(gtk.keysyms.g, gtk.gdk.CONTROL_MASK,
 
214
                             gtk.ACCEL_LOCKED,
 
215
                             self._search_by_line)
 
216
        self.add_accel_group(accels)
 
217
 
219
218
        hbox = gtk.HBox(True, 6)
220
 
        hbox.pack_start(self.span_selector, expand=False, fill=True)
221
 
        hbox.pack_start(self._create_button_box(), expand=False, fill=True)
 
219
        hbox.pack_start(self._create_prev_button(), expand=False, fill=True)
 
220
        hbox.pack_end(self._create_button_box(), expand=False, fill=True)
222
221
        hbox.show()
223
222
        vbox.pack_start(hbox, expand=False, fill=True)
224
223
 
225
224
        self.add(vbox)
226
225
 
 
226
    def _search_by_text(self, accel_group, window, key, modifiers):
 
227
        self._search.show_for('text')
 
228
        self._search.set_target(self.annoview, TEXT_LINE_COL)
 
229
 
 
230
    def _search_by_line(self, accel_group, window, key, modifiers):
 
231
        self._search.show_for('line')
 
232
        self._search.set_target(self.annoview, LINE_NUM_COL)
 
233
 
227
234
    def row_diff(self, tv, path, tvc):
228
235
        row = path[0]
229
236
        revision = self.annotations[row]
230
237
        repository = self.branch.repository
231
 
        tree1 = repository.revision_tree(revision.revision_id)
232
 
        if len(revision.parent_ids) > 0:
233
 
            tree2 = repository.revision_tree(revision.parent_ids[0])
 
238
        if revision.revision_id == CURRENT_REVISION:
 
239
            tree1 = self.tree
 
240
            tree2 = self.tree.basis_tree()
234
241
        else:
235
 
            tree2 = repository.revision_tree(NULL_REVISION)
236
 
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
 
242
            tree1 = repository.revision_tree(revision.revision_id)
 
243
            if len(revision.parent_ids) > 0:
 
244
                tree2 = repository.revision_tree(revision.parent_ids[0])
 
245
            else:
 
246
                tree2 = repository.revision_tree(NULL_REVISION)
 
247
        from bzrlib.plugins.gtk.diff import DiffWindow
237
248
        window = DiffWindow()
238
249
        window.set_diff("Diff for row %d" % (row+1), tree1, tree2)
239
250
        window.set_file(tree1.id2path(self.file_id))
292
303
        col.add_attribute(cell, "text", TEXT_LINE_COL)
293
304
        tv.append_column(col)
294
305
 
 
306
        # FIXME: Now that C-f is now used for search by text we
 
307
        # may as well disable the auto search.
295
308
        tv.set_search_column(LINE_NUM_COL)
296
 
        
 
309
 
297
310
        return tv
298
311
 
299
 
    def _create_span_selector(self):
300
 
        ss = SpanSelector()
301
 
        ss.connect("span-changed", self._span_changed_cb)
302
 
        ss.show()
303
 
 
304
 
        return ss
305
 
 
306
312
    def _create_log_view(self):
307
313
        lv = LogView()
308
314
        lv.show()
309
 
 
310
315
        return lv
311
316
 
312
317
    def _create_button_box(self):
313
318
        box = gtk.HButtonBox()
314
319
        box.set_layout(gtk.BUTTONBOX_END)
315
320
        box.show()
316
 
        
 
321
 
317
322
        button = gtk.Button()
318
323
        button.set_use_stock(True)
319
324
        button.set_label("gtk-close")
320
325
        button.connect("clicked", lambda w: self.destroy())
321
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()
322
336
        
 
337
        button = gtk.Button()
 
338
        button.set_use_stock(True)
 
339
        button.set_label("gtk-go-back")
 
340
        button.connect("clicked", lambda w: self.go_back())
 
341
        button.show()
323
342
        box.pack_start(button, expand=False, fill=False)
324
 
 
325
343
        return box
326
344
 
327
 
 
328
 
class NoneRevision:
 
345
    def go_back(self):
 
346
        rev_id = self._selected_revision()
 
347
        parent_id = self.revisions[rev_id].parent_ids[0]
 
348
        tree = self.branch.repository.revision_tree(parent_id)
 
349
        if self.file_id in tree:
 
350
            offset = self.get_scroll_offset(tree)
 
351
            (row,), col = self.annoview.get_cursor()
 
352
            self.annotate(tree, self.branch, self.file_id)
 
353
            self.annoview.set_cursor(row+offset)
 
354
 
 
355
    def get_scroll_offset(self, tree):
 
356
        old = self.tree.get_file(self.file_id)
 
357
        new = tree.get_file(self.file_id)
 
358
        (row,), col = self.annoview.get_cursor()
 
359
        matcher = patiencediff.PatienceSequenceMatcher(None, old.readlines(),
 
360
                                                       new.readlines())
 
361
        for i, j, n in matcher.get_matching_blocks():
 
362
            if i + n >= row:
 
363
                return j - i
 
364
 
 
365
 
 
366
 
 
367
class FakeRevision:
329
368
    """ A fake revision.
330
369
 
331
370
    For when a revision is referenced but not present.
332
371
    """
333
372
 
334
 
    def __init__(self, revision_id):
 
373
    def __init__(self, revision_id, committer='?', nick=None):
335
374
        self.revision_id = revision_id
336
375
        self.parent_ids = []
337
 
        self.committer = "?"
 
376
        self.committer = committer
338
377
        self.message = "?"
339
378
        self.timestamp = 0.0
340
379
        self.timezone = 0
 
380
        self.properties = {}
341
381
 
342
382
 
343
383
class RevisionCache(object):
344
384
    """A caching revision source"""
345
 
    def __init__(self, real_source):
 
385
    def __init__(self, real_source, seed_cache=None):
346
386
        self.__real_source = real_source
347
 
        self.__cache = {}
 
387
        if seed_cache is None:
 
388
            self.__cache = {}
 
389
        else:
 
390
            self.__cache = dict(seed_cache)
348
391
 
349
392
    def get_revision(self, revision_id):
350
393
        if revision_id not in self.__cache:
351
394
            revision = self.__real_source.get_revision(revision_id)
352
395
            self.__cache[revision_id] = revision
353
396
        return self.__cache[revision_id]
 
397
 
 
398
class SearchBox(gtk.HBox):
 
399
    """A button box for searching in text or lines of annotations"""
 
400
    def __init__(self):
 
401
        gtk.HBox.__init__(self, False, 6)
 
402
 
 
403
        # Close button
 
404
        button = gtk.Button()
 
405
        image = gtk.Image()
 
406
        image.set_from_stock('gtk-stop', gtk.ICON_SIZE_BUTTON)
 
407
        button.set_image(image)
 
408
        button.set_relief(gtk.RELIEF_NONE)
 
409
        button.connect("clicked", lambda w: self.hide_all())
 
410
        self.pack_start(button, expand=False, fill=False)
 
411
 
 
412
        # Search entry
 
413
        label = gtk.Label()
 
414
        self._label = label
 
415
        self.pack_start(label, expand=False, fill=False)
 
416
 
 
417
        entry = gtk.Entry()
 
418
        self._entry = entry
 
419
        entry.connect("activate", lambda w, d: self._do_search(d),
 
420
                      'forward')
 
421
        self.pack_start(entry, expand=False, fill=False)
 
422
 
 
423
        # Next/previous buttons
 
424
        button = gtk.Button('_Next')
 
425
        image = gtk.Image()
 
426
        image.set_from_stock('gtk-go-forward', gtk.ICON_SIZE_BUTTON)
 
427
        button.set_image(image)
 
428
        button.connect("clicked", lambda w, d: self._do_search(d),
 
429
                       'forward')
 
430
        self.pack_start(button, expand=False, fill=False)
 
431
 
 
432
        button = gtk.Button('_Previous')
 
433
        image = gtk.Image()
 
434
        image.set_from_stock('gtk-go-back', gtk.ICON_SIZE_BUTTON)
 
435
        button.set_image(image)
 
436
        button.connect("clicked", lambda w, d: self._do_search(d),
 
437
                       'backward')
 
438
        self.pack_start(button, expand=False, fill=False)
 
439
 
 
440
        # Search options
 
441
        check = gtk.CheckButton('Match case')
 
442
        self._match_case = check
 
443
        self.pack_start(check, expand=False, fill=False)
 
444
 
 
445
        check = gtk.CheckButton('Regexp')
 
446
        check.connect("toggled", lambda w: self._set_label())
 
447
        self._regexp = check
 
448
        self.pack_start(check, expand=False, fill=False)
 
449
 
 
450
        self._view = None
 
451
        self._column = None
 
452
        # Note that we stay hidden (we do not call self.show_all())
 
453
 
 
454
 
 
455
    def show_for(self, kind):
 
456
        self._kind = kind
 
457
        self.show_all()
 
458
        self._set_label()
 
459
        # Hide unrelated buttons
 
460
        if kind == 'line':
 
461
            self._match_case.hide()
 
462
            self._regexp.hide()
 
463
        # Be ready
 
464
        self._entry.grab_focus()
 
465
 
 
466
    def _set_label(self):
 
467
        if self._kind == 'line':
 
468
            self._label.set_text('Find Line: ')
 
469
        else:
 
470
            if self._regexp.get_active():
 
471
                self._label.set_text('Find Regexp: ')
 
472
            else:
 
473
                self._label.set_text('Find Text: ')
 
474
 
 
475
    def set_target(self, view,column):
 
476
        self._view = view
 
477
        self._column = column
 
478
 
 
479
    def _match(self, model, iterator, column):
 
480
        matching_case = self._match_case.get_active()
 
481
        string, = model.get(iterator, column)
 
482
        key = self._entry.get_text()
 
483
        if self._regexp.get_active():
 
484
            if matching_case:
 
485
                match = re.compile(key).search(string, 1)
 
486
            else:
 
487
                match = re.compile(key, re.I).search(string, 1)
 
488
        else:
 
489
            if not matching_case:
 
490
                string = string.lower()
 
491
                key = key.lower()
 
492
            match = string.find(key) != -1
 
493
 
 
494
        return match
 
495
 
 
496
    def _iterate_rows_forward(self, model, start):
 
497
        model_size = len(model)
 
498
        current = start + 1
 
499
        while model_size != 0:
 
500
            if current >= model_size: current =  0
 
501
            yield model.get_iter_from_string('%d' % current)
 
502
            if current == start: raise StopIteration
 
503
            current += 1
 
504
 
 
505
    def _iterate_rows_backward(self, model, start):
 
506
        model_size = len(model)
 
507
        current = start - 1
 
508
        while model_size != 0:
 
509
            if current < 0: current = model_size - 1
 
510
            yield model.get_iter_from_string('%d' % current)
 
511
            if current == start: raise StopIteration
 
512
            current -= 1
 
513
 
 
514
    def _do_search(self, direction):
 
515
        if direction == 'forward':
 
516
            iterate = self._iterate_rows_forward
 
517
        else:
 
518
            iterate = self._iterate_rows_backward
 
519
 
 
520
        model, sel = self._view.get_selection().get_selected()
 
521
        if sel is None:
 
522
            start = 0
 
523
        else:
 
524
            path = model.get_string_from_iter(sel)
 
525
            start = int(path)
 
526
 
 
527
        for row in iterate(model, start):
 
528
            if self._match(model, row, self._column):
 
529
                path = model.get_path(row)
 
530
                self._view.set_cursor(path)
 
531
                self._view.scroll_to_cell(path, use_align=True)
 
532
                break