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