/b-gtk/fix-viz

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

  • Committer: Adrian Wilkins
  • Date: 2008-04-24 15:26:14 UTC
  • mto: This revision was merged to the branch mainline in revision 470.
  • Revision ID: adrian.wilkins@gmail.com-20080424152614-2rnnljbro6vzqvf7
Detect the reserved null: revision in appropriate places. 

This removes a huge shower of stack traces that get dumped to console when 
you look at the bottom of a log.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
13
13
import gobject
14
14
import pango
15
15
 
 
16
from bzrlib.plugins.gtk.window import Window
16
17
from bzrlib.plugins.gtk import icon_path
17
 
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
18
18
from bzrlib.plugins.gtk.tags import AddTagDialog
19
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
 
from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
21
 
from bzrlib.plugins.gtk.window import Window
22
 
 
23
 
from bzrlib.config import BranchConfig, GlobalConfig
 
20
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
24
21
from bzrlib.revision import Revision, NULL_REVISION
25
 
from bzrlib.trace import mutter
 
22
from bzrlib.config import BranchConfig
 
23
from bzrlib.config import GlobalConfig
26
24
 
27
25
class BranchWindow(Window):
28
26
    """Branch window.
48
46
        self.maxnum      = maxnum
49
47
        self.config      = GlobalConfig()
50
48
 
51
 
        self._sizes      = {} # window and widget sizes
52
 
 
53
49
        if self.config.get_user_option('viz-compact-view') == 'yes':
54
50
            self.compact_view = True
55
51
        else:
57
53
 
58
54
        self.set_title(branch.nick + " - revision history")
59
55
 
60
 
        # user-configured window size
61
 
        size = self._load_size('viz-window-size')
62
 
        if size:
63
 
            width, height = size
64
 
        else:
65
 
            # Use three-quarters of the screen by default
66
 
            screen = self.get_screen()
67
 
            monitor = screen.get_monitor_geometry(0)
68
 
            width = int(monitor.width * 0.75)
69
 
            height = int(monitor.height * 0.75)
 
56
        # Use three-quarters of the screen by default
 
57
        screen = self.get_screen()
 
58
        monitor = screen.get_monitor_geometry(0)
 
59
        width = int(monitor.width * 0.75)
 
60
        height = int(monitor.height * 0.75)
70
61
        self.set_default_size(width, height)
71
 
        self.set_size_request(width/3, height/3)
72
 
        self.connect("size-allocate", self._on_size_allocate, 'viz-window-size')
73
62
 
74
63
        # FIXME AndyFitz!
75
64
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
77
66
 
78
67
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
79
68
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
80
 
        gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
81
69
 
82
70
        self.accel_group = gtk.AccelGroup()
83
71
        self.add_accel_group(self.accel_group)
96
84
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
97
85
        self.next_rev_action.connect_accelerator()
98
86
 
99
 
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
100
 
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
101
 
        self.refresh_action.set_accel_group(self.accel_group)
102
 
        self.refresh_action.connect("activate", self._refresh_clicked)
103
 
        self.refresh_action.connect_accelerator()
104
 
 
105
87
        self.construct()
106
88
 
107
89
    def set_revision(self, revid):
113
95
        self.add(vbox)
114
96
 
115
97
        self.paned = gtk.VPaned()
116
 
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
117
 
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
 
98
        self.paned.pack1(self.construct_top(), resize=True, shrink=False)
 
99
        self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
118
100
        self.paned.show()
119
101
 
120
 
        nav = self.construct_navigation()
121
 
        menubar = self.construct_menubar()
122
 
        vbox.pack_start(menubar, expand=False, fill=True)
123
 
        vbox.pack_start(nav, expand=False, fill=True)
124
 
 
 
102
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
 
103
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
 
104
        
125
105
        vbox.pack_start(self.paned, expand=True, fill=True)
126
106
        vbox.set_focus_child(self.paned)
127
107
 
128
108
        vbox.show()
129
 
    
 
109
 
130
110
    def construct_menubar(self):
131
111
        menubar = gtk.MenuBar()
132
112
 
148
128
        edit_menuitem = gtk.MenuItem("_Edit")
149
129
        edit_menuitem.set_submenu(edit_menu)
150
130
 
 
131
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
 
132
 
151
133
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
152
134
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
153
135
 
154
136
        edit_menu_globopts = gtk.MenuItem("Global Settings")
155
137
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
156
138
 
 
139
        edit_menu.add(edit_menu_find)
157
140
        edit_menu.add(edit_menu_branchopts)
158
141
        edit_menu.add(edit_menu_globopts)
159
142
 
161
144
        view_menuitem = gtk.MenuItem("_View")
162
145
        view_menuitem.set_submenu(view_menu)
163
146
 
164
 
        view_menu_refresh = self.refresh_action.create_menu_item()
165
 
        view_menu_refresh.connect('activate', self._refresh_clicked)
166
 
 
167
 
        view_menu.add(view_menu_refresh)
168
 
        view_menu.add(gtk.SeparatorMenuItem())
169
 
 
170
147
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
171
148
        view_menu_toolbar.set_active(True)
172
 
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
173
 
            view_menu_toolbar.set_active(False)
174
 
            self.toolbar.hide()
175
149
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
176
150
 
177
151
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
178
152
        view_menu_compact.set_active(self.compact_view)
179
153
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
180
 
        
181
 
        view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
182
 
        view_menu_diffs.set_active(False)
183
 
        if self.config.get_user_option('viz-show-diffs') == 'True':
184
 
            view_menu_diffs.set_active(True)
185
 
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
186
 
        
187
 
        view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
188
 
        view_menu_wide_diffs.set_active(False)
189
 
        if self.config.get_user_option('viz-wide-diffs') == 'True':
190
 
            view_menu_wide_diffs.set_active(True)
191
 
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
192
 
        
193
 
        view_menu_wrap_diffs = gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
194
 
        view_menu_wrap_diffs.set_active(False)
195
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
196
 
            view_menu_wrap_diffs.set_active(True)
197
 
        view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
198
 
                
 
154
 
199
155
        view_menu.add(view_menu_toolbar)
200
156
        view_menu.add(view_menu_compact)
201
157
        view_menu.add(gtk.SeparatorMenuItem())
202
 
        view_menu.add(view_menu_diffs)
203
 
        view_menu.add(view_menu_wide_diffs)
204
 
        view_menu.add(view_menu_wrap_diffs)
205
 
        view_menu.add(gtk.SeparatorMenuItem())
206
158
 
207
159
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
208
160
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
237
189
        go_menu.add(gtk.SeparatorMenuItem())
238
190
        go_menu.add(self.go_menu_tags)
239
191
 
240
 
        self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
 
192
        revision_menu = gtk.Menu()
241
193
        revision_menuitem = gtk.MenuItem("_Revision")
242
 
        revision_menuitem.set_submenu(self.revision_menu)
 
194
        revision_menuitem.set_submenu(revision_menu)
 
195
 
 
196
        revision_menu_diff = gtk.MenuItem("View Changes")
 
197
        revision_menu_diff.connect('activate', 
 
198
                lambda w: self.treeview.show_diff())
 
199
 
 
200
        revision_menu_tag = gtk.MenuItem("Tag Revision")
 
201
        revision_menu_tag.connect('activate', self._tag_revision_cb)
 
202
 
 
203
        revision_menu.add(revision_menu_tag)
 
204
        revision_menu.add(revision_menu_diff)
243
205
 
244
206
        branch_menu = gtk.Menu()
245
207
        branch_menuitem = gtk.MenuItem("_Branch")
248
210
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
249
211
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
250
212
 
251
 
        try:
252
 
            from bzrlib.plugins import search
253
 
        except ImportError:
254
 
            mutter("Didn't find search plugin")
255
 
        else:
256
 
            branch_menu.add(gtk.SeparatorMenuItem())
257
 
 
258
 
            branch_index_menuitem = gtk.MenuItem("_Index")
259
 
            branch_index_menuitem.connect('activate', self._branch_index_cb)
260
 
            branch_menu.add(branch_index_menuitem)
261
 
 
262
 
            branch_search_menuitem = gtk.MenuItem("_Search")
263
 
            branch_search_menuitem.connect('activate', self._branch_search_cb)
264
 
            branch_menu.add(branch_search_menuitem)
265
 
 
266
213
        help_menu = gtk.Menu()
267
214
        help_menuitem = gtk.MenuItem("_Help")
268
215
        help_menuitem.set_submenu(help_menu)
300
247
            option = self.config.get_user_option(col + '-column-visible')
301
248
            if option is not None:
302
249
                self.treeview.set_property(col + '-column-visible', option == 'True')
303
 
            else:
304
 
                self.treeview.set_property(col + '-column-visible', False)
305
250
 
 
251
        self.treeview.set_property(col + '-column-visible', False)
306
252
        self.treeview.show()
307
253
 
308
254
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
309
255
        align.set_padding(5, 0, 0, 0)
310
256
        align.add(self.treeview)
311
 
        # user-configured size
312
 
        size = self._load_size('viz-graph-size')
313
 
        if size:
314
 
            width, height = size
315
 
            align.set_size_request(width, height)
316
 
        else:
317
 
            (width, height) = self.get_size()
318
 
            align.set_size_request(width, int(height / 2.5))
319
 
        align.connect('size-allocate', self._on_size_allocate, 'viz-graph-size')
320
257
        align.show()
321
258
 
322
259
        return align
344
281
 
345
282
    def construct_bottom(self):
346
283
        """Construct the bottom half of the window."""
347
 
        if self.config.get_user_option('viz-wide-diffs') == 'True':
348
 
            self.diff_paned = gtk.VPaned()
349
 
        else:
350
 
            self.diff_paned = gtk.HPaned()
351
 
        (width, height) = self.get_size()
352
 
        self.diff_paned.set_size_request(20, 20) # shrinkable
353
 
 
354
284
        from bzrlib.plugins.gtk.revisionview import RevisionView
355
285
        self.revisionview = RevisionView(branch=self.branch)
356
 
        self.revisionview.set_size_request(width/3, int(height / 2.5))
357
 
        # user-configured size
358
 
        size = self._load_size('viz-revisionview-size')
359
 
        if size:
360
 
            width, height = size
361
 
            self.revisionview.set_size_request(width, height)
362
 
        self.revisionview.connect('size-allocate', self._on_size_allocate, 'viz-revisionview-size')
 
286
        (width, height) = self.get_size()
 
287
        self.revisionview.set_size_request(width, int(height / 2.5))
363
288
        self.revisionview.show()
364
289
        self.revisionview.set_show_callback(self._show_clicked_cb)
365
290
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
366
291
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
367
 
        self.diff_paned.pack1(self.revisionview)
368
 
 
369
 
        from bzrlib.plugins.gtk.diff import DiffWidget
370
 
        self.diff = DiffWidget()
371
 
        self.diff_paned.pack2(self.diff)
372
 
 
373
 
        self.diff_paned.show_all()
374
 
        if self.config.get_user_option('viz-show-diffs') != 'True':
375
 
            self.diff.hide()
376
 
 
377
 
        return self.diff_paned
 
292
        return self.revisionview
378
293
 
379
294
    def _tag_selected_cb(self, menuitem, revid):
380
295
        self.treeview.set_revision_id(revid)
385
300
        parents  = self.treeview.get_parents()
386
301
        children = self.treeview.get_children()
387
302
 
388
 
        self.revision_menu.set_revision_ids([revision.revision_id])
389
 
 
390
303
        if revision and revision != NULL_REVISION:
391
304
            prev_menu = gtk.Menu()
392
305
            if len(parents) > 0:
431
344
 
432
345
            self.revisionview.set_revision(revision)
433
346
            self.revisionview.set_children(children)
434
 
            self.update_diff_panel(revision, parents)
435
 
 
 
347
    
436
348
    def _tree_revision_activated(self, widget, path, col):
437
349
        # TODO: more than one parent
438
350
        """Callback for when a treeview row gets activated."""
446
358
 
447
359
        self.show_diff(revision.revision_id, parent_id)
448
360
        self.treeview.grab_focus()
449
 
        
 
361
    
 
362
 
450
363
    def _back_clicked_cb(self, *args):
451
364
        """Callback for when the back button is clicked."""
452
365
        self.treeview.back()
480
393
        self.treeview.set_property('compact', self.compact_view)
481
394
        self.treeview.refresh()
482
395
 
483
 
    def _branch_index_cb(self, w):
484
 
        from bzrlib.plugins.search import index as _mod_index
485
 
        _mod_index.index_url(self.branch.base)
486
 
 
487
 
    def _branch_search_cb(self, w):
488
 
        from bzrlib.plugins.search import index as _mod_index
489
 
        from bzrlib.plugins.gtk.search import SearchDialog
490
 
        from bzrlib.plugins.search import errors as search_errors
491
 
 
 
396
    def _tag_revision_cb(self, w):
492
397
        try:
493
 
            index = _mod_index.open_index_url(self.branch.base)
494
 
        except search_errors.NoSearchIndex:
495
 
            dialog = gtk.MessageDialog(self, type=gtk.MESSAGE_QUESTION, 
496
 
                buttons=gtk.BUTTONS_OK_CANCEL, 
497
 
                message_format="This branch has not been indexed yet. "
498
 
                               "Index now?")
499
 
            if dialog.run() == gtk.RESPONSE_OK:
500
 
                dialog.destroy()
501
 
                index = _mod_index.index_url(self.branch.base)
502
 
            else:
503
 
                dialog.destroy()
504
 
                return
505
 
 
506
 
        dialog = SearchDialog(index)
507
 
        
508
 
        if dialog.run() == gtk.RESPONSE_OK:
509
 
            self.set_revision(dialog.get_revision())
510
 
 
511
 
        dialog.destroy()
 
398
            self.treeview.set_sensitive(False)
 
399
            dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
 
400
            response = dialog.run()
 
401
            if response != gtk.RESPONSE_NONE:
 
402
                dialog.hide()
 
403
            
 
404
                if response == gtk.RESPONSE_OK:
 
405
                    self.treeview.add_tag(dialog.tagname, dialog._revid)
 
406
                
 
407
                dialog.destroy()
 
408
 
 
409
        finally:
 
410
            self.treeview.set_sensitive(True)
512
411
 
513
412
    def _about_dialog_cb(self, w):
514
413
        from bzrlib.plugins.gtk.about import AboutDialog
521
420
 
522
421
    def _toolbar_visibility_changed(self, col):
523
422
        if col.get_active():
524
 
            self.toolbar.show()
 
423
            self.toolbar.show() 
525
424
        else:
526
425
            self.toolbar.hide()
527
 
        self.config.set_user_option('viz-toolbar-visible', col.get_active())
528
 
 
529
 
    def _make_diff_nonzero_size(self):
530
 
        """make sure the diff isn't zero-width or zero-height"""
