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