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
- browse files at revision 511.4.1
- compare with another revision
- download diff
- download tarball
- view history from revision 511.4.1
- Committer: Jelmer Vernooij
- Date: 2008-06-29 18:31:29 UTC
- mto: This revision was merged to the branch mainline in revision 518.
- Revision ID: jelmer@samba.org-20080629183129-syqvz3xm5gqagzsx
Fix use of smart_add.
- files added:
- .bzrignore
- branchview
- icons
- olive
- po
- preferences
- tests
- files removed:
- .bzrignore
- files renamed:
- viz/graphcell.py => branchview/graphcell.py
- viz/graph.py => branchview/linegraph.py
- viz/diffwin.py => diff.py
- annotate/logview.py => revisionview.py
- files modified:
- AUTHORS
added
removed
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
28
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
26
29
27
30
from colormap import AnnotateColorMap, AnnotateColorSaturation
28
from logview import LogView
29
from spanselector import SpanSelector
31
from bzrlib.plugins.gtk.revisionview import RevisionView
32
from bzrlib.plugins.gtk.window import Window
30
33
31
34
32
35
(
39
42
) = range(6)
40
43
41
44
42
class GAnnotateWindow(gtk.Window):
45
class GAnnotateWindow(Window):
43
46
"""Annotate window."""
44
47
45
def __init__(self, all=False, plain=False):
48
def __init__(self, all=False, plain=False, parent=None, branch=None):
46
49
self.all = all
47
50
self.plain = plain
51
self._branch = branch
48
52
49
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
53
Window.__init__(self, parent)
50
54
51
55
self.set_icon(self.render_icon(gtk.STOCK_FIND, gtk.ICON_SIZE_BUTTON))
52
56
self.annotate_colormap = AnnotateColorSaturation()
53
57
54
58
self._create()
55
56
if self.plain:
57
self.span_selector.hide()
58
59
def annotate(self, branch, file_id):
60
59
self.revisions = {}
60
self.history = []
61
self._no_back = set()
62
63
def annotate(self, tree, branch, file_id):
64
self.annotations = []
65
self.branch = branch
66
self.tree = tree
67
self.file_id = file_id
68
self.revisionview.set_file_id(file_id)
69
self.revision_id = getattr(tree, 'get_revision_id',
70
lambda: CURRENT_REVISION)()
61
71
62
# [revision id, line number, committer, revno, highlight color, line]
72
# [revision id, line number, author, revno, highlight color, line]
63
73
self.annomodel = gtk.ListStore(gobject.TYPE_STRING,
64
74
gobject.TYPE_STRING,
65
75
gobject.TYPE_STRING,
71
81
try:
72
82
branch.lock_read()
73
83
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)
74
88
for line_no, (revision, revno, line)\
75
in enumerate(self._annotate(branch, file_id)):
89
in enumerate(self._annotate(tree, file_id)):
76
90
if revision.revision_id == last_seen and not self.all:
77
revno = committer = ""
91
revno = author = ""
78
92
else:
79
93
last_seen = revision.revision_id
80
committer = revision.committer
94
author = revision.get_apparent_author()
81
95
82
96
if revision.revision_id not in self.revisions:
83
97
self.revisions[revision.revision_id] = revision
84
98
85
99
self.annomodel.append([revision.revision_id,
86
100
line_no + 1,
87
committer,
101
author,
88
102
revno,
89
103
None,
90
104
line.rstrip("\r\n")
91
105
])
106
self.annotations.append(revision)
92
107
93
108
if not self.plain:
94
self._set_oldest_newest()
95
# Recall that calling activate_default will emit "span-changed",
96
# so self._span_changed_cb will take care of initial highlighting
97
self.span_selector.activate_default()
109
now = time.time()
110
self.annomodel.foreach(self._highlight_annotation, now)
98
111
finally:
99
112
branch.repository.unlock()
100
113
branch.unlock()
101
114
102
115
self.annoview.set_model(self.annomodel)
103
116
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)
104
120
105
121
def jump_to_line(self, lineno):
106
122
if lineno > len(self.annomodel) or lineno < 1:
109
125
# bar?
110
126
print("gannotate: Line number %d does't exist. Defaulting to "
111
127
"line 1." % lineno)
128
return
112
129
else:
113
130
row = lineno - 1
114
131
115
132
self.annoview.set_cursor(row)
116
117
def _annotate(self, branch, file_id):
118
rev_hist = branch.revision_history()
119
repository = branch.repository
120
rev_tree = repository.revision_tree(branch.last_revision())
121
rev_id = rev_tree.inventory[file_id].revision
122
weave = repository.weave_store.get_weave(file_id,
123
branch.get_transaction())
124
125
revision_cache = RevisionCache(repository)
126
for origin, text in weave.annotate_iter(rev_id):
133
self.annoview.scroll_to_cell(row, use_align=True)
134
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
revision_cache = RevisionCache(repository, self.revisions)
150
for origin, text in tree.annotate_iter(file_id):
127
151
rev_id = origin
128
try:
129
revision = revision_cache.get_revision(rev_id)
130
if rev_id in rev_hist:
131
revno = branch.revision_id_to_revno(rev_id)
132
else:
133
revno = "merge"
134
except NoSuchRevision:
135
revision = NoneRevision(rev_id)
136
revno = "?"
152
if rev_id == CURRENT_REVISION:
153
revision = current_revision
154
revno = current_revno
155
else:
156
try:
157
revision = revision_cache.get_revision(rev_id)
158
revno = self.dotted.get(rev_id, 'merge')
159
if len(revno) > 15:
160
revno = 'merge'
161
except NoSuchRevision:
162
revision = FakeRevision(rev_id)
163
revno = "?"
137
164
138
165
yield revision, revno, text
139
166
140
def _set_oldest_newest(self):
141
rev_dates = map(lambda i: self.revisions[i].timestamp, self.revisions)
142
oldest = min(rev_dates)
143
newest = max(rev_dates)
144
145
span = self._span_from_seconds(time.time() - oldest)
146
self.span_selector.set_to_oldest_span(span)
147
148
span = self._span_from_seconds(newest - oldest)
149
self.span_selector.set_newest_to_oldest_span(span)
150
151
def _span_from_seconds(self, seconds):
152
return (seconds / (24 * 60 * 60))
153
154
def _span_changed_cb(self, w, span):
155
self.annotate_colormap.set_span(span)
156
now = time.time()
157
self.annomodel.foreach(self._highlight_annotation, now)
158
159
167
def _highlight_annotation(self, model, path, iter, now):
160
168
revision_id, = model.get(iter, REVISION_ID_COL)
161
169
revision = self.revisions[revision_id]
162
170
model.set(iter, HIGHLIGHT_COLOR_COL,
163
171
self.annotate_colormap.get_color(revision, now))
164
172
165
def _show_log(self, w):
173
def _selected_revision(self):
166
174
(path, col) = self.annoview.get_cursor()
167
rev_id = self.annomodel[path][REVISION_ID_COL]
168
self.logview.set_revision(self.revisions[rev_id])
175
if path is None:
176
return None
177
return self.annomodel[path][REVISION_ID_COL]
178
179
def _activate_selected_revision(self, w):
180
rev_id = self._selected_revision()
181
if not rev_id or rev_id == NULL_REVISION:
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)
169
191
170
192
def _create(self):
171
self.logview = self._create_log_view()
193
self.revisionview = self._create_log_view()
172
194
self.annoview = self._create_annotate_view()
173
self.span_selector = self._create_span_selector()
174
195
175
vbox = gtk.VBox(False, 12)
176
vbox.set_border_width(12)
196
vbox = gtk.VBox(False)
177
197
vbox.show()
178
198
179
199
sw = gtk.ScrolledWindow()
180
200
sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
181
201
sw.set_shadow_type(gtk.SHADOW_IN)
182
202
sw.add(self.annoview)
203
self.annoview.gwindow = self
183
204
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)
184
217
185
218
self.pane = pane = gtk.VPaned()
186
pane.add1(sw)
187
pane.add2(self.logview)
219
pane.add1(swbox)
220
pane.add2(self.revisionview)
188
221
pane.show()
189
222
vbox.pack_start(pane, expand=True, fill=True)
190
191
hbox = gtk.HBox(True, 6)
192
hbox.pack_start(self.span_selector, expand=False, fill=True)
193
hbox.pack_start(self._create_button_box(), expand=False, fill=True)
194
hbox.show()
195
vbox.pack_start(hbox, expand=False, fill=True)
223
224
self._search = SearchBox()
225
swbox.pack_start(self._search, expand=False, fill=True)
226
accels = gtk.AccelGroup()
227
accels.connect_group(gtk.keysyms.f, gtk.gdk.CONTROL_MASK,
228
gtk.ACCEL_LOCKED,
229
self._search_by_text)
230
accels.connect_group(gtk.keysyms.g, gtk.gdk.CONTROL_MASK,
231
gtk.ACCEL_LOCKED,
232
self._search_by_line)
233
self.add_accel_group(accels)
196
234
197
235
self.add(vbox)
198
236
237
def _search_by_text(self, accel_group, window, key, modifiers):
238
self._search.show_for('text')
239
self._search.set_target(self.annoview, TEXT_LINE_COL)
240
241
def _search_by_line(self, accel_group, window, key, modifiers):
242
self._search.show_for('line')
243
self._search.set_target(self.annoview, LINE_NUM_COL)
244
245
def line_diff(self, tv, path, tvc):
246
row = path[0]
247
revision = self.annotations[row]
248
repository = self.branch.repository
249
if revision.revision_id == CURRENT_REVISION:
250
tree1 = self.tree
251
tree2 = self.tree.basis_tree()
252
else:
253
tree1 = repository.revision_tree(revision.revision_id)
254
if len(revision.parent_ids) > 0:
255
tree2 = repository.revision_tree(revision.parent_ids[0])
256
else:
257
tree2 = repository.revision_tree(NULL_REVISION)
258
from bzrlib.plugins.gtk.diff import DiffWindow
259
window = DiffWindow()
260
window.set_diff("Diff for line %d" % (row+1), tree1, tree2)
261
window.set_file(tree1.id2path(self.file_id))
262
window.show()
263
264
199
265
def _create_annotate_view(self):
200
266
tv = gtk.TreeView()
201
267
tv.set_rules_hint(False)
202
tv.connect("cursor-changed", self._show_log)
268
tv.connect("cursor-changed", self._activate_selected_revision)
203
269
tv.show()
270
tv.connect("row-activated", self.line_diff)
204
271
205
272
cell = gtk.CellRendererText()
206
273
cell.set_property("xalign", 1.0)
247
314
col.add_attribute(cell, "text", TEXT_LINE_COL)
248
315
tv.append_column(col)
249
316
317
# FIXME: Now that C-f is now used for search by text we
318
# may as well disable the auto search.
250
319
tv.set_search_column(LINE_NUM_COL)
251
320
252
321
return tv
253
322
254
def _create_span_selector(self):
255
ss = SpanSelector()
256
ss.connect("span-changed", self._span_changed_cb)
257
ss.show()
258
259
return ss
260
261
323
def _create_log_view(self):
262
lv = LogView()
324
lv = RevisionView(self._branch)
263
325
lv.show()
264
265
326
return lv
266
327
267
def _create_button_box(self):
268
box = gtk.HButtonBox()
269
box.set_layout(gtk.BUTTONBOX_END)
270
box.show()
271
272
button = gtk.Button()
273
button.set_use_stock(True)
274
button.set_label("gtk-close")
275
button.connect("clicked", lambda w: self.destroy())
276
button.show()
277
278
box.pack_start(button, expand=False, fill=False)
279
280
return box
281
282
283
class NoneRevision:
328
def _create_back_button(self):
329
button = gtk.Button()
330
button.set_use_stock(True)
331
button.set_label("gtk-go-back")
332
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
346
347
def go_back(self):
348
last_tree = self.tree
349
rev_id = self._selected_revision()
350
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)
371
(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
380
381
def get_scroll_offset(self, tree):
382
old = self.tree.get_file(self.file_id)
383
new = tree.get_file(self.file_id)
384
(row,), col = self.annoview.get_cursor()
385
matcher = patiencediff.PatienceSequenceMatcher(None, old.readlines(),
386
new.readlines())
387
for i, j, n in matcher.get_matching_blocks():
388
if i + n >= row:
389
return j - i
390
391
392
class FakeRevision:
284
393
""" A fake revision.
285
394
286
395
For when a revision is referenced but not present.
287
396
"""
288
397
289
def __init__(self, revision_id):
398
def __init__(self, revision_id, committer='?', nick=None):
290
399
self.revision_id = revision_id
291
400
self.parent_ids = []
292
self.committer = "?"
401
self.committer = committer
293
402
self.message = "?"
294
403
self.timestamp = 0.0
295
404
self.timezone = 0
405
self.properties = {}
406
407
def get_apparent_author(self):
408
return self.committer
296
409
297
410
298
411
class RevisionCache(object):
299
412
"""A caching revision source"""
300
def __init__(self, real_source):
413
def __init__(self, real_source, seed_cache=None):
301
414
self.__real_source = real_source
302
self.__cache = {}
415
if seed_cache is None:
416
self.__cache = {}
417
else:
418
self.__cache = dict(seed_cache)
303
419
304
420
def get_revision(self, revision_id):
305
421
if revision_id not in self.__cache:
306
422
revision = self.__real_source.get_revision(revision_id)
307
423
self.__cache[revision_id] = revision
308
424
return self.__cache[revision_id]
425
426
class SearchBox(gtk.HBox):
427
"""A button box for searching in text or lines of annotations"""
428
def __init__(self):
429
gtk.HBox.__init__(self, False, 6)
430
431
# Close button
432
button = gtk.Button()
433
image = gtk.Image()
434
image.set_from_stock('gtk-stop', gtk.ICON_SIZE_BUTTON)
435
button.set_image(image)
436
button.set_relief(gtk.RELIEF_NONE)
437
button.connect("clicked", lambda w: self.hide_all())
438
self.pack_start(button, expand=False, fill=False)
439
440
# Search entry
441
label = gtk.Label()
442
self._label = label
443
self.pack_start(label, expand=False, fill=False)
444
445
entry = gtk.Entry()
446
self._entry = entry
447
entry.connect("activate", lambda w, d: self._do_search(d),
448
'forward')
449
self.pack_start(entry, expand=False, fill=False)
450
451
# Next/previous buttons
452
button = gtk.Button('_Next')
453
image = gtk.Image()
454
image.set_from_stock('gtk-go-forward', gtk.ICON_SIZE_BUTTON)
455
button.set_image(image)
456
button.connect("clicked", lambda w, d: self._do_search(d),
457
'forward')
458
self.pack_start(button, expand=False, fill=False)
459
460
button = gtk.Button('_Previous')
461
image = gtk.Image()
462
image.set_from_stock('gtk-go-back', gtk.ICON_SIZE_BUTTON)
463
button.set_image(image)
464
button.connect("clicked", lambda w, d: self._do_search(d),
465
'backward')
466
self.pack_start(button, expand=False, fill=False)
467
468
# Search options
469
check = gtk.CheckButton('Match case')
470
self._match_case = check
471
self.pack_start(check, expand=False, fill=False)
472
473
check = gtk.CheckButton('Regexp')
474
check.connect("toggled", lambda w: self._set_label())
475
self._regexp = check
476
self.pack_start(check, expand=False, fill=False)
477
478
self._view = None
479
self._column = None
480
# Note that we stay hidden (we do not call self.show_all())
481
482
483
def show_for(self, kind):
484
self._kind = kind
485
self.show_all()
486
self._set_label()
487
# Hide unrelated buttons
488
if kind == 'line':
489
self._match_case.hide()
490
self._regexp.hide()
491
# Be ready
492
self._entry.grab_focus()
493
494
def _set_label(self):
495
if self._kind == 'line':
496
self._label.set_text('Find Line: ')
497
else:
498
if self._regexp.get_active():
499
self._label.set_text('Find Regexp: ')
500
else:
501
self._label.set_text('Find Text: ')
502
503
def set_target(self, view,column):
504
self._view = view
505
self._column = column
506
507
def _match(self, model, iterator, column):
508
matching_case = self._match_case.get_active()
509
string, = model.get(iterator, column)
510
key = self._entry.get_text()
511
if self._regexp.get_active():
512
if matching_case:
513
match = re.compile(key).search(string, 1)
514
else:
515
match = re.compile(key, re.I).search(string, 1)
516
else:
517
if not matching_case:
518
string = string.lower()
519
key = key.lower()
520
match = string.find(key) != -1
521
522
return match
523
524
def _iterate_rows_forward(self, model, start):
525
model_size = len(model)
526
current = start + 1
527
while model_size != 0:
528
if current >= model_size: current = 0
529
yield model.get_iter_from_string('%d' % current)
530
if current == start: raise StopIteration
531
current += 1
532
533
def _iterate_rows_backward(self, model, start):
534
model_size = len(model)
535
current = start - 1
536
while model_size != 0:
537
if current < 0: current = model_size - 1
538
yield model.get_iter_from_string('%d' % current)
539
if current == start: raise StopIteration
540
current -= 1
541
542
def _do_search(self, direction):
543
if direction == 'forward':
544
iterate = self._iterate_rows_forward
545
else:
546
iterate = self._iterate_rows_backward
547
548
model, sel = self._view.get_selection().get_selected()
549
if sel is None:
550
start = 0
551
else:
552
path = model.get_string_from_iter(sel)
553
start = int(path)
554
555
for row in iterate(model, start):
556
if self._match(model, row, self._column):
557
path = model.get_path(row)
558
self._view.set_cursor(path)
559
self._view.scroll_to_cell(path, use_align=True)
560
break
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0