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 85
- compare with another revision
- download diff
- download tarball
- view history from revision 85
- Committer: Jelmer Vernooij
- Date: 2006-09-30 10:21:43 UTC
- Revision ID: jelmer@samba.org-20060930102143-c0ef64d6ca860c21
Merge some files from Olive and bzr-gtk.
- files added:
- NEWS
- debian
- files removed:
- HACKING
- branchview
- preferences
- tests
- files renamed:
- revisionview.py => annotate/logview.py
- branch.py => olive/branch.py
- checkout.py => olive/checkout.py
- commit.py => olive/commit.py
- dialog.py => olive/dialog.py
- push.py => olive/push.py
- status.py => olive/status.py
- ui.py => olive/ui.py
- icons/oliveicon2.png => oliveicon2.png
- diff.py => viz/diffwin.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.window import Window
17
from bzrlib.plugins.gtk import icon_path
18
from bzrlib.plugins.gtk.tags import AddTagDialog
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
21
22
from bzrlib.config import BranchConfig, GlobalConfig
23
from bzrlib.revision import Revision, NULL_REVISION
24
from bzrlib.trace import mutter
25
26
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):
27
23
"""Branch window.
28
24
29
25
This object represents and manages a single window containing information
30
26
for a particular branch.
31
27
"""
32
28
33
def __init__(self, branch, start_revs, maxnum, parent=None):
34
"""Create a new BranchWindow.
35
36
:param branch: Branch object for branch to show.
37
:param start_revs: Revision ids of top revisions.
38
:param maxnum: Maximum number of revisions to display,
39
None for no limit.
40
"""
41
42
Window.__init__(self, parent=parent)
29
def __init__(self, app=None):
30
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
43
31
self.set_border_width(0)
44
45
self.branch = branch
46
self.start_revs = start_revs
47
self.maxnum = maxnum
48
self.config = GlobalConfig()
49
50
if self.config.get_user_option('viz-compact-view') == 'yes':
51
self.compact_view = True
52
else:
53
self.compact_view = False
54
55
self.set_title(branch.nick + " - revision history")
32
self.set_title("bzrk")
33
34
self.app = app
56
35
57
36
# Use three-quarters of the screen by default
58
37
screen = self.get_screen()
65
44
icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
66
45
self.set_icon(icon)
67
46
68
gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
69
gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
70
gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
71
72
47
self.accel_group = gtk.AccelGroup()
73
48
self.add_accel_group(self.accel_group)
74
49
75
gtk.Action.set_tool_item_type(gtk.MenuToolButton)
76
77
self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
78
self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
79
self.prev_rev_action.set_accel_group(self.accel_group)
80
self.prev_rev_action.connect("activate", self._back_clicked_cb)
81
self.prev_rev_action.connect_accelerator()
82
83
self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
84
self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
85
self.next_rev_action.set_accel_group(self.accel_group)
86
self.next_rev_action.connect("activate", self._fwd_clicked_cb)
87
self.next_rev_action.connect_accelerator()
88
89
self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
90
self.refresh_action.set_accel_path("<viz>/View/Refresh")
91
self.refresh_action.set_accel_group(self.accel_group)
92
self.refresh_action.connect("activate", self._refresh_clicked)
93
self.refresh_action.connect_accelerator()
94
95
50
self.construct()
96
51
97
def set_revision(self, revid):
98
self.treeview.set_revision_id(revid)
99
100
52
def construct(self):
101
53
"""Construct the window contents."""
102
54
vbox = gtk.VBox(spacing=0)
103
55
self.add(vbox)
104
56
105
self.paned = gtk.VPaned()
106
self.paned.pack1(self.construct_top(), resize=True, shrink=False)
107
self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
108
self.paned.show()
109
110
vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
111
57
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
112
113
vbox.pack_start(self.paned, expand=True, fill=True)
114
vbox.set_focus_child(self.paned)
58
59
paned = gtk.VPaned()
60
paned.pack1(self.construct_top(), resize=True, shrink=False)
61
paned.pack2(self.construct_bottom(), resize=False, shrink=True)
62
paned.show()
63
vbox.pack_start(paned, expand=True, fill=True)
64
vbox.set_focus_child(paned)
115
65
116
66
vbox.show()
117
67
118
def construct_menubar(self):
119
menubar = gtk.MenuBar()
120
121
file_menu = gtk.Menu()
122
file_menuitem = gtk.MenuItem("_File")
123
file_menuitem.set_submenu(file_menu)
124
125
file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
126
file_menu_close.connect('activate', lambda x: self.destroy())
127
128
file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
129
file_menu_quit.connect('activate', lambda x: gtk.main_quit())
130
131
if self._parent is not None:
132
file_menu.add(file_menu_close)
133
file_menu.add(file_menu_quit)
134
135
edit_menu = gtk.Menu()
136
edit_menuitem = gtk.MenuItem("_Edit")
137
edit_menuitem.set_submenu(edit_menu)
138
139
edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
140
141
edit_menu_branchopts = gtk.MenuItem("Branch Settings")
142
edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
143
144
edit_menu_globopts = gtk.MenuItem("Global Settings")
145
edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
146
147
edit_menu.add(edit_menu_find)
148
edit_menu.add(edit_menu_branchopts)
149
edit_menu.add(edit_menu_globopts)
150
151
view_menu = gtk.Menu()
152
view_menuitem = gtk.MenuItem("_View")
153
view_menuitem.set_submenu(view_menu)
154
155
view_menu_refresh = self.refresh_action.create_menu_item()
156
view_menu_refresh.connect('activate', self._refresh_clicked)
157
158
view_menu.add(view_menu_refresh)
159
view_menu.add(gtk.SeparatorMenuItem())
160
161
view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
162
view_menu_toolbar.set_active(True)
163
view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
164
165
view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
166
view_menu_compact.set_active(self.compact_view)
167
view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
168
169
view_menu.add(view_menu_toolbar)
170
view_menu.add(view_menu_compact)
171
view_menu.add(gtk.SeparatorMenuItem())
172
173
self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
174
self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
175
176
# Revision numbers are pointless if there are multiple branches
177
if len(self.start_revs) > 1:
178
self.mnu_show_revno_column.set_sensitive(False)
179
self.treeview.set_property('revno-column-visible', False)
180
181
for (col, name) in [(self.mnu_show_revno_column, "revno"),
182
(self.mnu_show_date_column, "date")]:
183
col.set_active(self.treeview.get_property(name + "-column-visible"))
184
col.connect('toggled', self._col_visibility_changed, name)
185
view_menu.add(col)
186
187
go_menu = gtk.Menu()
188
go_menu.set_accel_group(self.accel_group)
189
go_menuitem = gtk.MenuItem("_Go")
190
go_menuitem.set_submenu(go_menu)
191
192
go_menu_next = self.next_rev_action.create_menu_item()
193
go_menu_prev = self.prev_rev_action.create_menu_item()
194
195
tag_image = gtk.Image()
196
tag_image.set_from_file(icon_path("tag-16.png"))
197
self.go_menu_tags = gtk.ImageMenuItem("_Tags")
198
self.go_menu_tags.set_image(tag_image)
199
self._update_tags()
200
201
go_menu.add(go_menu_next)
202
go_menu.add(go_menu_prev)
203
go_menu.add(gtk.SeparatorMenuItem())
204
go_menu.add(self.go_menu_tags)
205
206
revision_menu = gtk.Menu()
207
revision_menuitem = gtk.MenuItem("_Revision")
208
revision_menuitem.set_submenu(revision_menu)
209
210
revision_menu_diff = gtk.MenuItem("View Changes")
211
revision_menu_diff.connect('activate',
212
self._menu_diff_cb)
213
214
revision_menu_compare = gtk.MenuItem("Compare with...")
215
revision_menu_compare.connect('activate',
216
self._compare_with_cb)
217
218
revision_menu_tag = gtk.MenuItem("Tag Revision")
219
revision_menu_tag.connect('activate', self._tag_revision_cb)
220
221
revision_menu.add(revision_menu_tag)
222
revision_menu.add(revision_menu_diff)
223
revision_menu.add(revision_menu_compare)
224
225
branch_menu = gtk.Menu()
226
branch_menuitem = gtk.MenuItem("_Branch")
227
branch_menuitem.set_submenu(branch_menu)
228
229
branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
230
branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
231
232
try:
233
from bzrlib.plugins import search
234
except ImportError:
235
mutter("Didn't find search plugin")
236
else:
237
branch_index_menuitem = gtk.MenuItem("_Index")
238
branch_index_menuitem.connect('activate', self._branch_index_cb)
239
branch_menu.add(branch_index_menuitem)
240
241
help_menu = gtk.Menu()
242
help_menuitem = gtk.MenuItem("_Help")
243
help_menuitem.set_submenu(help_menu)
244
245
help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
246
help_about_menuitem.connect('activate', self._about_dialog_cb)
247
248
help_menu.add(help_about_menuitem)
249
250
menubar.add(file_menuitem)
251
menubar.add(edit_menuitem)
252
menubar.add(view_menuitem)
253
menubar.add(go_menuitem)
254
menubar.add(revision_menuitem)
255
menubar.add(branch_menuitem)
256
menubar.add(help_menuitem)
257
menubar.show_all()
258
259
return menubar
260
261
68
def construct_top(self):
262
69
"""Construct the top-half of the window."""
263
# FIXME: Make broken_line_length configurable
264
265
self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
266
267
self.treeview.connect('revision-selected',
268
self._treeselection_changed_cb)
269
self.treeview.connect('revision-activated',
270
self._tree_revision_activated)
271
272
self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
273
274
for col in ["revno", "date"]:
275
option = self.config.get_user_option(col + '-column-visible')
276
if option is not None:
277
self.treeview.set_property(col + '-column-visible', option == 'True')
278
else:
279
self.treeview.set_property(col + '-column-visible', False)
280
70
scrollwin = gtk.ScrolledWindow()
71
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
72
scrollwin.set_shadow_type(gtk.SHADOW_IN)
73
scrollwin.show()
74
75
self.treeview = gtk.TreeView()
76
self.treeview.set_rules_hint(True)
77
self.treeview.set_search_column(4)
78
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
79
self.treeview.connect("row-activated", self._treeview_row_activated_cb)
80
scrollwin.add(self.treeview)
281
81
self.treeview.show()
282
82
283
align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
284
align.set_padding(5, 0, 0, 0)
285
align.add(self.treeview)
286
align.show()
287
288
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
289
119
290
120
def construct_navigation(self):
291
121
"""Construct the navigation buttons."""
292
self.toolbar = gtk.Toolbar()
293
self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
294
295
self.prev_button = self.prev_rev_action.create_tool_item()
296
self.toolbar.insert(self.prev_button, -1)
297
298
self.next_button = self.next_rev_action.create_tool_item()
299
self.toolbar.insert(self.next_button, -1)
300
301
self.toolbar.insert(gtk.SeparatorToolItem(), -1)
302
303
refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
304
refresh_button.connect('clicked', self._refresh_clicked)
305
self.toolbar.insert(refresh_button, -1)
306
307
self.toolbar.show_all()
308
309
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
310
147
311
148
def construct_bottom(self):
312
149
"""Construct the bottom half of the window."""
313
from bzrlib.plugins.gtk.revisionview import RevisionView
314
self.revisionview = RevisionView(branch=self.branch)
150
scrollwin = gtk.ScrolledWindow()
151
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
152
scrollwin.set_shadow_type(gtk.SHADOW_NONE)
315
153
(width, height) = self.get_size()
316
self.revisionview.set_size_request(width, int(height / 2.5))
317
self.revisionview.show()
318
self.revisionview.set_show_callback(self._show_clicked_cb)
319
self.revisionview.connect('notify::revision', self._go_clicked_cb)
320
self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
321
return self.revisionview
322
323
def _tag_selected_cb(self, menuitem, revid):
324
self.treeview.set_revision_id(revid)
325
326
def _treeselection_changed_cb(self, selection, *args):
327
"""callback for when the treeview changes."""
328
revision = self.treeview.get_revision()
329
parents = self.treeview.get_parents()
330
children = self.treeview.get_children()
331
332
if revision and revision != NULL_REVISION:
333
prev_menu = gtk.Menu()
334
if len(parents) > 0:
335
self.prev_rev_action.set_sensitive(True)
336
for parent_id in parents:
337
if parent_id and parent_id != NULL_REVISION:
338
parent = self.branch.repository.get_revision(parent_id)
339
try:
340
str = ' (' + parent.properties['branch-nick'] + ')'
341
except KeyError:
342
str = ""
343
344
item = gtk.MenuItem(parent.message.split("\n")[0] + str)
345
item.connect('activate', self._set_revision_cb, parent_id)
346
prev_menu.add(item)
347
prev_menu.show_all()
348
else:
349
self.prev_rev_action.set_sensitive(False)
350
prev_menu.hide()
351
352
self.prev_button.set_menu(prev_menu)
353
354
next_menu = gtk.Menu()
355
if len(children) > 0:
356
self.next_rev_action.set_sensitive(True)
357
for child_id in children:
358
child = self.branch.repository.get_revision(child_id)
359
try:
360
str = ' (' + child.properties['branch-nick'] + ')'
361
except KeyError:
362
str = ""
363
364
item = gtk.MenuItem(child.message.split("\n")[0] + str)
365
item.connect('activate', self._set_revision_cb, child_id)
366
next_menu.add(item)
367
next_menu.show_all()
368
else:
369
self.next_rev_action.set_sensitive(False)
370
next_menu.hide()
371
372
self.next_button.set_menu(next_menu)
373
374
self.revisionview.set_revision(revision)
375
self.revisionview.set_children(children)
376
377
def _tree_revision_activated(self, widget, path, col):
378
# TODO: more than one parent
379
"""Callback for when a treeview row gets activated."""
380
revision = self.treeview.get_revision()
381
parents = self.treeview.get_parents()
382
383
if len(parents) == 0:
384
parent_id = None
385
else:
386
parent_id = parents[0]
387
388
self.show_diff(revision.revision_id, parent_id)
389
self.treeview.grab_focus()
390
391
def _menu_diff_cb(self,w):
392
(path, focus) = self.treeview.treeview.get_cursor()
393
revid = self.treeview.model[path][treemodel.REVID]
394
395
parentids = self.branch.repository.revision_parents(revid)
396
397
if len(parentids) == 0:
398
parentid = NULL_REVISION
399
else:
400
parentid = parentids[0]
401
402
self.show_diff(revid,parentid)
154
scrollwin.set_size_request(width, int(height / 2.5))
155
scrollwin.show()
156
157
vbox = gtk.VBox(False, spacing=6)
158
vbox.set_border_width(6)
159
scrollwin.add_with_viewport(vbox)
160
vbox.show()
161
162
table = gtk.Table(rows=4, columns=2)
163
table.set_row_spacings(6)
164
table.set_col_spacings(6)
165
vbox.pack_start(table, expand=False, fill=True)
166
table.show()
167
168
align = gtk.Alignment(0.0, 0.5)
169
label = gtk.Label()
170
label.set_markup("<b>Revision:</b>")
171
align.add(label)
172
table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
173
label.show()
174
align.show()
175
176
align = gtk.Alignment(0.0, 0.5)
177
self.revid_label = gtk.Label()
178
self.revid_label.set_selectable(True)
179
align.add(self.revid_label)
180
table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
181
self.revid_label.show()
182
align.show()
183
184
align = gtk.Alignment(0.0, 0.5)
185
label = gtk.Label()
186
label.set_markup("<b>Committer:</b>")
187
align.add(label)
188
table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
189
label.show()
190
align.show()
191
192
align = gtk.Alignment(0.0, 0.5)
193
self.committer_label = gtk.Label()
194
self.committer_label.set_selectable(True)
195
align.add(self.committer_label)
196
table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
197
self.committer_label.show()
198
align.show()
199
200
align = gtk.Alignment(0.0, 0.5)
201
label = gtk.Label()
202
label.set_markup("<b>Branch nick:</b>")
203
align.add(label)
204
table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
205
label.show()
206
align.show()
207
208
align = gtk.Alignment(0.0, 0.5)
209
self.branchnick_label = gtk.Label()
210
self.branchnick_label.set_selectable(True)
211
align.add(self.branchnick_label)
212
table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
213
self.branchnick_label.show()
214
align.show()
215
216
align = gtk.Alignment(0.0, 0.5)
217
label = gtk.Label()
218
label.set_markup("<b>Timestamp:</b>")
219
align.add(label)
220
table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
221
label.show()
222
align.show()
223
224
align = gtk.Alignment(0.0, 0.5)
225
self.timestamp_label = gtk.Label()
226
self.timestamp_label.set_selectable(True)
227
align.add(self.timestamp_label)
228
table.attach(align, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
229
self.timestamp_label.show()
230
align.show()
231
232
self.parents_table = gtk.Table(rows=1, columns=2)
233
self.parents_table.set_row_spacings(3)
234
self.parents_table.set_col_spacings(6)
235
self.parents_table.show()
236
vbox.pack_start(self.parents_table, expand=False, fill=True)
237
self.parents_widgets = []
238
239
label = gtk.Label()
240
label.set_markup("<b>Parents:</b>")
241
align = gtk.Alignment(0.0, 0.5)
242
align.add(label)
243
self.parents_table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
244
label.show()
245
align.show()
246
247
self.message_buffer = gtk.TextBuffer()
248
textview = gtk.TextView(self.message_buffer)
249
textview.set_editable(False)
250
textview.set_wrap_mode(gtk.WRAP_WORD)
251
textview.modify_font(pango.FontDescription("Monospace"))
252
vbox.pack_start(textview, expand=True, fill=True)
253
textview.show()
254
255
return scrollwin
256
257
def set_branch(self, branch, start, maxnum):
258
"""Set the branch and start position for this window.
259
260
Creates a new TreeModel and populates it with information about
261
the new branch before updating the window title and model of the
262
treeview itself.
263
"""
264
self.branch = branch
265
266
# [ revision, node, last_lines, lines, message, committer, timestamp ]
267
self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
268
gobject.TYPE_PYOBJECT,
269
gobject.TYPE_PYOBJECT,
270
gobject.TYPE_PYOBJECT,
271
str, str, str)
272
self.index = {}
273
index = 0
274
275
last_lines = []
276
(self.revisions, colours, self.children, self.parent_ids,
277
merge_sorted) = distances(branch, start)
278
for (index, (revision, node, lines)) in enumerate(graph(
279
self.revisions, colours, merge_sorted)):
280
# FIXME: at this point we should be able to show the graph order
281
# and lines with no message or commit data - and then incrementally
282
# fill the timestamp, committer etc data as desired.
283
message = revision.message.split("\n")[0]
284
if revision.committer is not None:
285
timestamp = format_date(revision.timestamp, revision.timezone)
286
else:
287
timestamp = None
288
self.model.append([revision, node, last_lines, lines,
289
message, revision.committer, timestamp])
290
self.index[revision] = index
291
last_lines = lines
292
if maxnum is not None and index > maxnum:
293
break
294
295
self.set_title(branch.nick + " - bzrk")
296
self.treeview.set_model(self.model)
297
298
def _treeview_cursor_cb(self, *args):
299
"""Callback for when the treeview cursor changes."""
300
(path, col) = self.treeview.get_cursor()
301
revision = self.model[path][0]
302
303
self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
304
self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
305
306
if revision.committer is not None:
307
branchnick = ""
308
committer = revision.committer
309
timestamp = format_date(revision.timestamp, revision.timezone)
310
message = revision.message
311
try:
312
branchnick = revision.properties['branch-nick']
313
except KeyError:
314
pass
315
316
else:
317
committer = ""
318
timestamp = ""
319
message = ""
320
branchnick = ""
321
322
self.revid_label.set_text(revision.revision_id)
323
self.branchnick_label.set_text(branchnick)
324
325
self.committer_label.set_text(committer)
326
self.timestamp_label.set_text(timestamp)
327
self.message_buffer.set_text(message)
328
329
for widget in self.parents_widgets:
330
self.parents_table.remove(widget)
331
332
self.parents_widgets = []
333
self.parents_table.resize(max(len(self.parent_ids[revision]), 1), 2)
334
335
for idx, parent_id in enumerate(self.parent_ids[revision]):
336
align = gtk.Alignment(0.0, 0.0)
337
self.parents_widgets.append(align)
338
self.parents_table.attach(align, 1, 2, idx, idx + 1,
339
gtk.EXPAND | gtk.FILL, gtk.FILL)
340
align.show()
341
342
hbox = gtk.HBox(False, spacing=6)
343
align.add(hbox)
344
hbox.show()
345
346
image = gtk.Image()
347
image.set_from_stock(
348
gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
349
image.show()
350
351
button = gtk.Button()
352
button.add(image)
353
button.set_sensitive(self.app is not None)
354
button.connect("clicked", self._show_clicked_cb,
355
revision.revision_id, parent_id)
356
hbox.pack_start(button, expand=False, fill=True)
357
button.show()
358
359
button = gtk.Button(parent_id)
360
button.set_use_underline(False)
361
button.connect("clicked", self._go_clicked_cb, parent_id)
362
hbox.pack_start(button, expand=False, fill=True)
363
button.show()
364
403
365
404
366
def _back_clicked_cb(self, *args):
405
367
"""Callback for when the back button is clicked."""
406
self.treeview.back()
407
368
(path, col) = self.treeview.get_cursor()
369
revision = self.model[path][0]
370
if not len(self.parent_ids[revision]):
371
return
372
373
for parent_id in self.parent_ids[revision]:
374
parent = self.revisions[parent_id]
375
if same_branch(revision, parent):
376
self.treeview.set_cursor(self.index[parent])
377
break
378
else:
379
next = self.revisions[self.parent_ids[revision][0]]
380
self.treeview.set_cursor(self.index[next])
381
self.treeview.grab_focus()
382
408
383
def _fwd_clicked_cb(self, *args):
409
384
"""Callback for when the forward button is clicked."""
410
self.treeview.forward()
411
412
def _go_clicked_cb(self, w, p):
385
(path, col) = self.treeview.get_cursor()
386
revision = self.model[path][0]
387
if not len(self.children[revision]):
388
return
389
390
for child in self.children[revision]:
391
if same_branch(child, revision):
392
self.treeview.set_cursor(self.index[child])
393
break
394
else:
395
prev = list(self.children[revision])[0]
396
self.treeview.set_cursor(self.index[prev])
397
self.treeview.grab_focus()
398
399
def _go_clicked_cb(self, widget, revid):
413
400
"""Callback for when the go button for a parent is clicked."""
414
if self.revisionview.get_revision() is not None:
415
self.treeview.set_revision(self.revisionview.get_revision())
401
self.treeview.set_cursor(self.index[self.revisions[revid]])
402
self.treeview.grab_focus()
416
403
417
def _show_clicked_cb(self, revid, parentid):
404
def _show_clicked_cb(self, widget, revid, parentid):
418
405
"""Callback for when the show button for a parent is clicked."""
419
self.show_diff(revid, parentid)
420
self.treeview.grab_focus()
421
422
def _compare_with_cb(self,w):
423
"""Callback for revision 'compare with' menu. Will show a small
424
dialog with branch revisions to compare with selected revision in TreeView"""
425
426
from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
427
428
rb = RevisionBrowser(self.branch,self)
429
ret = rb.run()
430
431
if ret == gtk.RESPONSE_OK:
432
(path, focus) = self.treeview.treeview.get_cursor()
433
revid = self.treeview.model[path][treemodel.REVID]
434
self.show_diff(revid, rb.selected_revid)
435
436
rb.destroy()
437
438
def _set_revision_cb(self, w, revision_id):
439
self.treeview.set_revision_id(revision_id)
440
441
def _brokenlines_toggled_cb(self, button):
442
self.compact_view = button.get_active()
443
444
if self.compact_view:
445
option = 'yes'
446
else:
447
option = 'no'
448
449
self.config.set_user_option('viz-compact-view', option)
450
self.treeview.set_property('compact', self.compact_view)
451
self.treeview.refresh()
452
453
def _tag_revision_cb(self, w):
454
try:
455
self.treeview.set_sensitive(False)
456
dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
457
response = dialog.run()
458
if response != gtk.RESPONSE_NONE:
459
dialog.hide()
460
461
if response == gtk.RESPONSE_OK:
462
self.treeview.add_tag(dialog.tagname, dialog._revid)
463
464
dialog.destroy()
465
466
finally:
467
self.treeview.set_sensitive(True)
468
469
def _branch_index_cb(self, w):
470
from bzrlib.plugins.search import index as _mod_index
471
_mod_index.index_url(self.branch.base)
472
473
def _about_dialog_cb(self, w):
474
from bzrlib.plugins.gtk.about import AboutDialog
475
476
AboutDialog().run()
477
478
def _col_visibility_changed(self, col, property):
479
self.config.set_user_option(property + '-column-visible', col.get_active())
480
self.treeview.set_property(property + '-column-visible', col.get_active())
481
482
def _toolbar_visibility_changed(self, col):
483
if col.get_active():
484
self.toolbar.show()
485
else:
486
self.toolbar.hide()
487
488
def _show_about_cb(self, w):
489
dialog = AboutDialog()
490
dialog.connect('response', lambda d,r: d.destroy())
491
dialog.run()
492
493
def _refresh_clicked(self, w):
494
self.treeview.refresh()
495
496
def _update_tags(self):
497
menu = gtk.Menu()
498
499
if self.branch.supports_tags():
500
tags = self.branch.tags.get_tag_dict().items()
501
tags.sort()
502
tags.reverse()
503
for tag, revid in tags:
504
tag_image = gtk.Image()
505
tag_image.set_from_file(icon_path('tag-16.png'))
506
tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
507
tag_item.set_image(tag_image)
508
tag_item.connect('activate', self._tag_selected_cb, revid)
509
menu.add(tag_item)
510
self.go_menu_tags.set_submenu(menu)
511
512
self.go_menu_tags.set_sensitive(len(tags) != 0)
513
else:
514
self.go_menu_tags.set_sensitive(False)
515
516
self.go_menu_tags.show_all()
517
518
def show_diff(self, revid=None, parentid=None):
519
"""Open a new window to show a diff between the given revisions."""
520
from bzrlib.plugins.gtk.diff import DiffWindow
521
window = DiffWindow(parent=self)
522
523
if parentid is None:
524
parentid = NULL_REVISION
525
526
rev_tree = self.branch.repository.revision_tree(revid)
527
parent_tree = self.branch.repository.revision_tree(parentid)
528
529
description = revid + " - " + self.branch.nick
530
window.set_diff(description, rev_tree, parent_tree)
531
window.show()
532
533
406
if self.app is not None:
407
self.app.show_diff(self.branch, revid, parentid)
408
self.treeview.grab_focus()
409
410
def _treeview_row_activated_cb(self, widget, path, col):
411
# TODO: more than one parent
412
"""Callback for when a treeview row gets activated."""
413
revision = self.model[path][0]
414
if len(self.parent_ids[revision]) == 0:
415
# Ignore revisions without parent
416
return
417
parent_id = self.parent_ids[revision][0]
418
if self.app is not None:
419
self.app.show_diff(self.branch, revision.revision_id, parent_id)
420
self.treeview.grab_focus()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0