63
66
self.branch = branch
65
68
self.file_id = file_id
69
self.revisionview.set_file_id(file_id)
66
70
self.revision_id = getattr(tree, 'get_revision_id',
67
71
lambda: CURRENT_REVISION)()
69
# [revision id, line number, committer, revno, highlight color, line]
70
self.annomodel = gtk.ListStore(gobject.TYPE_STRING,
73
# [revision id, line number, author, revno, highlight color, line]
74
self.annomodel = Gtk.ListStore(GObject.TYPE_STRING,
80
84
branch.repository.lock_read()
86
revno_map = self.branch.get_revision_id_to_revno_map()
87
for revision_id, revno in revno_map.iteritems():
88
self.dotted[revision_id] = '.'.join(str(num) for num in revno)
81
89
for line_no, (revision, revno, line)\
82
in enumerate(self._annotate(tree, file_id)):
90
in enumerate(self._annotate(tree, file_id)):
83
91
if revision.revision_id == last_seen and not self.all:
84
revno = committer = ""
86
94
last_seen = revision.revision_id
87
committer = revision.committer
95
author = ", ".join(revision.get_apparent_authors())
89
97
if revision.revision_id not in self.revisions:
90
98
self.revisions[revision.revision_id] = revision
92
100
self.annomodel.append([revision.revision_id,
97
105
line.rstrip("\r\n")
99
107
self.annotations.append(revision)
101
109
if not self.plain:
116
127
print("gannotate: Line number %d does't exist. Defaulting to "
117
128
"line 1." % lineno)
122
self.annoview.set_cursor(row)
123
self.annoview.scroll_to_cell(row, use_align=True)
125
def _dotted_revnos(self, repository, revision_id):
126
"""Return a dict of revision_id -> dotted revno
128
:param repository: The repository to get the graph from
129
:param revision_id: The last revision for which this info is needed
131
graph = repository.get_revision_graph(revision_id)
133
for n, revision_id, d, revno, e in tsort.merge_sort(graph,
134
revision_id, generate_revno=True):
135
dotted[revision_id] = '.'.join(str(num) for num in revno)
133
tree_path = Gtk.TreePath(path=row)
134
self.annoview.set_cursor(tree_path, None, False)
135
self.annoview.scroll_to_cell(tree_path, use_align=True)
138
137
def _annotate(self, tree, file_id):
139
138
current_revision = FakeRevision(CURRENT_REVISION)
193
192
self.back_button.set_sensitive(enable_back)
195
194
def _create(self):
196
self.logview = self._create_log_view()
195
self.revisionview = self._create_log_view()
197
196
self.annoview = self._create_annotate_view()
199
vbox = gtk.VBox(False)
198
vbox = Gtk.VBox(homogeneous=False, spacing=0)
202
sw = gtk.ScrolledWindow()
203
sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
204
sw.set_shadow_type(gtk.SHADOW_IN)
201
sw = Gtk.ScrolledWindow()
202
sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
203
sw.set_shadow_type(Gtk.ShadowType.IN)
205
204
sw.add(self.annoview)
206
205
self.annoview.gwindow = self
209
swbox.pack_start(sw, True, True, 0)
213
hbox = gtk.HBox(False, 6)
212
hbox = Gtk.HBox(homogeneous=False, spacing=6)
214
213
self.back_button = self._create_back_button()
215
hbox.pack_start(self.back_button, expand=False, fill=True)
214
hbox.pack_start(self.back_button, False, True, 0)
216
215
self.forward_button = self._create_forward_button()
217
hbox.pack_start(self.forward_button, expand=False, fill=True)
216
hbox.pack_start(self.forward_button, False, True, 0)
217
self.find_button = self._create_find_button()
218
hbox.pack_start(self.find_button, False, True, 0)
219
self.goto_button = self._create_goto_button()
220
hbox.pack_start(self.goto_button, False, True, 0)
219
vbox.pack_start(hbox, expand=False, fill=True)
221
self.pane = pane = gtk.VPaned()
222
vbox.pack_start(hbox, False, True, 0)
224
self.pane = pane = Gtk.Paned.new(Gtk.Orientation.VERTICAL)
223
pane.add2(self.logview)
226
pane.add2(self.revisionview)
225
vbox.pack_start(pane, expand=True, fill=True)
228
vbox.pack_start(pane, True, True, 0)
227
230
self._search = SearchBox()
228
swbox.pack_start(self._search, expand=False, fill=True)
229
accels = gtk.AccelGroup()
230
accels.connect_group(gtk.keysyms.f, gtk.gdk.CONTROL_MASK,
231
swbox.pack_start(self._search, False, True, 0)
232
accels = Gtk.AccelGroup()
233
accels.connect(Gdk.KEY_f, Gdk.ModifierType.CONTROL_MASK,
234
Gtk.AccelFlags.LOCKED,
232
235
self._search_by_text)
233
accels.connect_group(gtk.keysyms.g, gtk.gdk.CONTROL_MASK,
236
accels.connect(Gdk.KEY_g, Gdk.ModifierType.CONTROL_MASK,
237
Gtk.AccelFlags.LOCKED,
235
238
self._search_by_line)
236
239
self.add_accel_group(accels)
240
def _search_by_text(self, accel_group, window, key, modifiers):
243
def _search_by_text(self, *ignored): # (accel_group, window, key, modifiers):
241
244
self._search.show_for('text')
242
245
self._search.set_target(self.annoview, TEXT_LINE_COL)
244
def _search_by_line(self, accel_group, window, key, modifiers):
247
def _search_by_line(self, *ignored): # accel_group, window, key, modifiers):
245
248
self._search.show_for('line')
246
249
self._search.set_target(self.annoview, LINE_NUM_COL)
248
def row_diff(self, tv, path, tvc):
251
def line_diff(self, tv, path, tvc):
252
row = path.get_indices()[0]
250
253
revision = self.annotations[row]
251
254
repository = self.branch.repository
252
255
if revision.revision_id == CURRENT_REVISION:
260
263
tree2 = repository.revision_tree(NULL_REVISION)
261
264
from bzrlib.plugins.gtk.diff import DiffWindow
262
window = DiffWindow()
263
window.set_diff("Diff for row %d" % (row+1), tree1, tree2)
265
window = DiffWindow(self)
266
window.set_diff("Diff for line %d" % (row+1), tree1, tree2)
264
267
window.set_file(tree1.id2path(self.file_id))
268
271
def _create_annotate_view(self):
270
273
tv.set_rules_hint(False)
271
274
tv.connect("cursor-changed", self._activate_selected_revision)
273
tv.connect("row-activated", self.row_diff)
276
tv.connect("row-activated", self.line_diff)
275
cell = gtk.CellRendererText()
278
cell = Gtk.CellRendererText()
276
279
cell.set_property("xalign", 1.0)
277
280
cell.set_property("ypad", 0)
278
281
cell.set_property("family", "Monospace")
279
282
cell.set_property("cell-background-gdk",
280
tv.get_style().bg[gtk.STATE_NORMAL])
281
col = gtk.TreeViewColumn()
283
tv.get_style().bg[Gtk.StateType.NORMAL])
284
col = Gtk.TreeViewColumn()
282
285
col.set_resizable(False)
283
col.pack_start(cell, expand=True)
286
col.pack_start(cell, True)
284
287
col.add_attribute(cell, "text", LINE_NUM_COL)
285
288
tv.append_column(col)
287
cell = gtk.CellRendererText()
290
cell = Gtk.CellRendererText()
288
291
cell.set_property("ypad", 0)
289
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
292
cell.set_property("ellipsize", Pango.EllipsizeMode.END)
290
293
cell.set_property("cell-background-gdk",
291
self.get_style().bg[gtk.STATE_NORMAL])
292
col = gtk.TreeViewColumn("Committer")
294
self.get_style().bg[Gtk.StateType.NORMAL])
295
col = Gtk.TreeViewColumn("Committer")
293
296
col.set_resizable(True)
294
col.pack_start(cell, expand=True)
297
col.pack_start(cell, True)
295
298
col.add_attribute(cell, "text", COMMITTER_COL)
296
299
tv.append_column(col)
298
cell = gtk.CellRendererText()
301
cell = Gtk.CellRendererText()
299
302
cell.set_property("xalign", 1.0)
300
303
cell.set_property("ypad", 0)
301
304
cell.set_property("cell-background-gdk",
302
self.get_style().bg[gtk.STATE_NORMAL])
303
col = gtk.TreeViewColumn("Revno")
305
self.get_style().bg[Gtk.StateType.NORMAL])
306
col = Gtk.TreeViewColumn("Revno")
304
307
col.set_resizable(False)
305
col.pack_start(cell, expand=True)
308
col.pack_start(cell, True)
306
309
col.add_attribute(cell, "markup", REVNO_COL)
307
310
tv.append_column(col)
309
cell = gtk.CellRendererText()
312
cell = Gtk.CellRendererText()
310
313
cell.set_property("ypad", 0)
311
314
cell.set_property("family", "Monospace")
312
col = gtk.TreeViewColumn()
315
col = Gtk.TreeViewColumn()
313
316
col.set_resizable(False)
314
col.pack_start(cell, expand=True)
317
col.pack_start(cell, True)
315
318
# col.add_attribute(cell, "foreground", HIGHLIGHT_COLOR_COL)
316
319
col.add_attribute(cell, "background", HIGHLIGHT_COLOR_COL)
317
320
col.add_attribute(cell, "text", TEXT_LINE_COL)
318
321
tv.append_column(col)
320
# FIXME: Now that C-f is now used for search by text we
321
# may as well disable the auto search.
322
tv.set_search_column(LINE_NUM_COL)
323
# interactive substring search
324
def search_equal_func(model, column, key, iter):
325
return model.get_value(iter, TEXT_LINE_COL).lower().find(key.lower()) == -1
327
tv.set_enable_search(True)
328
tv.set_search_equal_func(search_equal_func, None)
326
332
def _create_log_view(self):
333
lv = RevisionView(self._branch)
331
337
def _create_back_button(self):
332
button = gtk.Button()
338
button = Gtk.Button()
333
339
button.set_use_stock(True)
334
340
button.set_label("gtk-go-back")
335
341
button.connect("clicked", lambda w: self.go_back())
336
button.set_relief(gtk.RELIEF_NONE)
342
button.set_relief(Gtk.ReliefStyle.NONE)
340
346
def _create_forward_button(self):
341
button = gtk.Button()
347
button = Gtk.Button()
342
348
button.set_use_stock(True)
343
349
button.set_label("gtk-go-forward")
344
350
button.connect("clicked", lambda w: self.go_forward())
345
button.set_relief(gtk.RELIEF_NONE)
351
button.set_relief(Gtk.ReliefStyle.NONE)
347
353
button.set_sensitive(False)
356
def _create_find_button(self):
357
button = Gtk.Button()
358
button.set_use_stock(True)
359
button.set_label("gtk-find")
360
button.set_tooltip_text("Search for text (Ctrl+F)")
361
button.connect("clicked", self._search_by_text)
362
button.set_relief(Gtk.ReliefStyle.NONE)
364
button.set_sensitive(True)
367
def _create_goto_button(self):
368
button = Gtk.Button()
369
button.set_label("Goto Line")
370
button.set_tooltip_text("Scroll to a line by entering its number (Ctrl+G)")
371
button.connect("clicked", self._search_by_line)
372
button.set_relief(Gtk.ReliefStyle.NONE)
374
button.set_sensitive(True)
350
377
def go_back(self):
351
378
last_tree = self.tree
352
379
rev_id = self._selected_revision()
424
457
self.__cache[revision_id] = revision
425
458
return self.__cache[revision_id]
427
class SearchBox(gtk.HBox):
461
class SearchBox(Gtk.HBox):
428
462
"""A button box for searching in text or lines of annotations"""
429
463
def __init__(self):
430
gtk.HBox.__init__(self, False, 6)
464
super(SearchBox, self).__init__(homogeneous=False, spacing=6)
433
button = gtk.Button()
435
image.set_from_stock('gtk-stop', gtk.ICON_SIZE_BUTTON)
467
button = Gtk.Button()
469
image.set_from_stock('gtk-stop', Gtk.IconSize.BUTTON)
436
470
button.set_image(image)
437
button.set_relief(gtk.RELIEF_NONE)
438
button.connect("clicked", lambda w: self.hide_all())
439
self.pack_start(button, expand=False, fill=False)
471
button.set_relief(Gtk.ReliefStyle.NONE)
472
button.connect("clicked", lambda w: self.hide())
473
self.pack_start(button, False, False, 0)
443
477
self._label = label
444
self.pack_start(label, expand=False, fill=False)
478
self.pack_start(label, False, False, 0)
447
481
self._entry = entry
448
482
entry.connect("activate", lambda w, d: self._do_search(d),
450
self.pack_start(entry, expand=False, fill=False)
484
self.pack_start(entry, False, False, 0)
452
486
# Next/previous buttons
453
button = gtk.Button('_Next')
455
image.set_from_stock('gtk-go-forward', gtk.ICON_SIZE_BUTTON)
487
button = Gtk.Button(_i18n('_Next'), use_underline=True)
489
image.set_from_stock('gtk-go-forward', Gtk.IconSize.BUTTON)
456
490
button.set_image(image)
457
491
button.connect("clicked", lambda w, d: self._do_search(d),
459
self.pack_start(button, expand=False, fill=False)
493
self.pack_start(button, False, False, 0)
461
button = gtk.Button('_Previous')
463
image.set_from_stock('gtk-go-back', gtk.ICON_SIZE_BUTTON)
495
button = Gtk.Button(_i18n('_Previous'), use_underline=True)
497
image.set_from_stock('gtk-go-back', Gtk.IconSize.BUTTON)
464
498
button.set_image(image)
465
499
button.connect("clicked", lambda w, d: self._do_search(d),
467
self.pack_start(button, expand=False, fill=False)
501
self.pack_start(button, False, False, 0)
470
check = gtk.CheckButton('Match case')
504
check = Gtk.CheckButton('Match case')
471
505
self._match_case = check
472
self.pack_start(check, expand=False, fill=False)
506
self.pack_start(check, False, False, 0)
474
check = gtk.CheckButton('Regexp')
508
check = Gtk.CheckButton('Regexp')
475
509
check.connect("toggled", lambda w: self._set_label())
476
510
self._regexp = check
477
self.pack_start(check, expand=False, fill=False)
511
self.pack_start(check, False, False, 0)
479
513
self._view = None
480
514
self._column = None
508
542
def _match(self, model, iterator, column):
509
543
matching_case = self._match_case.get_active()
510
string, = model.get(iterator, column)
544
cell_value, = model.get(iterator, column)
511
545
key = self._entry.get_text()
512
if self._regexp.get_active():
546
if column == LINE_NUM_COL:
547
# FIXME: For goto-line there are faster algorithms than searching
548
# every line til we find the right one! -- mbp 2011-01-27
549
return key.strip() == str(cell_value)
550
elif self._regexp.get_active():
513
551
if matching_case:
514
match = re.compile(key).search(string, 1)
552
match = re.compile(key).search(cell_value, 1)
516
match = re.compile(key, re.I).search(string, 1)
554
match = re.compile(key, re.I).search(cell_value, 1)
518
556
if not matching_case:
519
string = string.lower()
557
cell_value = cell_value.lower()
520
558
key = key.lower()
521
match = string.find(key) != -1
559
match = cell_value.find(key) != -1