45
class GAnnotateWindow(Window):
44
class GAnnotateWindow(gtk.Window):
46
45
"""Annotate window."""
48
def __init__(self, all=False, plain=False, parent=None, branch=None):
47
def __init__(self, all=False, plain=False):
53
super(GAnnotateWindow, self).__init__(parent=parent)
56
self.render_icon_pixbuf(Gtk.STOCK_FIND, Gtk.IconSize.BUTTON))
51
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
53
self.set_icon(self.render_icon(gtk.STOCK_FIND, gtk.ICON_SIZE_BUTTON))
57
54
self.annotate_colormap = AnnotateColorSaturation()
58
def annotate(self, tree, branch, file_id):
60
59
self.revisions = {}
64
def annotate(self, tree, branch, file_id):
65
60
self.annotations = []
66
61
self.branch = branch
68
63
self.file_id = file_id
69
self.revisionview.set_file_id(file_id)
70
64
self.revision_id = getattr(tree, 'get_revision_id',
71
65
lambda: CURRENT_REVISION)()
73
# [revision id, line number, author, revno, highlight color, line]
74
self.annomodel = Gtk.ListStore(GObject.TYPE_STRING,
67
# [revision id, line number, committer, revno, highlight color, line]
68
self.annomodel = gtk.ListStore(gobject.TYPE_STRING,
84
78
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
79
for line_no, (revision, revno, line)\
90
in enumerate(self._annotate(tree, file_id)):
80
in enumerate(self._annotate(tree, file_id)):
91
81
if revision.revision_id == last_seen and not self.all:
82
revno = committer = ""
94
84
last_seen = revision.revision_id
95
author = ", ".join(revision.get_apparent_authors())
85
committer = revision.committer
97
87
if revision.revision_id not in self.revisions:
98
88
self.revisions[revision.revision_id] = revision
100
90
self.annomodel.append([revision.revision_id,
105
95
line.rstrip("\r\n")
107
97
self.annotations.append(revision)
109
99
if not self.plain:
100
self._set_oldest_newest()
110
101
now = time.time()
111
102
self.annomodel.foreach(self._highlight_annotation, now)
127
115
print("gannotate: Line number %d does't exist. Defaulting to "
128
116
"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)
121
self.annoview.set_cursor(row)
122
self.annoview.scroll_to_cell(row, use_align=True)
124
def _dotted_revnos(self, repository, revision_id):
125
"""Return a dict of revision_id -> dotted revno
127
:param repository: The repository to get the graph from
128
:param revision_id: The last revision for which this info is needed
130
graph = repository.get_revision_graph(revision_id)
132
for n, revision_id, d, revno, e in tsort.merge_sort(graph,
133
revision_id, generate_revno=True):
134
dotted[revision_id] = '.'.join(str(num) for num in revno)
137
137
def _annotate(self, tree, file_id):
138
138
current_revision = FakeRevision(CURRENT_REVISION)
139
139
current_revision.committer = self.branch.get_config().username()
140
140
current_revision.timestamp = time.time()
141
141
current_revision.message = '[Not yet committed]'
142
current_revision.parent_ids = tree.get_parent_ids()
143
current_revision.properties['branch-nick'] = self.branch._get_nick(local=True)
144
142
current_revno = '%d?' % (self.branch.revno() + 1)
145
143
repository = self.branch.repository
146
144
if self.revision_id == CURRENT_REVISION:
147
145
revision_id = self.branch.last_revision()
149
147
revision_id = self.revision_id
150
revision_cache = RevisionCache(repository, self.revisions)
148
dotted = self._dotted_revnos(repository, revision_id)
149
revision_cache = RevisionCache(repository)
151
150
for origin, text in tree.annotate_iter(file_id):
153
if rev_id == CURRENT_REVISION:
154
revision = current_revision
155
revno = current_revno
158
revision = revision_cache.get_revision(rev_id)
159
revno = self.dotted.get(rev_id, 'merge')
162
except NoSuchRevision:
153
revision = revision_cache.get_revision(rev_id)
154
revno = dotted.get(rev_id, 'merge')
157
except NoSuchRevision:
159
if rev_id == CURRENT_REVISION:
160
revision = current_revision
161
revno = current_revno
163
163
revision = FakeRevision(rev_id)
166
166
yield revision, revno, text
168
def _set_oldest_newest(self):
169
rev_dates = map(lambda i: self.revisions[i].timestamp, self.revisions)
170
if len(rev_dates) == 0:
172
oldest = min(rev_dates)
173
newest = max(rev_dates)
168
175
def _highlight_annotation(self, model, path, iter, now):
169
176
revision_id, = model.get(iter, REVISION_ID_COL)
170
177
revision = self.revisions[revision_id]
171
# XXX sinzui 2011-08-12: What does get_color return?
172
color = self.annotate_colormap.get_color(revision, now)
173
model.set_value(iter, HIGHLIGHT_COLOR_COL, color)
178
model.set(iter, HIGHLIGHT_COLOR_COL,
179
self.annotate_colormap.get_color(revision, now))
175
def _selected_revision(self):
181
def _show_log(self, w):
176
182
(path, col) = self.annoview.get_cursor()
179
return self.annomodel[path][REVISION_ID_COL]
181
def _activate_selected_revision(self, w):
182
rev_id = self._selected_revision()
183
if not rev_id or rev_id == NULL_REVISION:
185
selected = self.revisions[rev_id]
186
self.revisionview.set_revision(selected)
187
if (len(selected.parent_ids) != 0 and selected.parent_ids[0] not in
192
self.back_button.set_sensitive(enable_back)
185
rev_id = self.annomodel[path][REVISION_ID_COL]
186
self.logview.set_revision(self.revisions[rev_id])
194
188
def _create(self):
195
self.revisionview = self._create_log_view()
189
self.logview = self._create_log_view()
196
190
self.annoview = self._create_annotate_view()
198
vbox = Gtk.VBox(homogeneous=False, spacing=0)
192
vbox = gtk.VBox(False, 12)
193
vbox.set_border_width(12)
201
sw = Gtk.ScrolledWindow()
202
sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
203
sw.set_shadow_type(Gtk.ShadowType.IN)
196
sw = gtk.ScrolledWindow()
197
sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
198
sw.set_shadow_type(gtk.SHADOW_IN)
204
199
sw.add(self.annoview)
205
200
self.annoview.gwindow = self
209
swbox.pack_start(sw, True, True, 0)
212
hbox = Gtk.HBox(homogeneous=False, spacing=6)
213
self.back_button = self._create_back_button()
214
hbox.pack_start(self.back_button, False, True, 0)
215
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)
203
self.pane = pane = gtk.VPaned()
205
pane.add2(self.logview)
207
vbox.pack_start(pane, expand=True, fill=True)
209
hbox = gtk.HBox(True, 6)
210
hbox.pack_start(self._create_button_box(), expand=False, fill=True)
222
vbox.pack_start(hbox, False, True, 0)
224
self.pane = pane = Gtk.Paned.new(Gtk.Orientation.VERTICAL)
226
pane.add2(self.revisionview)
228
vbox.pack_start(pane, True, True, 0)
230
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,
235
self._search_by_text)
236
accels.connect(Gdk.KEY_g, Gdk.ModifierType.CONTROL_MASK,
237
Gtk.AccelFlags.LOCKED,
238
self._search_by_line)
239
self.add_accel_group(accels)
212
vbox.pack_start(hbox, expand=False, fill=True)
243
def _search_by_text(self, *ignored): # (accel_group, window, key, modifiers):
244
self._search.show_for('text')
245
self._search.set_target(self.annoview, TEXT_LINE_COL)
247
def _search_by_line(self, *ignored): # accel_group, window, key, modifiers):
248
self._search.show_for('line')
249
self._search.set_target(self.annoview, LINE_NUM_COL)
251
def line_diff(self, tv, path, tvc):
252
row = path.get_indices()[0]
216
def row_diff(self, tv, path, tvc):
253
218
revision = self.annotations[row]
254
219
repository = self.branch.repository
255
220
if revision.revision_id == CURRENT_REVISION:
261
226
tree2 = repository.revision_tree(revision.parent_ids[0])
263
228
tree2 = repository.revision_tree(NULL_REVISION)
264
from bzrlib.plugins.gtk.diff import DiffWindow
265
window = DiffWindow(self)
266
window.set_diff("Diff for line %d" % (row+1), tree1, tree2)
229
from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
230
window = DiffWindow()
231
window.set_diff("Diff for row %d" % (row+1), tree1, tree2)
267
232
window.set_file(tree1.id2path(self.file_id))
271
236
def _create_annotate_view(self):
273
238
tv.set_rules_hint(False)
274
tv.connect("cursor-changed", self._activate_selected_revision)
239
tv.connect("cursor-changed", self._show_log)
276
tv.connect("row-activated", self.line_diff)
241
tv.connect("row-activated", self.row_diff)
278
cell = Gtk.CellRendererText()
243
cell = gtk.CellRendererText()
279
244
cell.set_property("xalign", 1.0)
280
245
cell.set_property("ypad", 0)
281
246
cell.set_property("family", "Monospace")
282
247
cell.set_property("cell-background-gdk",
283
tv.get_style().bg[Gtk.StateType.NORMAL])
284
col = Gtk.TreeViewColumn()
248
tv.get_style().bg[gtk.STATE_NORMAL])
249
col = gtk.TreeViewColumn()
285
250
col.set_resizable(False)
286
col.pack_start(cell, True)
251
col.pack_start(cell, expand=True)
287
252
col.add_attribute(cell, "text", LINE_NUM_COL)
288
253
tv.append_column(col)
290
cell = Gtk.CellRendererText()
255
cell = gtk.CellRendererText()
291
256
cell.set_property("ypad", 0)
292
cell.set_property("ellipsize", Pango.EllipsizeMode.END)
257
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
293
258
cell.set_property("cell-background-gdk",
294
self.get_style().bg[Gtk.StateType.NORMAL])
295
col = Gtk.TreeViewColumn("Committer")
259
self.get_style().bg[gtk.STATE_NORMAL])
260
col = gtk.TreeViewColumn("Committer")
296
261
col.set_resizable(True)
297
col.pack_start(cell, True)
262
col.pack_start(cell, expand=True)
298
263
col.add_attribute(cell, "text", COMMITTER_COL)
299
264
tv.append_column(col)
301
cell = Gtk.CellRendererText()
266
cell = gtk.CellRendererText()
302
267
cell.set_property("xalign", 1.0)
303
268
cell.set_property("ypad", 0)
304
269
cell.set_property("cell-background-gdk",
305
self.get_style().bg[Gtk.StateType.NORMAL])
306
col = Gtk.TreeViewColumn("Revno")
270
self.get_style().bg[gtk.STATE_NORMAL])
271
col = gtk.TreeViewColumn("Revno")
307
272
col.set_resizable(False)
308
col.pack_start(cell, True)
273
col.pack_start(cell, expand=True)
309
274
col.add_attribute(cell, "markup", REVNO_COL)
310
275
tv.append_column(col)
312
cell = Gtk.CellRendererText()
277
cell = gtk.CellRendererText()
313
278
cell.set_property("ypad", 0)
314
279
cell.set_property("family", "Monospace")
315
col = Gtk.TreeViewColumn()
280
col = gtk.TreeViewColumn()
316
281
col.set_resizable(False)
317
col.pack_start(cell, True)
282
col.pack_start(cell, expand=True)
318
283
# col.add_attribute(cell, "foreground", HIGHLIGHT_COLOR_COL)
319
284
col.add_attribute(cell, "background", HIGHLIGHT_COLOR_COL)
320
285
col.add_attribute(cell, "text", TEXT_LINE_COL)
321
286
tv.append_column(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)
288
tv.set_search_column(LINE_NUM_COL)
332
292
def _create_log_view(self):
333
lv = RevisionView(self._branch)
337
def _create_back_button(self):
338
button = Gtk.Button()
339
button.set_use_stock(True)
340
button.set_label("gtk-go-back")
341
button.connect("clicked", lambda w: self.go_back())
342
button.set_relief(Gtk.ReliefStyle.NONE)
346
def _create_forward_button(self):
347
button = Gtk.Button()
348
button.set_use_stock(True)
349
button.set_label("gtk-go-forward")
350
button.connect("clicked", lambda w: self.go_forward())
351
button.set_relief(Gtk.ReliefStyle.NONE)
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)
378
last_tree = self.tree
379
rev_id = self._selected_revision()
380
parent_id = self.revisions[rev_id].parent_ids[0]
381
target_tree = self.branch.repository.revision_tree(parent_id)
382
if self._go(target_tree):
383
self.history.append(last_tree)
384
self.forward_button.set_sensitive(True)
386
self._no_back.add(parent_id)
387
self.back_button.set_sensitive(False)
389
def go_forward(self):
390
if len(self.history) == 0:
392
target_tree = self.history.pop()
393
if len(self.history) == 0:
394
self.forward_button.set_sensitive(False)
395
self._go(target_tree)
397
def _go(self, target_tree):
398
rev_id = self._selected_revision()
399
if self.file_id in target_tree:
400
offset = self.get_scroll_offset(target_tree)
401
path, col = self.annoview.get_cursor()
402
(row,) = path.get_indices()
403
self.annotate(target_tree, self.branch, self.file_id)
407
new_path = Gtk.TreePath(path=new_row)
408
self.annoview.set_cursor(new_path, None, False)
413
def get_scroll_offset(self, tree):
414
old = self.tree.get_file(self.file_id)
415
new = tree.get_file(self.file_id)
416
path, col = self.annoview.get_cursor()
417
(row,) = path.get_indices()
418
matcher = patiencediff.PatienceSequenceMatcher(None, old.readlines(),
420
for i, j, n in matcher.get_matching_blocks():
425
class FakeRevision(object):
298
def _create_button_box(self):
299
box = gtk.HButtonBox()
300
box.set_layout(gtk.BUTTONBOX_END)
303
button = gtk.Button()
304
button.set_use_stock(True)
305
button.set_label("gtk-close")
306
button.connect("clicked", lambda w: self.destroy())
309
box.pack_start(button, expand=False, fill=False)
426
315
""" A fake revision.
428
317
For when a revision is referenced but not present.
431
def __init__(self, revision_id, committer='?', nick=None):
320
def __init__(self, revision_id, committer='?'):
432
321
self.revision_id = revision_id
433
322
self.parent_ids = []
434
323
self.committer = committer
435
324
self.message = "?"
436
325
self.timestamp = 0.0
437
326
self.timezone = 0
440
def get_apparent_authors(self):
441
return [self.committer]
444
329
class RevisionCache(object):
445
330
"""A caching revision source"""
447
def __init__(self, real_source, seed_cache=None):
331
def __init__(self, real_source):
448
332
self.__real_source = real_source
449
if seed_cache is None:
452
self.__cache = dict(seed_cache)
454
335
def get_revision(self, revision_id):
455
336
if revision_id not in self.__cache:
456
337
revision = self.__real_source.get_revision(revision_id)
457
338
self.__cache[revision_id] = revision
458
339
return self.__cache[revision_id]
461
class SearchBox(Gtk.HBox):
462
"""A button box for searching in text or lines of annotations"""
464
super(SearchBox, self).__init__(homogeneous=False, spacing=6)
467
button = Gtk.Button()
469
image.set_from_stock('gtk-stop', Gtk.IconSize.BUTTON)
470
button.set_image(image)
471
button.set_relief(Gtk.ReliefStyle.NONE)
472
button.connect("clicked", lambda w: self.hide())
473
self.pack_start(button, False, False, 0)
478
self.pack_start(label, False, False, 0)
482
entry.connect("activate", lambda w, d: self._do_search(d),
484
self.pack_start(entry, False, False, 0)
486
# Next/previous buttons
487
button = Gtk.Button(_i18n('_Next'), use_underline=True)
489
image.set_from_stock('gtk-go-forward', Gtk.IconSize.BUTTON)
490
button.set_image(image)
491
button.connect("clicked", lambda w, d: self._do_search(d),
493
self.pack_start(button, False, False, 0)
495
button = Gtk.Button(_i18n('_Previous'), use_underline=True)
497
image.set_from_stock('gtk-go-back', Gtk.IconSize.BUTTON)
498
button.set_image(image)
499
button.connect("clicked", lambda w, d: self._do_search(d),
501
self.pack_start(button, False, False, 0)
504
check = Gtk.CheckButton('Match case')
505
self._match_case = check
506
self.pack_start(check, False, False, 0)
508
check = Gtk.CheckButton('Regexp')
509
check.connect("toggled", lambda w: self._set_label())
511
self.pack_start(check, False, False, 0)
515
# Note that we stay hidden (we do not call self.show_all())
518
def show_for(self, kind):
522
# Hide unrelated buttons
524
self._match_case.hide()
527
self._entry.grab_focus()
529
def _set_label(self):
530
if self._kind == 'line':
531
self._label.set_text('Find Line: ')
533
if self._regexp.get_active():
534
self._label.set_text('Find Regexp: ')
536
self._label.set_text('Find Text: ')
538
def set_target(self, view,column):
540
self._column = column
542
def _match(self, model, iterator, column):
543
matching_case = self._match_case.get_active()
544
cell_value, = model.get(iterator, column)
545
key = self._entry.get_text()
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():
552
match = re.compile(key).search(cell_value, 1)
554
match = re.compile(key, re.I).search(cell_value, 1)
556
if not matching_case:
557
cell_value = cell_value.lower()
559
match = cell_value.find(key) != -1
563
def _iterate_rows_forward(self, model, start):
564
model_size = len(model)
566
while model_size != 0:
567
if current >= model_size: current = 0
568
yield model.get_iter_from_string('%d' % current)
569
if current == start: raise StopIteration
572
def _iterate_rows_backward(self, model, start):
573
model_size = len(model)
575
while model_size != 0:
576
if current < 0: current = model_size - 1
577
yield model.get_iter_from_string('%d' % current)
578
if current == start: raise StopIteration
581
def _do_search(self, direction):
582
if direction == 'forward':
583
iterate = self._iterate_rows_forward
585
iterate = self._iterate_rows_backward
587
model, sel = self._view.get_selection().get_selected()
591
path = model.get_string_from_iter(sel)
594
for row in iterate(model, start):
595
if self._match(model, row, self._column):
596
path = model.get_path(row)
597
self._view.set_cursor(path, None, False)
598
self._view.scroll_to_cell(path, use_align=True)