531
 
        alloc = self.diff.get_allocation()
532
 
        if (alloc.width < 10) or (alloc.height < 10):
533
 
            width, height = self.get_size()
534
 
            self.revisionview.set_size_request(width/3, int(height / 2.5))
535
 
 
536
 
    def _diff_visibility_changed(self, col):
537
 
        """Hide or show the diff panel."""
538
 
        if col.get_active():
539
 
            self.diff.show()
540
 
            self._make_diff_nonzero_size()
541
 
        else:
542
 
            self.diff.hide()
543
 
        self.config.set_user_option('viz-show-diffs', str(col.get_active()))
544
 
        self.update_diff_panel()
545
 
 
546
 
    def _diff_placement_changed(self, col):
547
 
        """Toggle the diff panel's position."""
548
 
        self.config.set_user_option('viz-wide-diffs', str(col.get_active()))
549
 
 
550
 
        old = self.paned.get_child2()
551
 
        self.paned.remove(old)
552
 
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
553
 
        self._make_diff_nonzero_size()
554
 
 
555
 
        self.treeview.emit('revision-selected')
556
 
    
557
 
    def _diff_wrap_changed(self, widget):
558
 
        """Toggle word wrap in the diff widget."""
559
 
        self.config.set_user_option('viz-wrap-diffs', widget.get_active())
