1
# Copyright (C) 2005 Dan Loda <danloda@gmail.com>
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
26
from bzrlib import patiencediff, tsort
27
from bzrlib.errors import NoSuchRevision
28
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
30
from colormap import AnnotateColorMap, AnnotateColorSaturation
31
from bzrlib.plugins.gtk.revisionview import RevisionView
32
from bzrlib.plugins.gtk.window import Window
45
class GAnnotateWindow(Window):
46
"""Annotate window."""
48
def __init__(self, all=False, plain=False, parent=None, branch=None):
53
Window.__init__(self, parent)
55
self.set_icon(self.render_icon(gtk.STOCK_FIND, gtk.ICON_SIZE_BUTTON))
56
self.annotate_colormap = AnnotateColorSaturation()
63
def annotate(self, tree, branch, file_id):
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)()
72
# [revision id, line number, author, revno, highlight color, line]
73
self.annomodel = gtk.ListStore(gobject.TYPE_STRING,
83
branch.repository.lock_read()
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
for line_no, (revision, revno, line)\
89
in enumerate(self._annotate(tree, file_id)):
90
if revision.revision_id == last_seen and not self.all:
93
last_seen = revision.revision_id
94
author = ", ".join(revision.get_apparent_authors())
96
if revision.revision_id not in self.revisions:
97
self.revisions[revision.revision_id] = revision
99
self.annomodel.append([revision.revision_id,
106
self.annotations.append(revision)
110
self.annomodel.foreach(self._highlight_annotation, now)
112
branch.repository.unlock()
115
self.annoview.set_model(self.annomodel)
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)
121
def jump_to_line(self, lineno):
122
if lineno > len(self.annomodel) or lineno < 1:
124
# FIXME:should really deal with this in the gui. Perhaps a status
126
print("gannotate: Line number %d does't exist. Defaulting to "
132
self.annoview.set_cursor(row)
133
self.annoview.scroll_to_cell(row, use_align=True)
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._get_nick(local=True)
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()
148
revision_id = self.revision_id
149
revision_cache = RevisionCache(repository, self.revisions)
150
for origin, text in tree.annotate_iter(file_id):
152
if rev_id == CURRENT_REVISION:
153
revision = current_revision
154
revno = current_revno
157
revision = revision_cache.get_revision(rev_id)
158
revno = self.dotted.get(rev_id, 'merge')
161
except NoSuchRevision:
162
revision = FakeRevision(rev_id)
165
yield revision, revno, text
167
def _highlight_annotation(self, model, path, iter, now):
168
revision_id, = model.get(iter, REVISION_ID_COL)
169
revision = self.revisions[revision_id]
170
model.set(iter, HIGHLIGHT_COLOR_COL,
171
self.annotate_colormap.get_color(revision, now))
173
def _selected_revision(self):
174
(path, col) = self.annoview.get_cursor()
177
return self.annomodel[path][REVISION_ID_COL]
179
def _activate_selected_revision(self, w):
180
rev_id = self._selected_revision()
181
if not rev_id or rev_id == NULL_REVISION:
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
190
self.back_button.set_sensitive(enable_back)
193
self.revisionview = self._create_log_view()
194
self.annoview = self._create_annotate_view()
196
vbox = gtk.VBox(False)
199
sw = gtk.ScrolledWindow()
200
sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
201
sw.set_shadow_type(gtk.SHADOW_IN)
202
sw.add(self.annoview)
203
self.annoview.gwindow = self
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)
220
vbox.pack_start(hbox, expand=False, fill=True)
222
self.pane = pane = gtk.VPaned()
224
pane.add2(self.revisionview)
226
vbox.pack_start(pane, expand=True, fill=True)
228
self._search = SearchBox()
229
swbox.pack_start(self._search, expand=False, fill=True)
230
accels = gtk.AccelGroup()
231
accels.connect_group(gtk.keysyms.f, gtk.gdk.CONTROL_MASK,
233
self._search_by_text)
234
accels.connect_group(gtk.keysyms.g, gtk.gdk.CONTROL_MASK,
236
self._search_by_line)
237
self.add_accel_group(accels)
241
def _search_by_text(self, *ignored): # (accel_group, window, key, modifiers):
242
self._search.show_for('text')
243
self._search.set_target(self.annoview, TEXT_LINE_COL)
245
def _search_by_line(self, *ignored): # accel_group, window, key, modifiers):
246
self._search.show_for('line')
247
self._search.set_target(self.annoview, LINE_NUM_COL)
249
def line_diff(self, tv, path, tvc):
251
revision = self.annotations[row]
252
repository = self.branch.repository
253
if revision.revision_id == CURRENT_REVISION:
255
tree2 = self.tree.basis_tree()
257
tree1 = repository.revision_tree(revision.revision_id)
258
if len(revision.parent_ids) > 0:
259
tree2 = repository.revision_tree(revision.parent_ids[0])
261
tree2 = repository.revision_tree(NULL_REVISION)
262
from bzrlib.plugins.gtk.diff import DiffWindow
263
window = DiffWindow()
264
window.set_diff("Diff for line %d" % (row+1), tree1, tree2)
265
window.set_file(tree1.id2path(self.file_id))
269
def _create_annotate_view(self):
271
tv.set_rules_hint(False)
272
tv.connect("cursor-changed", self._activate_selected_revision)
274
tv.connect("row-activated", self.line_diff)
276
cell = gtk.CellRendererText()
277
cell.set_property("xalign", 1.0)
278
cell.set_property("ypad", 0)
279
cell.set_property("family", "Monospace")
280
cell.set_property("cell-background-gdk",
281
tv.get_style().bg[gtk.STATE_NORMAL])
282
col = gtk.TreeViewColumn()
283
col.set_resizable(False)
284
col.pack_start(cell, expand=True)
285
col.add_attribute(cell, "text", LINE_NUM_COL)
286
tv.append_column(col)
288
cell = gtk.CellRendererText()
289
cell.set_property("ypad", 0)
290
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
291
cell.set_property("cell-background-gdk",
292
self.get_style().bg[gtk.STATE_NORMAL])
293
col = gtk.TreeViewColumn("Committer")
294
col.set_resizable(True)
295
col.pack_start(cell, expand=True)
296
col.add_attribute(cell, "text", COMMITTER_COL)
297
tv.append_column(col)
299
cell = gtk.CellRendererText()
300
cell.set_property("xalign", 1.0)
301
cell.set_property("ypad", 0)
302
cell.set_property("cell-background-gdk",
303
self.get_style().bg[gtk.STATE_NORMAL])
304
col = gtk.TreeViewColumn("Revno")
305
col.set_resizable(False)
306
col.pack_start(cell, expand=True)
307
col.add_attribute(cell, "markup", REVNO_COL)
308
tv.append_column(col)
310
cell = gtk.CellRendererText()
311
cell.set_property("ypad", 0)
312
cell.set_property("family", "Monospace")
313
col = gtk.TreeViewColumn()
314
col.set_resizable(False)
315
col.pack_start(cell, expand=True)
316
# col.add_attribute(cell, "foreground", HIGHLIGHT_COLOR_COL)
317
col.add_attribute(cell, "background", HIGHLIGHT_COLOR_COL)
318
col.add_attribute(cell, "text", TEXT_LINE_COL)
319
tv.append_column(col)
321
# FIXME: Now that C-f is now used for search by text we
322
# may as well disable the auto search.
323
tv.set_search_column(LINE_NUM_COL)
327
def _create_log_view(self):
328
lv = RevisionView(self._branch)
332
def _create_back_button(self):
333
button = gtk.Button()
334
button.set_use_stock(True)
335
button.set_label("gtk-go-back")
336
button.connect("clicked", lambda w: self.go_back())
337
button.set_relief(gtk.RELIEF_NONE)
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)
348
button.set_sensitive(False)
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)
359
button.set_sensitive(True)
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)
369
button.set_sensitive(True)
373
last_tree = self.tree
374
rev_id = self._selected_revision()
375
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)
381
self._no_back.add(parent_id)
382
self.back_button.set_sensitive(False)
384
def go_forward(self):
385
if len(self.history) == 0:
387
target_tree = self.history.pop()
388
if len(self.history) == 0:
389
self.forward_button.set_sensitive(False)
390
self._go(target_tree)
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)
396
(row,), col = self.annoview.get_cursor()
397
self.annotate(target_tree, self.branch, self.file_id)
401
self.annoview.set_cursor(new_row)
406
def get_scroll_offset(self, tree):
407
old = self.tree.get_file(self.file_id)
408
new = tree.get_file(self.file_id)
409
(row,), col = self.annoview.get_cursor()
410
matcher = patiencediff.PatienceSequenceMatcher(None, old.readlines(),
412
for i, j, n in matcher.get_matching_blocks():
417
class FakeRevision(object):
420
For when a revision is referenced but not present.
423
def __init__(self, revision_id, committer='?', nick=None):
424
self.revision_id = revision_id
426
self.committer = committer
432
def get_apparent_authors(self):
433
return [self.committer]
436
class RevisionCache(object):
437
"""A caching revision source"""
439
def __init__(self, real_source, seed_cache=None):
440
self.__real_source = real_source
441
if seed_cache is None:
444
self.__cache = dict(seed_cache)
446
def get_revision(self, revision_id):
447
if revision_id not in self.__cache:
448
revision = self.__real_source.get_revision(revision_id)
449
self.__cache[revision_id] = revision
450
return self.__cache[revision_id]
452
class SearchBox(gtk.HBox):
453
"""A button box for searching in text or lines of annotations"""
455
gtk.HBox.__init__(self, False, 6)
458
button = gtk.Button()
460
image.set_from_stock('gtk-stop', gtk.ICON_SIZE_BUTTON)
461
button.set_image(image)
462
button.set_relief(gtk.RELIEF_NONE)
463
button.connect("clicked", lambda w: self.hide_all())
464
self.pack_start(button, expand=False, fill=False)
469
self.pack_start(label, expand=False, fill=False)
473
entry.connect("activate", lambda w, d: self._do_search(d),
475
self.pack_start(entry, expand=False, fill=False)
477
# Next/previous buttons
478
button = gtk.Button('_Next')
480
image.set_from_stock('gtk-go-forward', gtk.ICON_SIZE_BUTTON)
481
button.set_image(image)
482
button.connect("clicked", lambda w, d: self._do_search(d),
484
self.pack_start(button, expand=False, fill=False)
486
button = gtk.Button('_Previous')
488
image.set_from_stock('gtk-go-back', gtk.ICON_SIZE_BUTTON)
489
button.set_image(image)
490
button.connect("clicked", lambda w, d: self._do_search(d),
492
self.pack_start(button, expand=False, fill=False)
495
check = gtk.CheckButton('Match case')
496
self._match_case = check
497
self.pack_start(check, expand=False, fill=False)
499
check = gtk.CheckButton('Regexp')
500
check.connect("toggled", lambda w: self._set_label())
502
self.pack_start(check, expand=False, fill=False)
506
# Note that we stay hidden (we do not call self.show_all())
509
def show_for(self, kind):
513
# Hide unrelated buttons
515
self._match_case.hide()
518
self._entry.grab_focus()
520
def _set_label(self):
521
if self._kind == 'line':
522
self._label.set_text('Find Line: ')
524
if self._regexp.get_active():
525
self._label.set_text('Find Regexp: ')
527
self._label.set_text('Find Text: ')
529
def set_target(self, view,column):
531
self._column = column
533
def _match(self, model, iterator, column):
534
matching_case = self._match_case.get_active()
535
string, = model.get(iterator, column)
536
key = self._entry.get_text()
537
if self._regexp.get_active():
539
match = re.compile(key).search(string, 1)
541
match = re.compile(key, re.I).search(string, 1)
543
if not matching_case:
544
string = string.lower()
546
match = string.find(key) != -1
550
def _iterate_rows_forward(self, model, start):
551
model_size = len(model)
553
while model_size != 0:
554
if current >= model_size: current = 0
555
yield model.get_iter_from_string('%d' % current)
556
if current == start: raise StopIteration
559
def _iterate_rows_backward(self, model, start):
560
model_size = len(model)
562
while model_size != 0:
563
if current < 0: current = model_size - 1
564
yield model.get_iter_from_string('%d' % current)
565
if current == start: raise StopIteration
568
def _do_search(self, direction):
569
if direction == 'forward':
570
iterate = self._iterate_rows_forward
572
iterate = self._iterate_rows_backward
574
model, sel = self._view.get_selection().get_selected()
578
path = model.get_string_from_iter(sel)
581
for row in iterate(model, start):
582
if self._match(model, row, self._column):
583
path = model.get_path(row)
584
self._view.set_cursor(path)
585
self._view.scroll_to_cell(path, use_align=True)
added
removed
annotate/gannotate.py
