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 59.2.2
- compare with another revision
- download diff
- download tarball
- view history from revision 59.2.2
- Committer: Aaron Bentley
- Date: 2006-06-19 15:44:33 UTC
- mto: This revision was merged to the branch mainline in revision 62.
- Revision ID: abentley@panoramicfeedback.com-20060619154433-a223b0ee92ed867d
Annotate launches a diff for the particular revision
- files added:
- .bzrignore
- files removed:
- .bzrignore
- branchview
- icons
- olive
- po
- preferences
- tests
- files renamed:
- revisionview.py => annotate/logview.py
- diff.py => viz/diffwin.py
- branchview/linegraph.py => viz/graph.py
- branchview/graphcell.py => viz/graphcell.py
- files modified:
- AUTHORS
added
removed
annotate/gannotate.py
21
21
import gobject
22
22
import gtk
23
23
import pango
24
import re
25
24
26
from bzrlib import patiencediff, tsort
27
25
from bzrlib.errors import NoSuchRevision
28
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
29
26
30
27
from colormap import AnnotateColorMap, AnnotateColorSaturation
31
from bzrlib.plugins.gtk.revisionview import RevisionView
32
from bzrlib.plugins.gtk.window import Window
28
from logview import LogView
29
from spanselector import SpanSelector
33
30
34
31
35
32
(
42
39
) = range(6)
43
40
44
41
45
class GAnnotateWindow(Window):
42
class GAnnotateWindow(gtk.Window):
46
43
"""Annotate window."""
47
44
48
def __init__(self, all=False, plain=False, parent=None, branch=None):
45
def __init__(self, all=False, plain=False):
49
46
self.all = all
50
47
self.plain = plain
51
self._branch = branch
52
48
53
Window.__init__(self, parent)
49
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
54
50
55
51
self.set_icon(self.render_icon(gtk.STOCK_FIND, gtk.ICON_SIZE_BUTTON))
56
52
self.annotate_colormap = AnnotateColorSaturation()
57
53
58
54
self._create()
55
56
if self.plain:
57
self.span_selector.hide()
58
59
def annotate(self, branch, file_id):
59
60
self.revisions = {}
60
self.history = []
61
self._no_back = set()
62
63
def annotate(self, tree, branch, file_id):
64
61
self.annotations = []
65
62
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)()
71
63
72
# [revision id, line number, author, revno, highlight color, line]
64
# [revision id, line number, committer, revno, highlight color, line]
73
65
self.annomodel = gtk.ListStore(gobject.TYPE_STRING,
74
66
gobject.TYPE_STRING,
75
67
gobject.TYPE_STRING,
81
73
try:
82
74
branch.lock_read()
83
75
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
76
for line_no, (revision, revno, line)\
89
in enumerate(self._annotate(tree, file_id)):
77
in enumerate(self._annotate(branch, file_id)):
90
78
if revision.revision_id == last_seen and not self.all:
91
revno = author = ""
79
revno = committer = ""
92
80
else:
93
81
last_seen = revision.revision_id
94
author = revision.get_apparent_author()
82
committer = revision.committer
95
83
96
84
if revision.revision_id not in self.revisions:
97
85
self.revisions[revision.revision_id] = revision
98
86
99
87
self.annomodel.append([revision.revision_id,
100
88
line_no + 1,
101
author,
89
committer,
102
90
revno,
103
91
None,
104
92
line.rstrip("\r\n")
106
94
self.annotations.append(revision)
107
95
108
96
if not self.plain:
109
now = time.time()
110
self.annomodel.foreach(self._highlight_annotation, now)
97
self._set_oldest_newest()
98
# Recall that calling activate_default will emit "span-changed",
99
# so self._span_changed_cb will take care of initial highlighting
100
self.span_selector.activate_default()
111
101
finally:
112
102
branch.repository.unlock()
113
103
branch.unlock()
114
104
115
105
self.annoview.set_model(self.annomodel)
116
106
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
107
121
108
def jump_to_line(self, lineno):
122
109
if lineno > len(self.annomodel) or lineno < 1:
125
112
# bar?
126
113
print("gannotate: Line number %d does't exist. Defaulting to "
127
114
"line 1." % lineno)
128
return
129
115
else:
130
116
row = lineno - 1
131
117
132
118
self.annoview.set_cursor(row)
133
119
self.annoview.scroll_to_cell(row, use_align=True)
134
120
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):
121
def _annotate(self, branch, file_id):
122
rev_hist = branch.revision_history()
123
repository = branch.repository
124
rev_tree = repository.revision_tree(branch.last_revision())
125
rev_id = rev_tree.inventory[file_id].revision
126
weave = repository.weave_store.get_weave(file_id,
127
branch.get_transaction())
128
129
revision_cache = RevisionCache(repository)
130
for origin, text in weave.annotate_iter(rev_id):
151
131
rev_id = origin
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 = "?"
132
try:
133
revision = revision_cache.get_revision(rev_id)
134
if rev_id in rev_hist:
135
revno = branch.revision_id_to_revno(rev_id)
136
else:
137
revno = "merge"
138
except NoSuchRevision:
139
revision = NoneRevision(rev_id)
140
revno = "?"
164
141
165
142
yield revision, revno, text
166
143
144
def _set_oldest_newest(self):
145
rev_dates = map(lambda i: self.revisions[i].timestamp, self.revisions)
146
oldest = min(rev_dates)
147
newest = max(rev_dates)
148
149
span = self._span_from_seconds(time.time() - oldest)
150
self.span_selector.set_to_oldest_span(span)
151
152
span = self._span_from_seconds(newest - oldest)
153
self.span_selector.set_newest_to_oldest_span(span)
154
155
def _span_from_seconds(self, seconds):
156
return (seconds / (24 * 60 * 60))
157
158
def _span_changed_cb(self, w, span):
159
self.annotate_colormap.set_span(span)
160
now = time.time()
161
self.annomodel.foreach(self._highlight_annotation, now)
162
167
163
def _highlight_annotation(self, model, path, iter, now):
168
164
revision_id, = model.get(iter, REVISION_ID_COL)
169
165
revision = self.revisions[revision_id]
170
166
model.set(iter, HIGHLIGHT_COLOR_COL,
171
167
self.annotate_colormap.get_color(revision, now))
172
168
173
def _selected_revision(self):
169
def _show_log(self, w):
174
170
(path, col) = self.annoview.get_cursor()
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)
171
rev_id = self.annomodel[path][REVISION_ID_COL]
172
self.logview.set_revision(self.revisions[rev_id])
191
173
192
174
def _create(self):
193
self.revisionview = self._create_log_view()
175
self.logview = self._create_log_view()
194
176
self.annoview = self._create_annotate_view()
177
self.span_selector = self._create_span_selector()
195
178
196
vbox = gtk.VBox(False)
179
vbox = gtk.VBox(False, 12)
180
vbox.set_border_width(12)
197
181
vbox.show()
198
182
199
183
sw = gtk.ScrolledWindow()
202
186
sw.add(self.annoview)
203
187
self.annoview.gwindow = self
204
188
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
189
218
190
self.pane = pane = gtk.VPaned()
219
pane.add1(swbox)
220
pane.add2(self.revisionview)
191
pane.add1(sw)
192
pane.add2(self.logview)
221
193
pane.show()
222
194
vbox.pack_start(pane, expand=True, 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)
195
196
hbox = gtk.HBox(True, 6)
197
hbox.pack_start(self.span_selector, expand=False, fill=True)
198
hbox.pack_start(self._create_button_box(), expand=False, fill=True)
199
hbox.show()
200
vbox.pack_start(hbox, expand=False, fill=True)
234
201
235
202
self.add(vbox)
236
203
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):
204
def row_diff(self, tv, path, tvc):
246
205
row = path[0]
247
206
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
207
tree1 = self.branch.repository.revision_tree(revision.revision_id)
208
tree2 = self.branch.repository.revision_tree(revision.parent_ids[0])
209
from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
259
210
window = DiffWindow()
260
window.set_diff("Diff for line %d" % (row+1), tree1, tree2)
261
window.set_file(tree1.id2path(self.file_id))
211
window.set_diff("Diff for row %d" % row, tree1, tree2)
262
212
window.show()
263
213
264
214
265
215
def _create_annotate_view(self):
266
216
tv = gtk.TreeView()
267
217
tv.set_rules_hint(False)
268
tv.connect("cursor-changed", self._activate_selected_revision)
218
tv.connect("cursor-changed", self._show_log)
269
219
tv.show()
270
tv.connect("row-activated", self.line_diff)
220
tv.connect("row-activated", self.row_diff)
271
221
272
222
cell = gtk.CellRendererText()
273
223
cell.set_property("xalign", 1.0)
314
264
col.add_attribute(cell, "text", TEXT_LINE_COL)
315
265
tv.append_column(col)
316
266
317
# FIXME: Now that C-f is now used for search by text we
318
# may as well disable the auto search.
319
267
tv.set_search_column(LINE_NUM_COL)
320
268
321
269
return tv
322
270
271
def _create_span_selector(self):
272
ss = SpanSelector()
273
ss.connect("span-changed", self._span_changed_cb)
274
ss.show()
275
276
return ss
277
323
278
def _create_log_view(self):
324
lv = RevisionView(self._branch)
279
lv = LogView()
325
280
lv.show()
281
326
282
return lv
327
283
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
def _create_button_box(self):
285
box = gtk.HButtonBox()
286
box.set_layout(gtk.BUTTONBOX_END)
287
box.show()
288
289
button = gtk.Button()
290
button.set_use_stock(True)
291
button.set_label("gtk-close")
292
button.connect("clicked", lambda w: self.destroy())
293
button.show()
294
295
box.pack_start(button, expand=False, fill=False)
296
297
return box
298
299
300
class NoneRevision:
393
301
""" A fake revision.
394
302
395
303
For when a revision is referenced but not present.
396
304
"""
397
305
398
def __init__(self, revision_id, committer='?', nick=None):
306
def __init__(self, revision_id):
399
307
self.revision_id = revision_id
400
308
self.parent_ids = []
401
self.committer = committer
309
self.committer = "?"
402
310
self.message = "?"
403
311
self.timestamp = 0.0
404
312
self.timezone = 0
405
self.properties = {}
406
407
def get_apparent_author(self):
408
return self.committer
409
313
410
314
411
315
class RevisionCache(object):
412
316
"""A caching revision source"""
413
def __init__(self, real_source, seed_cache=None):
317
def __init__(self, real_source):
414
318
self.__real_source = real_source
415
if seed_cache is None:
416
self.__cache = {}
417
else:
418
self.__cache = dict(seed_cache)
319
self.__cache = {}
419
320
420
321
def get_revision(self, revision_id):
421
322
if revision_id not in self.__cache:
422
323
revision = self.__real_source.get_revision(revision_id)
423
324
self.__cache[revision_id] = revision
424
325
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