560
 
        self.diff._on_wraplines_toggled(widget)
561
 
    
 
426
 
562
427
    def _show_about_cb(self, w):
563
428
        dialog = AboutDialog()
564
429
        dialog.connect('response', lambda d,r: d.destroy())
589
454
 
590
455
        self.go_menu_tags.show_all()
591
456
 
592
 
    def _load_size(self, name):
593
 
        """Read and parse 'name' from self.config.
594
 
        The value is a string, formatted as WIDTHxHEIGHT
595
 
        Returns None, or (width, height)
596
 
        """
597
 
        size = self.config.get_user_option(name)
598
 
        if size:
599
 
            width, height = [int(num) for num in size.split('x')]
600
 
            # avoid writing config every time we start
601
 
            self._sizes[name] = (width, height)
602
 
            return width, height
603
 
        return None
604
 
 
605
 
    def _on_size_allocate(self, widget, allocation, name):
606
 
        """When window has been resized, save the new size."""
607
 
        width, height = 0, 0
608
 
        if name in self._sizes:
609
 
            width, height = self._sizes[name]
610
 
 
611
 
        size_changed = (width != allocation.width) or \
612
 
                (height != allocation.height)
613
 
 
614
 
        if size_changed:
615
 
            width, height = allocation.width, allocation.height
