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