To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
« back to all changes in this revision
Viewing changes to viz/branchwin.py
- browse files at revision 464.2.1
- compare with another revision
- download diff
- download tarball
- view history from revision 464.2.1
- Committer: Adrian Wilkins
- Date: 2008-04-24 15:26:14 UTC
- mto: This revision was merged to the branch mainline in revision 470.
- Revision ID: adrian.wilkins@gmail.com-20080424152614-2rnnljbro6vzqvf7
Detect the reserved null: revision in appropriate places.
This removes a huge shower of stack traces that get dumped to console when
you look at the bottom of a log.
This removes a huge shower of stack traces that get dumped to console when
you look at the bottom of a log.
- files added:
- branchbox.py
- branchview
- preferences
- files removed:
- tests/test_viz.py
- files renamed:
- viz/graphcell.py => branchview/graphcell.py
- viz/graph.py => branchview/linegraph.py
- bzr-icon-64.png => icons/bzr-icon-64.png
- oliveicon2.png => icons/oliveicon2.png
- preferences.py => preferences/__init__.py
- logview.py => revisionview.py
- files modified:
- .bzrignore
added
removed
viz/branchwin.py
13
13
import gobject
14
14
import pango
15
15
16
from bzrlib.osutils import format_date
17
18
from graph import distances, graph, same_branch
19
from graphcell import CellRendererGraph
20
21
22
class BranchWindow(gtk.Window):
16
from bzrlib.plugins.gtk.window import Window
17
from bzrlib.plugins.gtk import icon_path
18
from bzrlib.plugins.gtk.tags import AddTagDialog
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
21
from bzrlib.revision import Revision, NULL_REVISION
22
from bzrlib.config import BranchConfig
23
from bzrlib.config import GlobalConfig
24
25
class BranchWindow(Window):
23
26
"""Branch window.
24
27
25
28
This object represents and manages a single window containing information
26
29
for a particular branch.
27
30
"""
28
31
29
def __init__(self):
30
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
32
def __init__(self, branch, start_revs, maxnum, parent=None):
33
"""Create a new BranchWindow.
34
35
:param branch: Branch object for branch to show.
36
:param start_revs: Revision ids of top revisions.
37
:param maxnum: Maximum number of revisions to display,
38
None for no limit.
39
"""
40
41
Window.__init__(self, parent=parent)
31
42
self.set_border_width(0)
32
self.set_title("bzrk")
43
44
self.branch = branch
45
self.start_revs = start_revs
46
self.maxnum = maxnum
47
self.config = GlobalConfig()
48
49
if self.config.get_user_option('viz-compact-view') == 'yes':
50
self.compact_view = True
51
else:
52
self.compact_view = False
53
54
self.set_title(branch.nick + " - revision history")
33
55
34
56
# Use three-quarters of the screen by default
35
57
screen = self.get_screen()
42
64
icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
43
65
self.set_icon(icon)
44
66
67
gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
68
gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
69
45
70
self.accel_group = gtk.AccelGroup()
46
71
self.add_accel_group(self.accel_group)
47
72
73
gtk.Action.set_tool_item_type(gtk.MenuToolButton)
74
75
self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
76
self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
77
self.prev_rev_action.set_accel_group(self.accel_group)
78
self.prev_rev_action.connect("activate", self._back_clicked_cb)
79
self.prev_rev_action.connect_accelerator()
80
81
self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
82
self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
83
self.next_rev_action.set_accel_group(self.accel_group)
84
self.next_rev_action.connect("activate", self._fwd_clicked_cb)
85
self.next_rev_action.connect_accelerator()
86
48
87
self.construct()
49
88
89
def set_revision(self, revid):
90
self.treeview.set_revision_id(revid)
91
50
92
def construct(self):
51
93
"""Construct the window contents."""
52
94
vbox = gtk.VBox(spacing=0)
53
95
self.add(vbox)
54
96
97
self.paned = gtk.VPaned()
98
self.paned.pack1(self.construct_top(), resize=True, shrink=False)
99
self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
100
self.paned.show()
101
102
vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
55
103
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
56
57
paned = gtk.VPaned()
58
paned.pack1(self.construct_top(), resize=True, shrink=False)
59
paned.pack2(self.construct_bottom(), resize=False, shrink=True)
60
paned.show()
61
vbox.pack_start(paned, expand=True, fill=True)
62
vbox.set_focus_child(paned)
104
105
vbox.pack_start(self.paned, expand=True, fill=True)
106
vbox.set_focus_child(self.paned)
63
107
64
108
vbox.show()
65
109
110
def construct_menubar(self):
111
menubar = gtk.MenuBar()
112
113
file_menu = gtk.Menu()
114
file_menuitem = gtk.MenuItem("_File")
115
file_menuitem.set_submenu(file_menu)
116
117
file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
118
file_menu_close.connect('activate', lambda x: self.destroy())
119
120
file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
121
file_menu_quit.connect('activate', lambda x: gtk.main_quit())
122
123
if self._parent is not None:
124
file_menu.add(file_menu_close)
125
file_menu.add(file_menu_quit)
126
127
edit_menu = gtk.Menu()
128
edit_menuitem = gtk.MenuItem("_Edit")
129
edit_menuitem.set_submenu(edit_menu)
130
131
edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
132
133
edit_menu_branchopts = gtk.MenuItem("Branch Settings")
134
edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
135
136
edit_menu_globopts = gtk.MenuItem("Global Settings")
137
edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
138
139
edit_menu.add(edit_menu_find)
140
edit_menu.add(edit_menu_branchopts)
141
edit_menu.add(edit_menu_globopts)
142
143
view_menu = gtk.Menu()
144
view_menuitem = gtk.MenuItem("_View")
145
view_menuitem.set_submenu(view_menu)
146
147
view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
148
view_menu_toolbar.set_active(True)
149
view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
150
151
view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
152
view_menu_compact.set_active(self.compact_view)
153
view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
154
155
view_menu.add(view_menu_toolbar)
156
view_menu.add(view_menu_compact)
157
view_menu.add(gtk.SeparatorMenuItem())
158
159
self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
160
self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
161
162
# Revision numbers are pointless if there are multiple branches
163
if len(self.start_revs) > 1:
164
self.mnu_show_revno_column.set_sensitive(False)
165
self.treeview.set_property('revno-column-visible', False)
166
167
for (col, name) in [(self.mnu_show_revno_column, "revno"),
168
(self.mnu_show_date_column, "date")]:
169
col.set_active(self.treeview.get_property(name + "-column-visible"))
170
col.connect('toggled', self._col_visibility_changed, name)
171
view_menu.add(col)
172
173
go_menu = gtk.Menu()
174
go_menu.set_accel_group(self.accel_group)
175
go_menuitem = gtk.MenuItem("_Go")
176
go_menuitem.set_submenu(go_menu)
177
178
go_menu_next = self.next_rev_action.create_menu_item()
179
go_menu_prev = self.prev_rev_action.create_menu_item()
180
181
tag_image = gtk.Image()
182
tag_image.set_from_file(icon_path("tag-16.png"))
183
self.go_menu_tags = gtk.ImageMenuItem("_Tags")
184
self.go_menu_tags.set_image(tag_image)
185
self._update_tags()
186
187
go_menu.add(go_menu_next)
188
go_menu.add(go_menu_prev)
189
go_menu.add(gtk.SeparatorMenuItem())
190
go_menu.add(self.go_menu_tags)
191
192
revision_menu = gtk.Menu()
193
revision_menuitem = gtk.MenuItem("_Revision")
194
revision_menuitem.set_submenu(revision_menu)
195
196
revision_menu_diff = gtk.MenuItem("View Changes")
197
revision_menu_diff.connect('activate',
198
lambda w: self.treeview.show_diff())
199
200
revision_menu_tag = gtk.MenuItem("Tag Revision")
201
revision_menu_tag.connect('activate', self._tag_revision_cb)
202
203
revision_menu.add(revision_menu_tag)
204
revision_menu.add(revision_menu_diff)
205
206
branch_menu = gtk.Menu()
207
branch_menuitem = gtk.MenuItem("_Branch")
208
branch_menuitem.set_submenu(branch_menu)
209
210
branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
211
branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
212
213
help_menu = gtk.Menu()
214
help_menuitem = gtk.MenuItem("_Help")
215
help_menuitem.set_submenu(help_menu)
216
217
help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
218
help_about_menuitem.connect('activate', self._about_dialog_cb)
219
220
help_menu.add(help_about_menuitem)
221
222
menubar.add(file_menuitem)
223
menubar.add(edit_menuitem)
224
menubar.add(view_menuitem)
225
menubar.add(go_menuitem)
226
menubar.add(revision_menuitem)
227
menubar.add(branch_menuitem)
228
menubar.add(help_menuitem)
229
menubar.show_all()
230
231
return menubar
232
66
233
def construct_top(self):
67
234
"""Construct the top-half of the window."""
68
scrollwin = gtk.ScrolledWindow()
69
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
70
scrollwin.set_shadow_type(gtk.SHADOW_IN)
71
scrollwin.show()
72
73
self.treeview = gtk.TreeView()
74
self.treeview.set_rules_hint(True)
75
self.treeview.set_search_column(4)
76
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
77
self.treeview.connect("row-activated", self._treeview_row_activated_cb)
78
self.treeview.connect("button-release-event",
79
self._treeview_row_mouseclick)
80
scrollwin.add(self.treeview)
235
# FIXME: Make broken_line_length configurable
236
237
self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
238
239
self.treeview.connect('revision-selected',
240
self._treeselection_changed_cb)
241
self.treeview.connect('revision-activated',
242
self._tree_revision_activated)
243
244
self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
245
246
for col in ["revno", "date"]:
247
option = self.config.get_user_option(col + '-column-visible')
248
if option is not None:
249
self.treeview.set_property(col + '-column-visible', option == 'True')
250
251
self.treeview.set_property(col + '-column-visible', False)
81
252
self.treeview.show()
82
253
83
cell = CellRendererGraph()
84
column = gtk.TreeViewColumn()
85
column.set_resizable(True)
86
column.pack_start(cell, expand=False)
87
column.add_attribute(cell, "node", 1)
88
column.add_attribute(cell, "in-lines", 2)
89
column.add_attribute(cell, "out-lines", 3)
90
self.treeview.append_column(column)
91
92
cell = gtk.CellRendererText()
93
cell.set_property("width-chars", 40)
94
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
95
column = gtk.TreeViewColumn("Message")
96
column.set_resizable(True)
97
column.pack_start(cell, expand=True)
98
column.add_attribute(cell, "text", 4)
99
self.treeview.append_column(column)
100
101
cell = gtk.CellRendererText()
102
cell.set_property("width-chars", 40)
103
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
104
column = gtk.TreeViewColumn("Committer")
105
column.set_resizable(True)
106
column.pack_start(cell, expand=True)
107
column.add_attribute(cell, "text", 5)
108
self.treeview.append_column(column)
109
110
cell = gtk.CellRendererText()
111
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
112
column = gtk.TreeViewColumn("Date")
113
column.set_resizable(True)
114
column.pack_start(cell, expand=True)
115
column.add_attribute(cell, "text", 6)
116
self.treeview.append_column(column)
117
118
return scrollwin
254
align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
255
align.set_padding(5, 0, 0, 0)
256
align.add(self.treeview)
257
align.show()
258
259
return align
119
260
120
261
def construct_navigation(self):
121
262
"""Construct the navigation buttons."""
122
frame = gtk.Frame()
123
frame.set_shadow_type(gtk.SHADOW_OUT)
124
frame.show()
125
126
hbox = gtk.HBox(spacing=12)
127
frame.add(hbox)
128
hbox.show()
129
130
self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
131
self.back_button.set_relief(gtk.RELIEF_NONE)
132
self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
133
0, 0)
134
self.back_button.connect("clicked", self._back_clicked_cb)
135
hbox.pack_start(self.back_button, expand=False, fill=True)
136
self.back_button.show()
137
138
self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
139
self.fwd_button.set_relief(gtk.RELIEF_NONE)
140
self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
141
0, 0)
142
self.fwd_button.connect("clicked", self._fwd_clicked_cb)
143
hbox.pack_start(self.fwd_button, expand=False, fill=True)
144
self.fwd_button.show()
145
146
return frame
263
self.toolbar = gtk.Toolbar()
264
self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
265
266
self.prev_button = self.prev_rev_action.create_tool_item()
267
self.toolbar.insert(self.prev_button, -1)
268
269
self.next_button = self.next_rev_action.create_tool_item()
270
self.toolbar.insert(self.next_button, -1)
271
272
self.toolbar.insert(gtk.SeparatorToolItem(), -1)
273
274
refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
275
refresh_button.connect('clicked', self._refresh_clicked)
276
self.toolbar.insert(refresh_button, -1)
277
278
self.toolbar.show_all()
279
280
return self.toolbar
147
281
148
282
def construct_bottom(self):
149
283
"""Construct the bottom half of the window."""
150
from bzrlib.plugins.gtk.logview import LogView
151
self.logview = LogView()
284
from bzrlib.plugins.gtk.revisionview import RevisionView
285
self.revisionview = RevisionView(branch=self.branch)
152
286
(width, height) = self.get_size()
153
self.logview.set_size_request(width, int(height / 2.5))
154
self.logview.show()
155
self.logview.set_show_callback(self._show_clicked_cb)
156
self.logview.set_go_callback(self._go_clicked_cb)
157
return self.logview
158
159
def set_branch(self, branch, start, maxnum):
160
"""Set the branch and start position for this window.
161
162
Creates a new TreeModel and populates it with information about
163
the new branch before updating the window title and model of the
164
treeview itself.
165
"""
166
self.branch = branch
167
168
# [ revision, node, last_lines, lines, message, committer, timestamp ]
169
self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
170
gobject.TYPE_PYOBJECT,
171
gobject.TYPE_PYOBJECT,
172
gobject.TYPE_PYOBJECT,
173
str, str, str)
174
self.index = {}
175
index = 0
176
177
last_lines = []
178
(self.revisions, colours, self.children, self.parent_ids,
179
merge_sorted) = distances(branch, start)
180
for (index, (revision, node, lines)) in enumerate(graph(
181
self.revisions, colours, merge_sorted)):
182
# FIXME: at this point we should be able to show the graph order
183
# and lines with no message or commit data - and then incrementally
184
# fill the timestamp, committer etc data as desired.
185
message = revision.message.split("\n")[0]
186
if revision.committer is not None:
187
timestamp = format_date(revision.timestamp, revision.timezone)
188
else:
189
timestamp = None
190
self.model.append([revision, node, last_lines, lines,
191
message, revision.committer, timestamp])
192
self.index[revision] = index
193
last_lines = lines
194
if maxnum is not None and index > maxnum:
195
break
196
197
self.set_title(branch.nick + " - bzrk")
198
self.treeview.set_model(self.model)
199
200
def _treeview_cursor_cb(self, *args):
201
"""Callback for when the treeview cursor changes."""
202
(path, col) = self.treeview.get_cursor()
203
revision = self.model[path][0]
204
205
self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
206
self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
207
tags = []
208
if self.branch.supports_tags():
209
tagdict = self.branch.tags.get_reverse_tag_dict()
210
if tagdict.has_key(revision.revision_id):
211
tags = tagdict[revision.revision_id]
212
self.logview.set_revision(revision, tags)
287
self.revisionview.set_size_request(width, int(height / 2.5))
288
self.revisionview.show()
289
self.revisionview.set_show_callback(self._show_clicked_cb)
290
self.revisionview.connect('notify::revision', self._go_clicked_cb)
291
self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
292
return self.revisionview
293
294
def _tag_selected_cb(self, menuitem, revid):
295
self.treeview.set_revision_id(revid)
296
297
def _treeselection_changed_cb(self, selection, *args):
298
"""callback for when the treeview changes."""
299
revision = self.treeview.get_revision()
300
parents = self.treeview.get_parents()
301
children = self.treeview.get_children()
302
303
if revision and revision != NULL_REVISION:
304
prev_menu = gtk.Menu()
305
if len(parents) > 0:
306
self.prev_rev_action.set_sensitive(True)
307
for parent_id in parents:
308
if parent_id and parent_id != NULL_REVISION:
309
parent = self.branch.repository.get_revision(parent_id)
310
try:
311
str = ' (' + parent.properties['branch-nick'] + ')'
312
except KeyError:
313
str = ""
314
315
item = gtk.MenuItem(parent.message.split("\n")[0] + str)
316
item.connect('activate', self._set_revision_cb, parent_id)
317
prev_menu.add(item)
318
prev_menu.show_all()
319
else:
320
self.prev_rev_action.set_sensitive(False)
321
prev_menu.hide()
322
323
self.prev_button.set_menu(prev_menu)
324
325
next_menu = gtk.Menu()
326
if len(children) > 0:
327
self.next_rev_action.set_sensitive(True)
328
for child_id in children:
329
child = self.branch.repository.get_revision(child_id)
330
try:
331
str = ' (' + child.properties['branch-nick'] + ')'
332
except KeyError:
333
str = ""
334
335
item = gtk.MenuItem(child.message.split("\n")[0] + str)
336
item.connect('activate', self._set_revision_cb, child_id)
337
next_menu.add(item)
338
next_menu.show_all()
339
else:
340
self.next_rev_action.set_sensitive(False)
341
next_menu.hide()
342
343
self.next_button.set_menu(next_menu)
344
345
self.revisionview.set_revision(revision)
346
self.revisionview.set_children(children)
347
348
def _tree_revision_activated(self, widget, path, col):
349
# TODO: more than one parent
350
"""Callback for when a treeview row gets activated."""
351
revision = self.treeview.get_revision()
352
parents = self.treeview.get_parents()
353
354
if len(parents) == 0:
355
parent_id = None
356
else:
357
parent_id = parents[0]
358
359
self.show_diff(revision.revision_id, parent_id)
360
self.treeview.grab_focus()
361
213
362
214
363
def _back_clicked_cb(self, *args):
215
364
"""Callback for when the back button is clicked."""
216
(path, col) = self.treeview.get_cursor()
217
revision = self.model[path][0]
218
if not len(self.parent_ids[revision]):
219
return
220
221
for parent_id in self.parent_ids[revision]:
222
parent = self.revisions[parent_id]
223
if same_branch(revision, parent):
224
self.treeview.set_cursor(self.index[parent])
225
break
226
else:
227
next = self.revisions[self.parent_ids[revision][0]]
228
self.treeview.set_cursor(self.index[next])
229
self.treeview.grab_focus()
230
365
self.treeview.back()
366
231
367
def _fwd_clicked_cb(self, *args):
232
368
"""Callback for when the forward button is clicked."""
233
(path, col) = self.treeview.get_cursor()
234
revision = self.model[path][0]
235
if not len(self.children[revision]):
236
return
237
238
for child in self.children[revision]:
239
if same_branch(child, revision):
240
self.treeview.set_cursor(self.index[child])
241
break
242
else:
243
prev = list(self.children[revision])[0]
244
self.treeview.set_cursor(self.index[prev])
245
self.treeview.grab_focus()
246
247
def _go_clicked_cb(self, revid):
369
self.treeview.forward()
370
371
def _go_clicked_cb(self, w, p):
248
372
"""Callback for when the go button for a parent is clicked."""
249
self.treeview.set_cursor(self.index[self.revisions[revid]])
373
if self.revisionview.get_revision() is not None:
374
self.treeview.set_revision(self.revisionview.get_revision())
375
376
def _show_clicked_cb(self, revid, parentid):
377
"""Callback for when the show button for a parent is clicked."""
378
self.show_diff(revid, parentid)
250
379
self.treeview.grab_focus()
251
380
252
def show_diff(self, branch, revid, parentid):
381
def _set_revision_cb(self, w, revision_id):
382
self.treeview.set_revision_id(revision_id)
383
384
def _brokenlines_toggled_cb(self, button):
385
self.compact_view = button.get_active()
386
387
if self.compact_view:
388
option = 'yes'
389
else:
390
option = 'no'
391
392
self.config.set_user_option('viz-compact-view', option)
393
self.treeview.set_property('compact', self.compact_view)
394
self.treeview.refresh()
395
396
def _tag_revision_cb(self, w):
397
try:
398
self.treeview.set_sensitive(False)
399
dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
400
response = dialog.run()
401
if response != gtk.RESPONSE_NONE:
402
dialog.hide()
403
404
if response == gtk.RESPONSE_OK:
405
self.treeview.add_tag(dialog.tagname, dialog._revid)
406
407
dialog.destroy()
408
409
finally:
410
self.treeview.set_sensitive(True)
411
412
def _about_dialog_cb(self, w):
413
from bzrlib.plugins.gtk.about import AboutDialog
414
415
AboutDialog().run()
416
417
def _col_visibility_changed(self, col, property):
418
self.config.set_user_option(property + '-column-visible', col.get_active())
419
self.treeview.set_property(property + '-column-visible', col.get_active())
420
421
def _toolbar_visibility_changed(self, col):
422
if col.get_active():
423
self.toolbar.show()
424
else:
425
self.toolbar.hide()
426
427
def _show_about_cb(self, w):
428
dialog = AboutDialog()
429
dialog.connect('response', lambda d,r: d.destroy())
430
dialog.run()
431
432
def _refresh_clicked(self, w):
433
self.treeview.refresh()
434
435
def _update_tags(self):
436
menu = gtk.Menu()
437
438
if self.branch.supports_tags():
439
tags = self.branch.tags.get_tag_dict().items()
440
tags.sort()
441
tags.reverse()
442
for tag, revid in tags:
443
tag_image = gtk.Image()
444
tag_image.set_from_file(icon_path('tag-16.png'))
445
tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
446
tag_item.set_image(tag_image)
447
tag_item.connect('activate', self._tag_selected_cb, revid)
448
menu.add(tag_item)
449
self.go_menu_tags.set_submenu(menu)
450
451
self.go_menu_tags.set_sensitive(len(tags) != 0)
452
else:
453
self.go_menu_tags.set_sensitive(False)
454
455
self.go_menu_tags.show_all()
456
457
def show_diff(self, revid=None, parentid=None):
253
458
"""Open a new window to show a diff between the given revisions."""
254
459
from bzrlib.plugins.gtk.diff import DiffWindow
255
window = DiffWindow()
256
(parent_tree, rev_tree) = branch.repository.revision_trees([parentid,
257
revid])
258
description = revid + " - " + branch.nick
460
window = DiffWindow(parent=self)
461
462
if parentid is None:
463
parentid = NULL_REVISION
464
465
rev_tree = self.branch.repository.revision_tree(revid)
466
parent_tree = self.branch.repository.revision_tree(parentid)
467
468
description = revid + " - " + self.branch.nick
259
469
window.set_diff(description, rev_tree, parent_tree)
260
470
window.show()
261
471
262
def _show_clicked_cb(self, revid, parentid):
263
"""Callback for when the show button for a parent is clicked."""
264
self.show_diff(self.branch, revid, parentid)
265
self.treeview.grab_focus()
266
267
def _treeview_row_mouseclick(self, widget, event):
268
from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
269
if event.button == 3:
270
menu = RevisionPopupMenu(self.branch.repository,
271
[x.revision_id for x in self.selected_revisions()],
272
self.branch)
273
menu.popup(None, None, None, event.button, event.get_time())
274
275
def selected_revision(self, path):
276
return self.model[path][0]
277
278
def selected_revisions(self):
279
return [self.selected_revision(path) for path in \
280
self.treeview.get_selection().get_selected_rows()[1]]
281
282
def _treeview_row_activated_cb(self, widget, path, col):
283
# TODO: more than one parent
284
"""Callback for when a treeview row gets activated."""
285
revision = self.selected_revision(path)
286
if len(self.parent_ids[revision]) == 0:
287
# Ignore revisions without parent
288
return
289
parent_id = self.parent_ids[revision][0]
290
self.show_diff(self.branch, revision.revision_id, parent_id)
291
self.treeview.grab_focus()
472
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0