1
# -*- coding: UTF-8 -*-
4
This module contains the code to manage the branch information window,
5
which contains both the revision graph and details panes.
8
__copyright__ = "Copyright © 2005 Canonical Ltd."
9
__author__ = "Scott James Remnant <scott@ubuntu.com>"
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
22
from bzrlib.config import BranchConfig, GlobalConfig
23
from bzrlib.revision import Revision, NULL_REVISION
24
from bzrlib.trace import mutter
26
class BranchWindow(Window):
29
This object represents and manages a single window containing information
30
for a particular branch.
33
def __init__(self, branch, start_revs, maxnum, parent=None):
34
"""Create a new BranchWindow.
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,
42
Window.__init__(self, parent=parent)
43
self.set_border_width(0)
46
self.start_revs = start_revs
48
self.config = GlobalConfig()
50
if self.config.get_user_option('viz-compact-view') == 'yes':
51
self.compact_view = True
53
self.compact_view = False
55
self.set_title(branch.nick + " - revision history")
57
# Use three-quarters of the screen by default
58
screen = self.get_screen()
59
monitor = screen.get_monitor_geometry(0)
60
width = int(monitor.width * 0.75)
61
height = int(monitor.height * 0.75)
62
self.set_default_size(width, height)
65
icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
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)
72
self.accel_group = gtk.AccelGroup()
73
self.add_accel_group(self.accel_group)
75
gtk.Action.set_tool_item_type(gtk.MenuToolButton)
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()
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()
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()
97
def set_revision(self, revid):
98
self.treeview.set_revision_id(revid)
101
"""Construct the window contents."""
102
vbox = gtk.VBox(spacing=0)
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)
110
vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
111
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
113
vbox.pack_start(self.paned, expand=True, fill=True)
114
vbox.set_focus_child(self.paned)
118
def construct_menubar(self):
119
menubar = gtk.MenuBar()
121
file_menu = gtk.Menu()
122
file_menuitem = gtk.MenuItem("_File")
123
file_menuitem.set_submenu(file_menu)
125
file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
126
file_menu_close.connect('activate', lambda x: self.destroy())
128
file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
129
file_menu_quit.connect('activate', lambda x: gtk.main_quit())
131
if self._parent is not None:
132
file_menu.add(file_menu_close)
133
file_menu.add(file_menu_quit)
135
edit_menu = gtk.Menu()
136
edit_menuitem = gtk.MenuItem("_Edit")
137
edit_menuitem.set_submenu(edit_menu)
139
edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
141
edit_menu_branchopts = gtk.MenuItem("Branch Settings")
142
edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
144
edit_menu_globopts = gtk.MenuItem("Global Settings")
145
edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
147
edit_menu.add(edit_menu_find)
148
edit_menu.add(edit_menu_branchopts)
149
edit_menu.add(edit_menu_globopts)
151
view_menu = gtk.Menu()
152
view_menuitem = gtk.MenuItem("_View")
153
view_menuitem.set_submenu(view_menu)
155
view_menu_refresh = self.refresh_action.create_menu_item()
156
view_menu_refresh.connect('activate', self._refresh_clicked)
158
view_menu.add(view_menu_refresh)
159
view_menu.add(gtk.SeparatorMenuItem())
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)
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)
169
view_menu.add(view_menu_toolbar)
170
view_menu.add(view_menu_compact)
171
view_menu.add(gtk.SeparatorMenuItem())
173
self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
174
self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
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)
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)
188
go_menu.set_accel_group(self.accel_group)
189
go_menuitem = gtk.MenuItem("_Go")
190
go_menuitem.set_submenu(go_menu)
192
go_menu_next = self.next_rev_action.create_menu_item()
193
go_menu_prev = self.prev_rev_action.create_menu_item()
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)
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)
206
revision_menu = gtk.Menu()
207
revision_menuitem = gtk.MenuItem("_Revision")
208
revision_menuitem.set_submenu(revision_menu)
210
revision_menu_diff = gtk.MenuItem("View Changes")
211
revision_menu_diff.connect('activate',
214
revision_menu_compare = gtk.MenuItem("Compare with...")
215
revision_menu_compare.connect('activate',
216
self._compare_with_cb)
218
revision_menu_tag = gtk.MenuItem("Tag Revision")
219
revision_menu_tag.connect('activate', self._tag_revision_cb)
221
revision_menu.add(revision_menu_tag)
222
revision_menu.add(revision_menu_diff)
223
revision_menu.add(revision_menu_compare)
225
branch_menu = gtk.Menu()
226
branch_menuitem = gtk.MenuItem("_Branch")
227
branch_menuitem.set_submenu(branch_menu)
229
branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
230
branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
233
from bzrlib.plugins import search
235
mutter("Didn't find search plugin")
237
branch_index_menuitem = gtk.MenuItem("_Index")
238
branch_index_menuitem.connect('activate', self._branch_index_cb)
239
branch_menu.add(branch_index_menuitem)
241
help_menu = gtk.Menu()
242
help_menuitem = gtk.MenuItem("_Help")
243
help_menuitem.set_submenu(help_menu)
245
help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
246
help_about_menuitem.connect('activate', self._about_dialog_cb)
248
help_menu.add(help_about_menuitem)
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)
261
def construct_top(self):
262
"""Construct the top-half of the window."""
263
# FIXME: Make broken_line_length configurable
265
self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
267
self.treeview.connect('revision-selected',
268
self._treeselection_changed_cb)
269
self.treeview.connect('revision-activated',
270
self._tree_revision_activated)
272
self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
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')
279
self.treeview.set_property(col + '-column-visible', False)
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)
290
def construct_navigation(self):
291
"""Construct the navigation buttons."""
292
self.toolbar = gtk.Toolbar()
293
self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
295
self.prev_button = self.prev_rev_action.create_tool_item()
296
self.toolbar.insert(self.prev_button, -1)
298
self.next_button = self.next_rev_action.create_tool_item()
299
self.toolbar.insert(self.next_button, -1)
301
self.toolbar.insert(gtk.SeparatorToolItem(), -1)
303
refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
304
refresh_button.connect('clicked', self._refresh_clicked)
305
self.toolbar.insert(refresh_button, -1)
307
self.toolbar.show_all()
311
def construct_bottom(self):
312
"""Construct the bottom half of the window."""
313
from bzrlib.plugins.gtk.revisionview import RevisionView
314
self.revisionview = RevisionView(branch=self.branch)
315
(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
323
def _tag_selected_cb(self, menuitem, revid):
324
self.treeview.set_revision_id(revid)
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()
332
if revision and revision != NULL_REVISION:
333
prev_menu = gtk.Menu()
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)
340
str = ' (' + parent.properties['branch-nick'] + ')'
344
item = gtk.MenuItem(parent.message.split("\n")[0] + str)
345
item.connect('activate', self._set_revision_cb, parent_id)
349
self.prev_rev_action.set_sensitive(False)
352
self.prev_button.set_menu(prev_menu)
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)
360
str = ' (' + child.properties['branch-nick'] + ')'
364
item = gtk.MenuItem(child.message.split("\n")[0] + str)
365
item.connect('activate', self._set_revision_cb, child_id)
369
self.next_rev_action.set_sensitive(False)
372
self.next_button.set_menu(next_menu)
374
self.revisionview.set_revision(revision)
375
self.revisionview.set_children(children)
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()
383
if len(parents) == 0:
386
parent_id = parents[0]
388
self.show_diff(revision.revision_id, parent_id)
389
self.treeview.grab_focus()
391
def _menu_diff_cb(self,w):
392
(path, focus) = self.treeview.treeview.get_cursor()
393
revid = self.treeview.model[path][treemodel.REVID]
395
parentids = self.branch.repository.revision_parents(revid)
397
if len(parentids) == 0:
398
parentid = NULL_REVISION
400
parentid = parentids[0]
402
self.show_diff(revid,parentid)
404
def _back_clicked_cb(self, *args):
405
"""Callback for when the back button is clicked."""
408
def _fwd_clicked_cb(self, *args):
409
"""Callback for when the forward button is clicked."""
410
self.treeview.forward()
412
def _go_clicked_cb(self, w, p):
413
"""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())
417
def _show_clicked_cb(self, revid, parentid):
418
"""Callback for when the show button for a parent is clicked."""
419
self.show_diff(revid, parentid)
420
self.treeview.grab_focus()
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"""
426
from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
428
rb = RevisionBrowser(self.branch,self)
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)
438
def _set_revision_cb(self, w, revision_id):
439
self.treeview.set_revision_id(revision_id)
441
def _brokenlines_toggled_cb(self, button):
442
self.compact_view = button.get_active()
444
if self.compact_view:
449
self.config.set_user_option('viz-compact-view', option)
450
self.treeview.set_property('compact', self.compact_view)
451
self.treeview.refresh()
453
def _tag_revision_cb(self, w):
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:
461
if response == gtk.RESPONSE_OK:
462
self.treeview.add_tag(dialog.tagname, dialog._revid)
467
self.treeview.set_sensitive(True)
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)
473
def _about_dialog_cb(self, w):
474
from bzrlib.plugins.gtk.about import AboutDialog
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())
482
def _toolbar_visibility_changed(self, col):
488
def _show_about_cb(self, w):
489
dialog = AboutDialog()
490
dialog.connect('response', lambda d,r: d.destroy())
493
def _refresh_clicked(self, w):
494
self.treeview.refresh()
496
def _update_tags(self):
499
if self.branch.supports_tags():
500
tags = self.branch.tags.get_tag_dict().items()
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)
510
self.go_menu_tags.set_submenu(menu)
512
self.go_menu_tags.set_sensitive(len(tags) != 0)
514
self.go_menu_tags.set_sensitive(False)
516
self.go_menu_tags.show_all()
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)
524
parentid = NULL_REVISION
526
rev_tree = self.branch.repository.revision_tree(revid)
527
parent_tree = self.branch.repository.revision_tree(parentid)
529
description = revid + " - " + self.branch.nick
530
window.set_diff(description, rev_tree, parent_tree)
added
removed
viz/branchwin.py
