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