63
65
self.branch = branch
65
67
self.file_id = file_id
68
self.revisionview.set_file_id(file_id)
66
69
self.revision_id = getattr(tree, 'get_revision_id',
67
70
lambda: CURRENT_REVISION)()
69
72
# [revision id, line number, author, revno, highlight color, line]
70
self.annomodel = gtk.ListStore(gobject.TYPE_STRING,
73
self.annomodel = Gtk.ListStore(GObject.TYPE_STRING,
80
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)
81
88
for line_no, (revision, revno, line)\
82
in enumerate(self._annotate(tree, file_id)):
89
in enumerate(self._annotate(tree, file_id)):
83
90
if revision.revision_id == last_seen and not self.all:
84
revno = committer = ""
86
93
last_seen = revision.revision_id
87
committer = revision.properties.get('author',
94
author = ", ".join(revision.get_apparent_authors())
90
96
if revision.revision_id not in self.revisions:
91
97
self.revisions[revision.revision_id] = revision
93
99
self.annomodel.append([revision.revision_id,
98
104
line.rstrip("\r\n")
100
106
self.annotations.append(revision)
102
108
if not self.plain:
117
126
print("gannotate: Line number %d does't exist. Defaulting to "
118
127
"line 1." % lineno)
123
self.annoview.set_cursor(row)
124
self.annoview.scroll_to_cell(row, use_align=True)
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)
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)
139
137
def _annotate(self, tree, file_id):
140
138
current_revision = FakeRevision(CURRENT_REVISION)
194
192
self.back_button.set_sensitive(enable_back)
196
194
def _create(self):
197
self.logview = self._create_log_view()
195
self.revisionview = self._create_log_view()
198
196
self.annoview = self._create_annotate_view()
200
vbox = gtk.VBox(False)
198
vbox = Gtk.VBox(homogeneous=False, spacing=0)
203
sw = gtk.ScrolledWindow()
204
sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
205
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)
206
204
sw.add(self.annoview)
207
205
self.annoview.gwindow = self
209
swbox.pack_start(sw, True, True, 0)
214
hbox = gtk.HBox(False, 6)
212
hbox = Gtk.HBox(homogeneous=False, spacing=6)
215
213
self.back_button = self._create_back_button()
216
hbox.pack_start(self.back_button, expand=False, fill=True)
214
hbox.pack_start(self.back_button, False, True, 0)
217
215
self.forward_button = self._create_forward_button()
218
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)
220
vbox.pack_start(hbox, expand=False, fill=True)
222
self.pane = pane = gtk.VPaned()
222
vbox.pack_start(hbox, False, True, 0)
224
self.pane = pane = Gtk.VPaned()
224
pane.add2(self.logview)
226
pane.add2(self.revisionview)
226
vbox.pack_start(pane, expand=True, fill=True)
228
vbox.pack_start(pane, True, True, 0)
228
230
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,
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,
233
235
self._search_by_text)
234
accels.connect_group(gtk.keysyms.g, gtk.gdk.CONTROL_MASK,
236
accels.connect(Gdk.KEY_g, Gdk.ModifierType.CONTROL_MASK,
237
Gtk.AccelFlags.LOCKED,
236
238
self._search_by_line)
237
239
self.add_accel_group(accels)
241
def _search_by_text(self, accel_group, window, key, modifiers):
243
def _search_by_text(self, *ignored): # (accel_group, window, key, modifiers):
242
244
self._search.show_for('text')
243
245
self._search.set_target(self.annoview, TEXT_LINE_COL)
245
def _search_by_line(self, accel_group, window, key, modifiers):
247
def _search_by_line(self, *ignored): # accel_group, window, key, modifiers):
246
248
self._search.show_for('line')
247
249
self._search.set_target(self.annoview, LINE_NUM_COL)
249
def row_diff(self, tv, path, tvc):
251
def line_diff(self, tv, path, tvc):
252
row = path.get_indices()[0]
251
253
revision = self.annotations[row]
252
254
repository = self.branch.repository
253
255
if revision.revision_id == CURRENT_REVISION:
261
263
tree2 = repository.revision_tree(NULL_REVISION)
262
264
from bzrlib.plugins.gtk.diff import DiffWindow
263
window = DiffWindow()
264
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)
265
267
window.set_file(tree1.id2path(self.file_id))
269
271
def _create_annotate_view(self):
271
273
tv.set_rules_hint(False)
272
274
tv.connect("cursor-changed", self._activate_selected_revision)
274
tv.connect("row-activated", self.row_diff)
276
tv.connect("row-activated", self.line_diff)
276
cell = gtk.CellRendererText()
278
cell = Gtk.CellRendererText()
277
279
cell.set_property("xalign", 1.0)
278
280
cell.set_property("ypad", 0)
279
281
cell.set_property("family", "Monospace")
280
282
cell.set_property("cell-background-gdk",
281
tv.get_style().bg[gtk.STATE_NORMAL])
282
col = gtk.TreeViewColumn()
283
tv.get_style().bg[Gtk.StateType.NORMAL])
284
col = Gtk.TreeViewColumn()
283
285
col.set_resizable(False)
284
col.pack_start(cell, expand=True)
286
col.pack_start(cell, True)
285
287
col.add_attribute(cell, "text", LINE_NUM_COL)
286
288
tv.append_column(col)
288
cell = gtk.CellRendererText()
290
cell = Gtk.CellRendererText()
289
291
cell.set_property("ypad", 0)
290
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
292
cell.set_property("ellipsize", Pango.EllipsizeMode.END)
291
293
cell.set_property("cell-background-gdk",
292
self.get_style().bg[gtk.STATE_NORMAL])
293
col = gtk.TreeViewColumn("Committer")
294
self.get_style().bg[Gtk.StateType.NORMAL])
295
col = Gtk.TreeViewColumn("Committer")
294
296
col.set_resizable(True)
295
col.pack_start(cell, expand=True)
297
col.pack_start(cell, True)
296
298
col.add_attribute(cell, "text", COMMITTER_COL)
297
299
tv.append_column(col)
299
cell = gtk.CellRendererText()
301
cell = Gtk.CellRendererText()
300
302
cell.set_property("xalign", 1.0)
301
303
cell.set_property("ypad", 0)
302
304
cell.set_property("cell-background-gdk",
303
self.get_style().bg[gtk.STATE_NORMAL])
304
col = gtk.TreeViewColumn("Revno")
305
self.get_style().bg[Gtk.StateType.NORMAL])
306
col = Gtk.TreeViewColumn("Revno")
305
307
col.set_resizable(False)
306
col.pack_start(cell, expand=True)
308
col.pack_start(cell, True)
307
309
col.add_attribute(cell, "markup", REVNO_COL)
308
310
tv.append_column(col)
310
cell = gtk.CellRendererText()
312
cell = Gtk.CellRendererText()
311
313
cell.set_property("ypad", 0)
312
314
cell.set_property("family", "Monospace")
313
col = gtk.TreeViewColumn()
315
col = Gtk.TreeViewColumn()
314
316
col.set_resizable(False)
315
col.pack_start(cell, expand=True)
317
col.pack_start(cell, True)
316
318
# col.add_attribute(cell, "foreground", HIGHLIGHT_COLOR_COL)
317
319
col.add_attribute(cell, "background", HIGHLIGHT_COLOR_COL)
318
320
col.add_attribute(cell, "text", TEXT_LINE_COL)
319
321
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)
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)
327
332
def _create_log_view(self):
333
lv = RevisionView(self._branch)
332
337
def _create_back_button(self):
333
button = gtk.Button()
338
button = Gtk.Button()
334
339
button.set_use_stock(True)
335
340
button.set_label("gtk-go-back")
336
341
button.connect("clicked", lambda w: self.go_back())
337
button.set_relief(gtk.RELIEF_NONE)
342
button.set_relief(Gtk.ReliefStyle.NONE)
341
346
def _create_forward_button(self):
342
button = gtk.Button()
347
button = Gtk.Button()
343
348
button.set_use_stock(True)
344
349
button.set_label("gtk-go-forward")
345
350
button.connect("clicked", lambda w: self.go_forward())
346
button.set_relief(gtk.RELIEF_NONE)
351
button.set_relief(Gtk.ReliefStyle.NONE)
348
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)
351
377
def go_back(self):
352
378
last_tree = self.tree
353
379
rev_id = self._selected_revision()
425
457
self.__cache[revision_id] = revision
426
458
return self.__cache[revision_id]
428
class SearchBox(gtk.HBox):
461
class SearchBox(Gtk.HBox):
429
462
"""A button box for searching in text or lines of annotations"""
430
463
def __init__(self):
431
gtk.HBox.__init__(self, False, 6)
464
super(SearchBox, self).__init__(homogeneous=False, spacing=6)
434
button = gtk.Button()
436
image.set_from_stock('gtk-stop', gtk.ICON_SIZE_BUTTON)
467
button = Gtk.Button()
469
image.set_from_stock('gtk-stop', Gtk.IconSize.BUTTON)
437
470
button.set_image(image)
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)
471
button.set_relief(Gtk.ReliefStyle.NONE)
472
button.connect("clicked", lambda w: self.hide())
473
self.pack_start(button, False, False, 0)
444
477
self._label = label
445
self.pack_start(label, expand=False, fill=False)
478
self.pack_start(label, False, False, 0)
448
481
self._entry = entry
449
482
entry.connect("activate", lambda w, d: self._do_search(d),
451
self.pack_start(entry, expand=False, fill=False)
484
self.pack_start(entry, False, False, 0)
453
486
# Next/previous buttons
454
button = gtk.Button('_Next')
456
image.set_from_stock('gtk-go-forward', gtk.ICON_SIZE_BUTTON)
487
button = Gtk.Button('_Next')
489
image.set_from_stock('gtk-go-forward', Gtk.IconSize.BUTTON)
457
490
button.set_image(image)
458
491
button.connect("clicked", lambda w, d: self._do_search(d),
460
self.pack_start(button, expand=False, fill=False)
493
self.pack_start(button, False, False, 0)
462
button = gtk.Button('_Previous')
464
image.set_from_stock('gtk-go-back', gtk.ICON_SIZE_BUTTON)
495
button = Gtk.Button('_Previous')
497
image.set_from_stock('gtk-go-back', Gtk.IconSize.BUTTON)
465
498
button.set_image(image)
466
499
button.connect("clicked", lambda w, d: self._do_search(d),
468
self.pack_start(button, expand=False, fill=False)
501
self.pack_start(button, False, False, 0)
471
check = gtk.CheckButton('Match case')
504
check = Gtk.CheckButton('Match case')
472
505
self._match_case = check
473
self.pack_start(check, expand=False, fill=False)
506
self.pack_start(check, False, False, 0)
475
check = gtk.CheckButton('Regexp')
508
check = Gtk.CheckButton('Regexp')
476
509
check.connect("toggled", lambda w: self._set_label())
477
510
self._regexp = check
478
self.pack_start(check, expand=False, fill=False)
511
self.pack_start(check, False, False, 0)
480
513
self._view = None
481
514
self._column = None
509
542
def _match(self, model, iterator, column):
510
543
matching_case = self._match_case.get_active()
511
string, = model.get(iterator, column)
544
cell_value, = model.get(iterator, column)
512
545
key = self._entry.get_text()
513
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():
514
551
if matching_case:
515
match = re.compile(key).search(string, 1)
552
match = re.compile(key).search(cell_value, 1)
517
match = re.compile(key, re.I).search(string, 1)
554
match = re.compile(key, re.I).search(cell_value, 1)
519
556
if not matching_case:
520
string = string.lower()
557
cell_value = cell_value.lower()
521
558
key = key.lower()
522
match = string.find(key) != -1
559
match = cell_value.find(key) != -1