/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-09 17:47:28 UTC
  • Revision ID: jelmer@samba.org-20070309174728-gljlmt9b7fu0rrn9
Add simple test for tortoise_bzr

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
 
 
26
from bzrlib import patiencediff, tsort
25
27
from bzrlib.errors import NoSuchRevision
26
 
from bzrlib.revision import NULL_REVISION
 
28
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
27
29
 
28
30
from colormap import AnnotateColorMap, AnnotateColorSaturation
29
 
from logview import LogView
30
 
from spanselector import SpanSelector
 
31
from bzrlib.plugins.gtk.logview import LogView
31
32
 
32
33
 
33
34
(
53
54
        self.annotate_colormap = AnnotateColorSaturation()
54
55
 
55
56
        self._create()
56
 
 
57
 
        if self.plain:
58
 
            self.span_selector.hide()
59
 
 
60
 
    def annotate(self, branch, file_id):
61
57
        self.revisions = {}
 
58
 
 
59
    def annotate(self, tree, branch, file_id):
62
60
        self.annotations = []
63
61
        self.branch = branch
 
62
        self.tree = tree
64
63
        self.file_id = file_id
 
64
        self.revision_id = getattr(tree, 'get_revision_id', 
 
65
                                   lambda: CURRENT_REVISION)()
65
66
        
66
67
        # [revision id, line number, committer, revno, highlight color, line]
67
68
        self.annomodel = gtk.ListStore(gobject.TYPE_STRING,
76
77
            branch.lock_read()
77
78
            branch.repository.lock_read()
78
79
            for line_no, (revision, revno, line)\
79
 
                    in enumerate(self._annotate(branch, file_id)):
 
80
                    in enumerate(self._annotate(tree, file_id)):
80
81
                if revision.revision_id == last_seen and not self.all:
81
82
                    revno = committer = ""
82
83
                else:
96
97
                self.annotations.append(revision)
97
98
 
98
99
            if not self.plain:
99
 
                self._set_oldest_newest()
100
 
                # Recall that calling activate_default will emit "span-changed",
101
 
                # so self._span_changed_cb will take care of initial highlighting
102
 
                self.span_selector.activate_default()
 
100
                now = time.time()
 
101
                self.annomodel.foreach(self._highlight_annotation, now)
103
102
        finally:
104
103
            branch.repository.unlock()
105
104
            branch.unlock()
114
113
            # bar?
115
114
            print("gannotate: Line number %d does't exist. Defaulting to "
116
115
                  "line 1." % lineno)
 
116
            return
117
117
        else:
118
118
            row = lineno - 1
119
119
 
120
120
        self.annoview.set_cursor(row)
121
121
        self.annoview.scroll_to_cell(row, use_align=True)
122
122
 
123
 
    def _annotate(self, branch, file_id):
124
 
        rev_hist = branch.revision_history()
125
 
        repository = branch.repository
126
 
        rev_tree = repository.revision_tree(branch.last_revision())
127
 
        rev_id = rev_tree.inventory[file_id].revision
128
 
        weave = repository.weave_store.get_weave(file_id,
129
 
                                                 branch.get_transaction())
 
123
    def _dotted_revnos(self, repository, revision_id):
 
124
        """Return a dict of revision_id -> dotted revno
130
125
        
131
 
        revision_cache = RevisionCache(repository)
132
 
        for origin, text in weave.annotate_iter(rev_id):
 
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
 
 
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
 
149
        dotted = self._dotted_revnos(repository, revision_id)
 
150
        revision_cache = RevisionCache(repository, self.revisions)
 
151
        for origin, text in tree.annotate_iter(file_id):
133
152
            rev_id = origin
134
 
            try:
135
 
                revision = revision_cache.get_revision(rev_id)
136
 
                if rev_id in rev_hist:
137
 
                    revno = branch.revision_id_to_revno(rev_id)
138
 
                else:
139
 
                    revno = "merge"
140
 
            except NoSuchRevision:
141
 
                revision = NoneRevision(rev_id)
142
 
                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 = "?"
143
165
 
144
166
            yield revision, revno, text
145
167
 
146
 
    def _set_oldest_newest(self):
147
 
        rev_dates = map(lambda i: self.revisions[i].timestamp, self.revisions)
148
 
        oldest = min(rev_dates)
149
 
        newest = max(rev_dates)
150
 
 
151
 
        span = self._span_from_seconds(time.time() - oldest)
152
 
        self.span_selector.set_to_oldest_span(span)
153
 
        
154
 
        span = self._span_from_seconds(newest - oldest)
155
 
        self.span_selector.set_newest_to_oldest_span(span)
156
 
 
157
 
    def _span_from_seconds(self, seconds):
158
 
        return (seconds / (24 * 60 * 60))
159
 
    
160
 
    def _span_changed_cb(self, w, span):
161
 
        self.annotate_colormap.set_span(span)
162
 
        now = time.time()
163
 
        self.annomodel.foreach(self._highlight_annotation, now)
164
 
 
165
168
    def _highlight_annotation(self, model, path, iter, now):
166
169
        revision_id, = model.get(iter, REVISION_ID_COL)
167
170
        revision = self.revisions[revision_id]
168
171
        model.set(iter, HIGHLIGHT_COLOR_COL,
169
172
                  self.annotate_colormap.get_color(revision, now))
170
173
 
 
174
    def _selected_revision(self):
 
175
        (path, col) = self.annoview.get_cursor()
 
176
        if path is None:
 
177
            return None
 
178
        return self.annomodel[path][REVISION_ID_COL]
 
179
 
171
180
    def _show_log(self, w):
172
 
        (path, col) = self.annoview.get_cursor()
173
 
        rev_id = self.annomodel[path][REVISION_ID_COL]
 
181
        rev_id = self._selected_revision()
 
182
        if rev_id is None:
 
183
            return
174
184
        self.logview.set_revision(self.revisions[rev_id])
175
185
 
176
186
    def _create(self):
177
187
        self.logview = self._create_log_view()
178
188
        self.annoview = self._create_annotate_view()
179
 
        self.span_selector = self._create_span_selector()
180
189
 
181
190
        vbox = gtk.VBox(False, 12)
182
191
        vbox.set_border_width(12)
194
203
        pane.add2(self.logview)
195
204
        pane.show()
196
205
        vbox.pack_start(pane, expand=True, fill=True)
197
 
        
 
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
 
198
218
        hbox = gtk.HBox(True, 6)
199
 
        hbox.pack_start(self.span_selector, expand=False, fill=True)
200
 
        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)
201
221
        hbox.show()
202
222
        vbox.pack_start(hbox, expand=False, fill=True)
203
223
 
204
224
        self.add(vbox)
205
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
 
206
234
    def row_diff(self, tv, path, tvc):
207
235
        row = path[0]
208
236
        revision = self.annotations[row]
209
237
        repository = self.branch.repository
210
 
        tree1 = repository.revision_tree(revision.revision_id)
211
 
        if len(revision.parent_ids) > 0:
212
 
            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()
213
241
        else:
214
 
            tree2 = repository.revision_tree(NULL_REVISION)
215
 
        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
216
248
        window = DiffWindow()
217
249
        window.set_diff("Diff for row %d" % (row+1), tree1, tree2)
218
250
        window.set_file(tree1.id2path(self.file_id))
271
303
        col.add_attribute(cell, "text", TEXT_LINE_COL)
272
304
        tv.append_column(col)
273
305
 
 
306
        # FIXME: Now that C-f is now used for search by text we
 
307
        # may as well disable the auto search.
274
308
        tv.set_search_column(LINE_NUM_COL)
275
 
        
 
309
 
276
310
        return tv
277
311
 
278
 
    def _create_span_selector(self):
279
 
        ss = SpanSelector()
280
 
        ss.connect("span-changed", self._span_changed_cb)
281
 
        ss.show()
282
 
 
283
 
        return ss
284
 
 
285
312
    def _create_log_view(self):
286
313
        lv = LogView()
287
314
        lv.show()
288
 
 
289
315
        return lv
290
316
 
291
317
    def _create_button_box(self):
292
318
        box = gtk.HButtonBox()
293
319
        box.set_layout(gtk.BUTTONBOX_END)
294
320
        box.show()
295
 
        
 
321
 
296
322
        button = gtk.Button()
297
323
        button.set_use_stock(True)
298
324
        button.set_label("gtk-close")
299
325
        button.connect("clicked", lambda w: self.destroy())
300
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()
301
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()
302
342
        box.pack_start(button, expand=False, fill=False)
303
 
 
304
343
        return box
305
344
 
306
 
 
307
 
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:
308
368
    """ A fake revision.
309
369
 
310
370
    For when a revision is referenced but not present.
311
371
    """
312
372
 
313
 
    def __init__(self, revision_id):
 
373
    def __init__(self, revision_id, committer='?', nick=None):
314
374
        self.revision_id = revision_id
315
375
        self.parent_ids = []
316
 
        self.committer = "?"
 
376
        self.committer = committer
317
377
        self.message = "?"
318
378
        self.timestamp = 0.0
319
379
        self.timezone = 0
 
380
        self.properties = {}
320
381
 
321
382
 
322
383
class RevisionCache(object):
323
384
    """A caching revision source"""
324
 
    def __init__(self, real_source):
 
385
    def __init__(self, real_source, seed_cache=None):
325
386
        self.__real_source = real_source
326
 
        self.__cache = {}
 
387
        if seed_cache is None:
 
388
            self.__cache = {}
 
389
        else:
 
390
            self.__cache = dict(seed_cache)
327
391
 
328
392
    def get_revision(self, revision_id):
329
393
        if revision_id not in self.__cache:
330
394
            revision = self.__real_source.get_revision(revision_id)
331
395
            self.__cache[revision_id] = revision
332
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