616
 
            self._sizes[name] = (width, height)
617
 
            value = '%sx%s' % (width, height)
618
 
            self.config.set_user_option(name, value)
619
 
 
620
457
    def show_diff(self, revid=None, parentid=None):
621
458
        """Open a new window to show a diff between the given revisions."""
622
459
        from bzrlib.plugins.gtk.diff import DiffWindow
632
469
        window.set_diff(description, rev_tree, parent_tree)
633
470
        window.show()
634
471
 
635
 
    def update_diff_panel(self, revision=None, parents=None):
636
 
        """Show the current revision in the diff panel."""
637
 
        if self.config.get_user_option('viz-show-diffs') != 'True':
638
 
            return
639
 
 
640
 
        if not revision: # default to selected row
641
 
            revision = self.treeview.get_revision()
642
 
        if (not revision) or (revision == NULL_REVISION):
643
 
            return
644
 
 
645
 
        if not parents: # default to selected row's parents
646
 
            parents  = self.treeview.get_parents()
647
 
        if len(parents) == 0:
648
 
            parent_id = None
649
 
        else:
650
 
            parent_id = parents[0]
651
 
 
652
 
        rev_tree    = self.branch.repository.revision_tree(revision.revision_id)
653
 
        parent_tree = self.branch.repository.revision_tree(parent_id)
654
 
 
655
 
        self.diff.set_diff(rev_tree, parent_tree)
656
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
657
 
            self.diff._on_wraplines_toggled(wrap=True)
658
 
        self.diff.show_all()
 
472