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 288
- compare with another revision
- download diff
- download tarball
- view history from revision 288
- Committer: Jelmer Vernooij
- Date: 2007-09-25 14:36:11 UTC
- Revision ID: jelmer@samba.org-20070925143611-oyjp9u8autpgdiih
Add check command to setup.py.
- files added:
- olive.glade
- files removed:
- branchview
- preferences
- files renamed:
- icons/bzr-icon-64.png => bzr-icon-64.png
- revisionview.py => logview.py
- preferences/__init__.py => preferences.py
- branchview/linegraph.py => viz/graph.py
- branchview/graphcell.py => viz/graphcell.py
- files modified:
- .bzrignore
added
removed
viz/branchwin.py
13
13
import gobject
14
14
import pango
15
15
16
from bzrlib.plugins.gtk import icon_path
17
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
18
from bzrlib.plugins.gtk.tags import AddTagDialog
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
21
from bzrlib.plugins.gtk.window import Window
22
23
from bzrlib.config import BranchConfig, GlobalConfig
24
from bzrlib.revision import Revision, NULL_REVISION
25
from bzrlib.trace import mutter
26
27
class BranchWindow(Window):
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):
28
23
"""Branch window.
29
24
30
25
This object represents and manages a single window containing information
31
26
for a particular branch.
32
27
"""
33
28
34
def __init__(self, branch, start_revs, maxnum, parent=None):
35
"""Create a new BranchWindow.
36
37
:param branch: Branch object for branch to show.
38
:param start_revs: Revision ids of top revisions.
39
:param maxnum: Maximum number of revisions to display,
40
None for no limit.
41
"""
42
43
Window.__init__(self, parent=parent)
29
def __init__(self, parent=None):
30
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
44
31
self.set_border_width(0)
45
46
self.branch = branch
47
self.start_revs = start_revs
48
self.maxnum = maxnum
49
self.config = GlobalConfig()
50
51
self._sizes = {} # window and widget sizes
52
53
if self.config.get_user_option('viz-compact-view') == 'yes':
54
self.compact_view = True
55
else:
56
self.compact_view = False
57
58
self.set_title(branch.nick + " - revision history")
59
60
# user-configured window size
61
size = self._load_size('viz-window-size')
62
if size:
63
width, height = size
64
else:
65
# Use three-quarters of the screen by default
66
screen = self.get_screen()
67
monitor = screen.get_monitor_geometry(0)
68
width = int(monitor.width * 0.75)
69
height = int(monitor.height * 0.75)
32
self.set_title("bzrk")
33
34
self._parent = parent
35
36
self.connect('key-press-event', self._on_key_pressed)
37
38
# Use three-quarters of the screen by default
39
screen = self.get_screen()
40
monitor = screen.get_monitor_geometry(0)
41
width = int(monitor.width * 0.75)
42
height = int(monitor.height * 0.75)
70
43
self.set_default_size(width, height)
71
self.set_size_request(width/3, height/3)
72
self.connect("size-allocate", self._on_size_allocate, 'viz-window-size')
73
44
74
45
# FIXME AndyFitz!
75
46
icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
76
47
self.set_icon(icon)
77
48
78
gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
79
gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
80
gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
81
82
49
self.accel_group = gtk.AccelGroup()
83
50
self.add_accel_group(self.accel_group)
84
51
85
gtk.Action.set_tool_item_type(gtk.MenuToolButton)
86
87
self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
88
self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
89
self.prev_rev_action.set_accel_group(self.accel_group)
90
self.prev_rev_action.connect("activate", self._back_clicked_cb)
91
self.prev_rev_action.connect_accelerator()
92
93
self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
94
self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
95
self.next_rev_action.set_accel_group(self.accel_group)
96
self.next_rev_action.connect("activate", self._fwd_clicked_cb)
97
self.next_rev_action.connect_accelerator()
98
99
self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
100
self.refresh_action.set_accel_path("<viz>/View/Refresh")
101
self.refresh_action.set_accel_group(self.accel_group)
102
self.refresh_action.connect("activate", self._refresh_clicked)
103
self.refresh_action.connect_accelerator()
104
105
52
self.construct()
106
53
107
def set_revision(self, revid):
108
self.treeview.set_revision_id(revid)
109
110
54
def construct(self):
111
55
"""Construct the window contents."""
112
56
vbox = gtk.VBox(spacing=0)
113
57
self.add(vbox)
114
58
115
self.paned = gtk.VPaned()
116
self.paned.pack1(self.construct_top(), resize=False, shrink=True)
117
self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
118
self.paned.show()
119
120
nav = self.construct_navigation()
121
menubar = self.construct_menubar()
122
vbox.pack_start(menubar, expand=False, fill=True)
123
vbox.pack_start(nav, expand=False, fill=True)
124
125
vbox.pack_start(self.paned, expand=True, fill=True)
126
vbox.set_focus_child(self.paned)
59
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
60
61
paned = gtk.VPaned()
62
paned.pack1(self.construct_top(), resize=True, shrink=False)
63
paned.pack2(self.construct_bottom(), resize=False, shrink=True)
64
paned.show()
65
vbox.pack_start(paned, expand=True, fill=True)
66
vbox.set_focus_child(paned)
127
67
128
68
vbox.show()
129
130
def construct_menubar(self):
131
menubar = gtk.MenuBar()
132
133
file_menu = gtk.Menu()
134
file_menuitem = gtk.MenuItem("_File")
135
file_menuitem.set_submenu(file_menu)
136
137
file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
138
file_menu_close.connect('activate', lambda x: self.destroy())
139
140
file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
141
file_menu_quit.connect('activate', lambda x: gtk.main_quit())
142
143
if self._parent is not None:
144
file_menu.add(file_menu_close)
145
file_menu.add(file_menu_quit)
146
147
edit_menu = gtk.Menu()
148
edit_menuitem = gtk.MenuItem("_Edit")
149
edit_menuitem.set_submenu(edit_menu)
150
151
edit_menu_branchopts = gtk.MenuItem("Branch Settings")
152
edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
153
154
edit_menu_globopts = gtk.MenuItem("Global Settings")
155
edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
156
157
edit_menu.add(edit_menu_branchopts)
158
edit_menu.add(edit_menu_globopts)
159
160
view_menu = gtk.Menu()
161
view_menuitem = gtk.MenuItem("_View")
162
view_menuitem.set_submenu(view_menu)
163
164
view_menu_refresh = self.refresh_action.create_menu_item()
165
view_menu_refresh.connect('activate', self._refresh_clicked)
166
167
view_menu.add(view_menu_refresh)
168
view_menu.add(gtk.SeparatorMenuItem())
169
170
view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
171
view_menu_toolbar.set_active(True)
172
if self.config.get_user_option('viz-toolbar-visible') == 'False':
173
view_menu_toolbar.set_active(False)
174
self.toolbar.hide()
175
view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
176
177
view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
178
view_menu_compact.set_active(self.compact_view)
179
view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
180
181
view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
182
view_menu_diffs.set_active(False)
183
if self.config.get_user_option('viz-show-diffs') == 'True':
184
view_menu_diffs.set_active(True)
185
view_menu_diffs.connect('toggled', self._diff_visibility_changed)
186
187
view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
188
view_menu_wide_diffs.set_active(False)
189
if self.config.get_user_option('viz-wide-diffs') == 'True':
190
view_menu_wide_diffs.set_active(True)
191
view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
192
193
view_menu_wrap_diffs = gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
194
view_menu_wrap_diffs.set_active(False)
195
if self.config.get_user_option('viz-wrap-diffs') == 'True':
196
view_menu_wrap_diffs.set_active(True)
197
view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
198
199
view_menu.add(view_menu_toolbar)
200
view_menu.add(view_menu_compact)
201
view_menu.add(gtk.SeparatorMenuItem())
202
view_menu.add(view_menu_diffs)
203
view_menu.add(view_menu_wide_diffs)
204
view_menu.add(view_menu_wrap_diffs)
205
view_menu.add(gtk.SeparatorMenuItem())
206
207
self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
208
self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
209
210
# Revision numbers are pointless if there are multiple branches
211
if len(self.start_revs) > 1:
212
self.mnu_show_revno_column.set_sensitive(False)
213
self.treeview.set_property('revno-column-visible', False)
214
215
for (col, name) in [(self.mnu_show_revno_column, "revno"),
216
(self.mnu_show_date_column, "date")]:
217
col.set_active(self.treeview.get_property(name + "-column-visible"))
218
col.connect('toggled', self._col_visibility_changed, name)
219
view_menu.add(col)
220
221
go_menu = gtk.Menu()
222
go_menu.set_accel_group(self.accel_group)
223
go_menuitem = gtk.MenuItem("_Go")
224
go_menuitem.set_submenu(go_menu)
225
226
go_menu_next = self.next_rev_action.create_menu_item()
227
go_menu_prev = self.prev_rev_action.create_menu_item()
228
229
tag_image = gtk.Image()
230
tag_image.set_from_file(icon_path("tag-16.png"))
231
self.go_menu_tags = gtk.ImageMenuItem("_Tags")
232
self.go_menu_tags.set_image(tag_image)
233
self._update_tags()
234
235
go_menu.add(go_menu_next)
236
go_menu.add(go_menu_prev)
237
go_menu.add(gtk.SeparatorMenuItem())
238
go_menu.add(self.go_menu_tags)
239
240
self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
241
revision_menuitem = gtk.MenuItem("_Revision")
242
revision_menuitem.set_submenu(self.revision_menu)
243
244
branch_menu = gtk.Menu()
245
branch_menuitem = gtk.MenuItem("_Branch")
246
branch_menuitem.set_submenu(branch_menu)
247
248
branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
249
branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
250
251
try:
252
from bzrlib.plugins import search
253
except ImportError:
254
mutter("Didn't find search plugin")
255
else:
256
branch_menu.add(gtk.SeparatorMenuItem())
257
258
branch_index_menuitem = gtk.MenuItem("_Index")
259
branch_index_menuitem.connect('activate', self._branch_index_cb)
260
branch_menu.add(branch_index_menuitem)
261
262
branch_search_menuitem = gtk.MenuItem("_Search")
263
branch_search_menuitem.connect('activate', self._branch_search_cb)
264
branch_menu.add(branch_search_menuitem)
265
266
help_menu = gtk.Menu()
267
help_menuitem = gtk.MenuItem("_Help")
268
help_menuitem.set_submenu(help_menu)
269
270
help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
271
help_about_menuitem.connect('activate', self._about_dialog_cb)
272
273
help_menu.add(help_about_menuitem)
274
275
menubar.add(file_menuitem)
276
menubar.add(edit_menuitem)
277
menubar.add(view_menuitem)
278
menubar.add(go_menuitem)
279
menubar.add(revision_menuitem)
280
menubar.add(branch_menuitem)
281
menubar.add(help_menuitem)
282
menubar.show_all()
283
284
return menubar
285
69
286
70
def construct_top(self):
287
71
"""Construct the top-half of the window."""
288
# FIXME: Make broken_line_length configurable
289
290
self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
291
292
self.treeview.connect('revision-selected',
293
self._treeselection_changed_cb)
294
self.treeview.connect('revision-activated',
295
self._tree_revision_activated)
296
297
self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
298
299
for col in ["revno", "date"]:
300
option = self.config.get_user_option(col + '-column-visible')
301
if option is not None:
302
self.treeview.set_property(col + '-column-visible', option == 'True')
303
else:
304
self.treeview.set_property(col + '-column-visible', False)
305
72
scrollwin = gtk.ScrolledWindow()
73
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
74
scrollwin.set_shadow_type(gtk.SHADOW_IN)
75
scrollwin.show()
76
77
self.treeview = gtk.TreeView()
78
self.treeview.set_rules_hint(True)
79
self.treeview.set_search_column(4)
80
self.treeview.get_selection().connect("changed", self._treeselection_changed_cb)
81
self.treeview.connect("row-activated", self._treeview_row_activated_cb)
82
self.treeview.connect("button-release-event",
83
self._treeview_row_mouseclick)
84
scrollwin.add(self.treeview)
306
85
self.treeview.show()
307
86
308
align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
309
align.set_padding(5, 0, 0, 0)
310
align.add(self.treeview)
311
# user-configured size
312
size = self._load_size('viz-graph-size')
313
if size:
314
width, height = size
315
align.set_size_request(width, height)
316
else:
317
(width, height) = self.get_size()
318
align.set_size_request(width, int(height / 2.5))
319
align.connect('size-allocate', self._on_size_allocate, 'viz-graph-size')
320
align.show()
321
322
return align
87
cell = CellRendererGraph()
88
column = gtk.TreeViewColumn()
89
column.set_resizable(True)
90
column.pack_start(cell, expand=False)
91
column.add_attribute(cell, "node", 1)
92
column.add_attribute(cell, "in-lines", 2)
93
column.add_attribute(cell, "out-lines", 3)
94
self.treeview.append_column(column)
95
96
cell = gtk.CellRendererText()
97
cell.set_property("width-chars", 40)
98
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
99
column = gtk.TreeViewColumn("Message")
100
column.set_resizable(True)
101
column.pack_start(cell, expand=True)
102
column.add_attribute(cell, "text", 4)
103
self.treeview.append_column(column)
104
105
cell = gtk.CellRendererText()
106
cell.set_property("width-chars", 40)
107
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
108
column = gtk.TreeViewColumn("Committer")
109
column.set_resizable(True)
110
column.pack_start(cell, expand=True)
111
column.add_attribute(cell, "text", 5)
112
self.treeview.append_column(column)
113
114
cell = gtk.CellRendererText()
115
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
116
column = gtk.TreeViewColumn("Date")
117
column.set_resizable(True)
118
column.pack_start(cell, expand=True)
119
column.add_attribute(cell, "text", 6)
120
self.treeview.append_column(column)
121
122
return scrollwin
323
123
324
124
def construct_navigation(self):
325
125
"""Construct the navigation buttons."""
326
self.toolbar = gtk.Toolbar()
327
self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
328
329
self.prev_button = self.prev_rev_action.create_tool_item()
330
self.toolbar.insert(self.prev_button, -1)
331
332
self.next_button = self.next_rev_action.create_tool_item()
333
self.toolbar.insert(self.next_button, -1)
334
335
self.toolbar.insert(gtk.SeparatorToolItem(), -1)
336
337
refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
338
refresh_button.connect('clicked', self._refresh_clicked)
339
self.toolbar.insert(refresh_button, -1)
340
341
self.toolbar.show_all()
342
343
return self.toolbar
126
frame = gtk.Frame()
127
frame.set_shadow_type(gtk.SHADOW_OUT)
128
frame.show()
129
130
hbox = gtk.HBox(spacing=12)
131
frame.add(hbox)
132
hbox.show()
133
134
self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
135
self.back_button.set_relief(gtk.RELIEF_NONE)
136
self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
137
0, 0)
138
self.back_button.connect("clicked", self._back_clicked_cb)
139
hbox.pack_start(self.back_button, expand=False, fill=True)
140
self.back_button.show()
141
142
self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
143
self.fwd_button.set_relief(gtk.RELIEF_NONE)
144
self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
145
0, 0)
146
self.fwd_button.connect("clicked", self._fwd_clicked_cb)
147
hbox.pack_start(self.fwd_button, expand=False, fill=True)
148
self.fwd_button.show()
149
150
return frame
344
151
345
152
def construct_bottom(self):
346
153
"""Construct the bottom half of the window."""
347
if self.config.get_user_option('viz-wide-diffs') == 'True':
348
self.diff_paned = gtk.VPaned()
349
else:
350
self.diff_paned = gtk.HPaned()
154
from bzrlib.plugins.gtk.logview import LogView
155
self.logview = LogView()
351
156
(width, height) = self.get_size()
352
self.diff_paned.set_size_request(20, 20) # shrinkable
353
354
from bzrlib.plugins.gtk.revisionview import RevisionView
355
self.revisionview = RevisionView(branch=self.branch)
356
self.revisionview.set_size_request(width/3, int(height / 2.5))
357
# user-configured size
358
size = self._load_size('viz-revisionview-size')
359
if size:
360
width, height = size
361
self.revisionview.set_size_request(width, height)
362
self.revisionview.connect('size-allocate', self._on_size_allocate, 'viz-revisionview-size')
363
self.revisionview.show()
364
self.revisionview.set_show_callback(self._show_clicked_cb)
365
self.revisionview.connect('notify::revision', self._go_clicked_cb)
366
self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
367
self.diff_paned.pack1(self.revisionview)
368
369
from bzrlib.plugins.gtk.diff import DiffWidget
370
self.diff = DiffWidget()
371
self.diff_paned.pack2(self.diff)
372
373
self.diff_paned.show_all()
374
if self.config.get_user_option('viz-show-diffs') != 'True':
375
self.diff.hide()
376
377
return self.diff_paned
378
379
def _tag_selected_cb(self, menuitem, revid):
380
self.treeview.set_revision_id(revid)
157
self.logview.set_size_request(width, int(height / 2.5))
158
self.logview.show()
159
self.logview.set_show_callback(self._show_clicked_cb)
160
self.logview.set_go_callback(self._go_clicked_cb)
161
return self.logview
162
163
def set_branch(self, branch, start, maxnum):
164
"""Set the branch and start position for this window.
165
166
Creates a new TreeModel and populates it with information about
167
the new branch before updating the window title and model of the
168
treeview itself.
169
"""
170
self.branch = branch
171
172
# [ revision, node, last_lines, lines, message, committer, timestamp ]
173
self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
174
gobject.TYPE_PYOBJECT,
175
gobject.TYPE_PYOBJECT,
176
gobject.TYPE_PYOBJECT,
177
str, str, str)
178
self.index = {}
179
self.set_title(branch.nick + " - bzrk")
180
gobject.idle_add(self.populate_model, start, maxnum)
181
182
def populate_model(self, start, maxnum):
183
index = 0
184
185
last_lines = []
186
(self.revisions, colours, self.children, self.parent_ids,
187
merge_sorted) = distances(self.branch.repository, start,
188
maxnum=maxnum)
189
for (index, (revision, node, lines)) in enumerate(graph(
190
self.revisions, colours, merge_sorted)):
191
# FIXME: at this point we should be able to show the graph order
192
# and lines with no message or commit data - and then incrementally
193
# fill the timestamp, committer etc data as desired.
194
message = revision.message.split("\n")[0]
195
if revision.committer is not None:
196
timestamp = format_date(revision.timestamp, revision.timezone)
197
else:
198
timestamp = None
199
self.model.append([revision, node, last_lines, lines,
200
message, revision.committer, timestamp])
201
self.index[revision] = index
202
last_lines = lines
203
if maxnum is not None and index > maxnum:
204
break
205
self.treeview.set_model(self.model)
206
self.treeview.get_selection().select_path(0)
207
return False
208
209
def _on_key_pressed(self, widget, event):
210
""" Key press event handler. """
211
keyname = gtk.gdk.keyval_name(event.keyval)
212
func = getattr(self, '_on_key_press_' + keyname, None)
213
if func:
214
return func(event)
215
216
def _on_key_press_w(self, event):
217
if event.state & gtk.gdk.CONTROL_MASK:
218
self.destroy()
219
if self._parent is None:
220
gtk.main_quit()
221
222
def _on_key_press_q(self, event):
223
if event.state & gtk.gdk.CONTROL_MASK:
224
gtk.main_quit()
381
225
382
226
def _treeselection_changed_cb(self, selection, *args):
383
"""callback for when the treeview changes."""
384
revision = self.treeview.get_revision()
385
parents = self.treeview.get_parents()
386
children = self.treeview.get_children()
387
388
self.revision_menu.set_revision_ids([revision.revision_id])
389
390
if revision and revision != NULL_REVISION:
391
prev_menu = gtk.Menu()
392
if len(parents) > 0:
393
self.prev_rev_action.set_sensitive(True)
394
for parent_id in parents:
395
if parent_id and parent_id != NULL_REVISION:
396
parent = self.branch.repository.get_revision(parent_id)
397
try:
398
str = ' (' + parent.properties['branch-nick'] + ')'
399
except KeyError:
400
str = ""
401
402
item = gtk.MenuItem(parent.message.split("\n")[0] + str)
403
item.connect('activate', self._set_revision_cb, parent_id)
404
prev_menu.add(item)
405
prev_menu.show_all()
406
else:
407
self.prev_rev_action.set_sensitive(False)
408
prev_menu.hide()
409
410
self.prev_button.set_menu(prev_menu)
411
412
next_menu = gtk.Menu()
413
if len(children) > 0:
414
self.next_rev_action.set_sensitive(True)
415
for child_id in children:
416
child = self.branch.repository.get_revision(child_id)
417
try:
418
str = ' (' + child.properties['branch-nick'] + ')'
419
except KeyError:
420
str = ""
421
422
item = gtk.MenuItem(child.message.split("\n")[0] + str)
423
item.connect('activate', self._set_revision_cb, child_id)
424
next_menu.add(item)
425
next_menu.show_all()
426
else:
427
self.next_rev_action.set_sensitive(False)
428
next_menu.hide()
429
430
self.next_button.set_menu(next_menu)
431
432
self.revisionview.set_revision(revision)
433
self.revisionview.set_children(children)
434
self.update_diff_panel(revision, parents)
435
436
def _tree_revision_activated(self, widget, path, col):
437
# TODO: more than one parent
438
"""Callback for when a treeview row gets activated."""
439
revision = self.treeview.get_revision()
440
parents = self.treeview.get_parents()
441
442
if len(parents) == 0:
443
parent_id = None
444
else:
445
parent_id = parents[0]
446
447
self.show_diff(revision.revision_id, parent_id)
448
self.treeview.grab_focus()
449
227
"""Callback for when the treeview changes."""
228
(model, selected_rows) = selection.get_selected_rows()
229
if len(selected_rows) > 0:
230
revision = self.model[selected_rows[0]][0]
231
232
self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
233
self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
234
tags = []
235
if self.branch.supports_tags():
236
tagdict = self.branch.tags.get_reverse_tag_dict()
237
if tagdict.has_key(revision.revision_id):
238
tags = tagdict[revision.revision_id]
239
self.logview.set_revision(revision, tags)
240
450
241
def _back_clicked_cb(self, *args):
451
242
"""Callback for when the back button is clicked."""
452
self.treeview.back()
453
243
(path, col) = self.treeview.get_cursor()
244
revision = self.model[path][0]
245
if not len(self.parent_ids[revision]):
246
return
247
248
for parent_id in self.parent_ids[revision]:
249
parent = self.revisions[parent_id]
250
if same_branch(revision, parent):
251
self.treeview.set_cursor(self.index[parent])
252
break
253
else:
254
next = self.revisions[self.parent_ids[revision][0]]
255
self.treeview.set_cursor(self.index[next])
256
self.treeview.grab_focus()
257
454
258
def _fwd_clicked_cb(self, *args):
455
259
"""Callback for when the forward button is clicked."""
456
self.treeview.forward()
457
458
def _go_clicked_cb(self, w, p):
260
(path, col) = self.treeview.get_cursor()
261
revision = self.model[path][0]
262
if not len(self.children[revision]):
263
return
264
265
for child in self.children[revision]:
266
if same_branch(child, revision):
267
self.treeview.set_cursor(self.index[child])
268
break
269
else:
270
prev = list(self.children[revision])[0]
271
self.treeview.set_cursor(self.index[prev])
272
self.treeview.grab_focus()
273
274
def _go_clicked_cb(self, revid):
459
275
"""Callback for when the go button for a parent is clicked."""
460
if self.revisionview.get_revision() is not None:
461
self.treeview.set_revision(self.revisionview.get_revision())
462
463
def _show_clicked_cb(self, revid, parentid):
464
"""Callback for when the show button for a parent is clicked."""
465
self.show_diff(revid, parentid)
276
self.treeview.set_cursor(self.index[self.revisions[revid]])
466
277
self.treeview.grab_focus()
467
278
468
def _set_revision_cb(self, w, revision_id):
469
self.treeview.set_revision_id(revision_id)
470
471
def _brokenlines_toggled_cb(self, button):
472
self.compact_view = button.get_active()
473
474
if self.compact_view:
475
option = 'yes'
476
else:
477
option = 'no'
478
479
self.config.set_user_option('viz-compact-view', option)
480
self.treeview.set_property('compact', self.compact_view)
481
self.treeview.refresh()
482
483
def _branch_index_cb(self, w):
484
from bzrlib.plugins.search import index as _mod_index
485
_mod_index.index_url(self.branch.base)
486
487
def _branch_search_cb(self, w):
488
from bzrlib.plugins.search import index as _mod_index
489
from bzrlib.plugins.gtk.search import SearchDialog
490
from bzrlib.plugins.search import errors as search_errors
491
492
try:
493
index = _mod_index.open_index_url(self.branch.base)
494
except search_errors.NoSearchIndex:
495
dialog = gtk.MessageDialog(self, type=gtk.MESSAGE_QUESTION,
496
buttons=gtk.BUTTONS_OK_CANCEL,
497
message_format="This branch has not been indexed yet. "
498
"Index now?")
499
if dialog.run() == gtk.RESPONSE_OK:
500
dialog.destroy()
501
index = _mod_index.index_url(self.branch.base)
502
else:
503
dialog.destroy()
504
return
505
506
dialog = SearchDialog(index)
507
508
if dialog.run() == gtk.RESPONSE_OK:
509
self.set_revision(dialog.get_revision())
510
511
dialog.destroy()
512
513
def _about_dialog_cb(self, w):
514
from bzrlib.plugins.gtk.about import AboutDialog
515
516
AboutDialog().run()
517
518
def _col_visibility_changed(self, col, property):
519
self.config.set_user_option(property + '-column-visible', col.get_active())
520
self.treeview.set_property(property + '-column-visible', col.get_active())
521
522
def _toolbar_visibility_changed(self, col):
523
if col.get_active():
524
self.toolbar.show()
525
else:
526
self.toolbar.hide()
527
self.config.set_user_option('viz-toolbar-visible', col.get_active())
528
529
def _make_diff_nonzero_size(self):
530
"""make sure the diff isn't zero-width or zero-height"""
531
alloc = self.diff.get_allocation()
532
if (alloc.width < 10) or (alloc.height < 10):
533
width, height = self.get_size()
534
self.revisionview.set_size_request(width/3, int(height / 2.5))
535
536
def _diff_visibility_changed(self, col):
537
"""Hide or show the diff panel."""
538
if col.get_active():
539
self.diff.show()
540
self._make_diff_nonzero_size()
541
else:
542
self.diff.hide()
543
self.config.set_user_option('viz-show-diffs', str(col.get_active()))
544
self.update_diff_panel()
545
546
def _diff_placement_changed(self, col):
547
"""Toggle the diff panel's position."""
548
self.config.set_user_option('viz-wide-diffs', str(col.get_active()))
549
550
old = self.paned.get_child2()
551
self.paned.remove(old)
552
self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
553
self._make_diff_nonzero_size()
554
555
self.treeview.emit('revision-selected')
556
557
def _diff_wrap_changed(self, widget):
558
"""Toggle word wrap in the diff widget."""
559
self.config.set_user_option('viz-wrap-diffs', widget.get_active())
560
self.diff._on_wraplines_toggled(widget)
561
562
def _show_about_cb(self, w):
563
dialog = AboutDialog()
564
dialog.connect('response', lambda d,r: d.destroy())
565
dialog.run()
566
567
def _refresh_clicked(self, w):
568
self.treeview.refresh()
569
570
def _update_tags(self):
571
menu = gtk.Menu()
572
573
if self.branch.supports_tags():
574
tags = self.branch.tags.get_tag_dict().items()
575
tags.sort()
576
tags.reverse()
577
for tag, revid in tags:
578
tag_image = gtk.Image()
579
tag_image.set_from_file(icon_path('tag-16.png'))
580
tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
581
tag_item.set_image(tag_image)
582
tag_item.connect('activate', self._tag_selected_cb, revid)
583
menu.add(tag_item)
584
self.go_menu_tags.set_submenu(menu)
585
586
self.go_menu_tags.set_sensitive(len(tags) != 0)
587
else:
588
self.go_menu_tags.set_sensitive(False)
589
590
self.go_menu_tags.show_all()
591
592
def _load_size(self, name):
593
"""Read and parse 'name' from self.config.
594
The value is a string, formatted as WIDTHxHEIGHT
595
Returns None, or (width, height)
596
"""
597
size = self.config.get_user_option(name)
598
if size:
599
width, height = [int(num) for num in size.split('x')]
600
# avoid writing config every time we start
601
self._sizes[name] = (width, height)
602
return width, height
603
return None
604
605
def _on_size_allocate(self, widget, allocation, name):
606
"""When window has been resized, save the new size."""
607
width, height = 0, 0
608
if name in self._sizes:
609
width, height = self._sizes[name]
610
611
size_changed = (width != allocation.width) or \
612
(height != allocation.height)
613
614
if size_changed:
615
width, height = allocation.width, allocation.height
616
self._sizes[name] = (width, height)
617
value = '%sx%s' % (width, height)
618
self.config.set_user_option(name, value)
619
620
def show_diff(self, revid=None, parentid=None):
279
def show_diff(self, branch, revid, parentid):
621
280
"""Open a new window to show a diff between the given revisions."""
622
281
from bzrlib.plugins.gtk.diff import DiffWindow
623
window = DiffWindow(parent=self)
624
625
if parentid is None:
626
parentid = NULL_REVISION
627
628
rev_tree = self.branch.repository.revision_tree(revid)
629
parent_tree = self.branch.repository.revision_tree(parentid)
630
631
description = revid + " - " + self.branch.nick
282
window = DiffWindow()
283
(parent_tree, rev_tree) = branch.repository.revision_trees([parentid,
284
revid])
285
description = revid + " - " + branch.nick
632
286
window.set_diff(description, rev_tree, parent_tree)
633
287
window.show()
634
288
635
def update_diff_panel(self, revision=None, parents=None):
636
"""Show the current revision in the diff panel."""
637
if self.config.get_user_option('viz-show-diffs') != 'True':
638
return
639
640
if not revision: # default to selected row
641
revision = self.treeview.get_revision()
642
if (not revision) or (revision == NULL_REVISION):
643
return
644
645
if not parents: # default to selected row's parents
646
parents = self.treeview.get_parents()
647
if len(parents) == 0:
648
parent_id = None
649
else:
650
parent_id = parents[0]
651
652
rev_tree = self.branch.repository.revision_tree(revision.revision_id)
653
parent_tree = self.branch.repository.revision_tree(parent_id)
654
655
self.diff.set_diff(rev_tree, parent_tree)
656
if self.config.get_user_option('viz-wrap-diffs') == 'True':
657
self.diff._on_wraplines_toggled(wrap=True)
658
self.diff.show_all()
289
def _show_clicked_cb(self, revid, parentid):
290
"""Callback for when the show button for a parent is clicked."""
291
self.show_diff(self.branch, revid, parentid)
292
self.treeview.grab_focus()
293
294
def _treeview_row_mouseclick(self, widget, event):
295
from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
296
if event.button == 3:
297
menu = RevisionPopupMenu(self.branch.repository,
298
[x.revision_id for x in self.selected_revisions()],
299
self.branch)
300
menu.popup(None, None, None, event.button, event.get_time())
301
302
def selected_revision(self, path):
303
return self.model[path][0]
304
305
def selected_revisions(self):
306
return [self.selected_revision(path) for path in \
307
self.treeview.get_selection().get_selected_rows()[1]]
308
309
def _treeview_row_activated_cb(self, widget, path, col):
310
# TODO: more than one parent
311
"""Callback for when a treeview row gets activated."""
312
revision = self.selected_revision(path)
313
if len(self.parent_ids[revision]) == 0:
314
# Ignore revisions without parent
315
return
316
parent_id = self.parent_ids[revision][0]
317
self.show_diff(self.branch, revision.revision_id, parent_id)
318
self.treeview.grab_focus()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0