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