/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.
53
51
        else:
54
52
            self.compact_view = False
55
53
 
56
 
        self.set_title(branch._get_nick(local=True) + " - revision history")
 
54
        self.set_title(branch.nick + " - revision history")
57
55
 
58
 
        # user-configured window size
59
 
        size = self._load_size('viz-window-size')
60
 
        if size:
61
 
            width, height = size
62
 
        else:
63
 
            # Use three-quarters of the screen by default
64
 
            screen = self.get_screen()
65
 
            monitor = screen.get_monitor_geometry(0)
66
 
            width = int(monitor.width * 0.75)
67
 
            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)
68
61
        self.set_default_size(width, height)
69
 
        self.set_size_request(width/3, height/3)
70
 
        self._save_size_on_destroy(self, 'viz-window-size')
71
62
 
72
63
        # FIXME AndyFitz!
73
64
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
75
66
 
76
67
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
77
68
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
78
 
        gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
79
69
 
80
70
        self.accel_group = gtk.AccelGroup()
81
71
        self.add_accel_group(self.accel_group)
94
84
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
95
85
        self.next_rev_action.connect_accelerator()
96
86
 
97
 
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
98
 
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
99
 
        self.refresh_action.set_accel_group(self.accel_group)
100
 
        self.refresh_action.connect("activate", self._refresh_clicked)
101
 
        self.refresh_action.connect_accelerator()
102
 
 
103
87
        self.construct()
104
88
 
105
 
    def _save_size_on_destroy(self, widget, config_name):
106
 
        """Creates a hook that saves the size of widget to config option 
107
 
           config_name when the window is destroyed/closed."""
108
 
        def save_size(src):
109
 
            width, height = widget.allocation.width, widget.allocation.height
110
 
            value = '%sx%s' % (width, height)
111
 
            self.config.set_user_option(config_name, value)
112
 
        self.connect("destroy", save_size)
113
 
 
114
89
    def set_revision(self, revid):
115
90
        self.treeview.set_revision_id(revid)
116
91
 
120
95
        self.add(vbox)
121
96
 
122
97
        self.paned = gtk.VPaned()
123
 
        self.paned.pack1(self.construct_top(), resize=False, shrink=True)
124
 
        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)
125
100
        self.paned.show()
126
101
 
127
 
        nav = self.construct_navigation()
128
 
        menubar = self.construct_menubar()
129
 
        vbox.pack_start(menubar, expand=False, fill=True)
130
 
        vbox.pack_start(nav, expand=False, fill=True)
131
 
 
 
102
        vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
 
103
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
 
104
        
132
105
        vbox.pack_start(self.paned, expand=True, fill=True)
133
106
        vbox.set_focus_child(self.paned)
134
107
 
135
 
        self.treeview.connect('revision-selected',
136
 
                self._treeselection_changed_cb)
137
 
        self.treeview.connect('revision-activated',
138
 
                self._tree_revision_activated)
139
 
 
140
 
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
141
108
        vbox.show()
142
 
    
 
109
 
143
110
    def construct_menubar(self):
144
111
        menubar = gtk.MenuBar()
145
112
 
161
128
        edit_menuitem = gtk.MenuItem("_Edit")
162
129
        edit_menuitem.set_submenu(edit_menu)
163
130
 
 
131
        edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
 
132
 
164
133
        edit_menu_branchopts = gtk.MenuItem("Branch Settings")
165
134
        edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
166
135
 
167
136
        edit_menu_globopts = gtk.MenuItem("Global Settings")
168
137
        edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
169
138
 
 
139
        edit_menu.add(edit_menu_find)
170
140
        edit_menu.add(edit_menu_branchopts)
171
141
        edit_menu.add(edit_menu_globopts)
172
142
 
174
144
        view_menuitem = gtk.MenuItem("_View")
175
145
        view_menuitem.set_submenu(view_menu)
176
146
 
177
 
        view_menu_refresh = self.refresh_action.create_menu_item()
178
 
        view_menu_refresh.connect('activate', self._refresh_clicked)
179
 
 
180
 
        view_menu.add(view_menu_refresh)
181
 
        view_menu.add(gtk.SeparatorMenuItem())
182
 
 
183
147
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
184
148
        view_menu_toolbar.set_active(True)
185
 
        if self.config.get_user_option('viz-toolbar-visible') == 'False':
186
 
            view_menu_toolbar.set_active(False)
187
 
            self.toolbar.hide()
188
149
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
189
150
 
190
151
        view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
191
152
        view_menu_compact.set_active(self.compact_view)
192
153
        view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
193
 
        
194
 
        view_menu_diffs = gtk.CheckMenuItem("Show Diffs")
195
 
        view_menu_diffs.set_active(False)
196
 
        if self.config.get_user_option('viz-show-diffs') == 'True':
197
 
            view_menu_diffs.set_active(True)
198
 
        view_menu_diffs.connect('toggled', self._diff_visibility_changed)
199
 
        
200
 
        view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")
201
 
        view_menu_wide_diffs.set_active(False)
202
 
        if self.config.get_user_option('viz-wide-diffs') == 'True':
203
 
            view_menu_wide_diffs.set_active(True)
204
 
        view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)
205
 
        
206
 
        view_menu_wrap_diffs = gtk.CheckMenuItem("Wrap _Long Lines in Diffs")
207
 
        view_menu_wrap_diffs.set_active(False)
208
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
209
 
            view_menu_wrap_diffs.set_active(True)
210
 
        view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)
211
 
                
 
154
 
212
155
        view_menu.add(view_menu_toolbar)
213
156
        view_menu.add(view_menu_compact)
214
157
        view_menu.add(gtk.SeparatorMenuItem())
215
 
        view_menu.add(view_menu_diffs)
216
 
        view_menu.add(view_menu_wide_diffs)
217
 
        view_menu.add(view_menu_wrap_diffs)
218
 
        view_menu.add(gtk.SeparatorMenuItem())
219
158
 
220
159
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
221
160
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
243
182
        tag_image.set_from_file(icon_path("tag-16.png"))
244
183
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
245
184
        self.go_menu_tags.set_image(tag_image)
246
 
        self.treeview.connect('refreshed', lambda w: self._update_tags())
 
185
        self._update_tags()
247
186
 
248
187
        go_menu.add(go_menu_next)
249
188
        go_menu.add(go_menu_prev)
250
189
        go_menu.add(gtk.SeparatorMenuItem())
251
190
        go_menu.add(self.go_menu_tags)
252
191
 
253
 
        self.revision_menu = RevisionMenu(self.branch.repository, [], self.branch, parent=self)
 
192
        revision_menu = gtk.Menu()
254
193
        revision_menuitem = gtk.MenuItem("_Revision")
255
 
        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)
256
205
 
257
206
        branch_menu = gtk.Menu()
258
207
        branch_menuitem = gtk.MenuItem("_Branch")
261
210
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
262
211
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
263
212
 
264
 
        try:
265
 
            from bzrlib.plugins import search
266
 
        except ImportError:
267
 
            mutter("Didn't find search plugin")
268
 
        else:
269
 
            branch_menu.add(gtk.SeparatorMenuItem())
270
 
 
271
 
            branch_index_menuitem = gtk.MenuItem("_Index")
272
 
            branch_index_menuitem.connect('activate', self._branch_index_cb)
273
 
            branch_menu.add(branch_index_menuitem)
274
 
 
275
 
            branch_search_menuitem = gtk.MenuItem("_Search")
276
 
            branch_search_menuitem.connect('activate', self._branch_search_cb)
277
 
            branch_menu.add(branch_search_menuitem)
278
 
 
279
213
        help_menu = gtk.Menu()
280
214
        help_menuitem = gtk.MenuItem("_Help")
281
215
        help_menuitem.set_submenu(help_menu)
302
236
 
303
237
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
304
238
 
 
239
        self.treeview.connect('revision-selected',
 
240
                self._treeselection_changed_cb)
 
241
        self.treeview.connect('revision-activated',
 
242
                self._tree_revision_activated)
 
243
 
 
244
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
 
245
 
305
246
        for col in ["revno", "date"]:
306
247
            option = self.config.get_user_option(col + '-column-visible')
307
248
            if option is not None:
308
249
                self.treeview.set_property(col + '-column-visible', option == 'True')
309
 
            else:
310
 
                self.treeview.set_property(col + '-column-visible', False)
311
250
 
 
251
        self.treeview.set_property(col + '-column-visible', False)
312
252
        self.treeview.show()
313
253
 
314
254
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
315
255
        align.set_padding(5, 0, 0, 0)
316
256
        align.add(self.treeview)
317
 
        # user-configured size
318
 
        size = self._load_size('viz-graph-size')
319
 
        if size:
320
 
            width, height = size
321
 
            align.set_size_request(width, height)
322
 
        else:
323
 
            (width, height) = self.get_size()
324
 
            align.set_size_request(width, int(height / 2.5))
325
 
        self._save_size_on_destroy(align, 'viz-graph-size')
326
257
        align.show()
327
258
 
328
259
        return align
350
281
 
351
282
    def construct_bottom(self):
352
283
        """Construct the bottom half of the window."""
353
 
        if self.config.get_user_option('viz-wide-diffs') == 'True':
354
 
            self.diff_paned = gtk.VPaned()
355
 
        else:
356
 
            self.diff_paned = gtk.HPaned()
357
 
        (width, height) = self.get_size()
358
 
        self.diff_paned.set_size_request(20, 20) # shrinkable
359
 
 
360
284
        from bzrlib.plugins.gtk.revisionview import RevisionView
361
285
        self.revisionview = RevisionView(branch=self.branch)
362
 
        self.revisionview.set_size_request(width/3, int(height / 2.5))
363
 
        # user-configured size
364
 
        size = self._load_size('viz-revisionview-size')
365
 
        if size:
366
 
            width, height = size
367
 
            self.revisionview.set_size_request(width, height)
368
 
        self._save_size_on_destroy(self.revisionview, 'viz-revisionview-size')
 
286
        (width, height) = self.get_size()
 
287
        self.revisionview.set_size_request(width, int(height / 2.5))
369
288
        self.revisionview.show()
370
289
        self.revisionview.set_show_callback(self._show_clicked_cb)
371
290
        self.revisionview.connect('notify::revision', self._go_clicked_cb)
372
291
        self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
373
 
        self.diff_paned.pack1(self.revisionview)
374
 
 
375
 
        from bzrlib.plugins.gtk.diff import DiffWidget
376
 
        self.diff = DiffWidget()
377
 
        self.diff_paned.pack2(self.diff)
378
 
 
379
 
        self.diff_paned.show_all()
380
 
        if self.config.get_user_option('viz-show-diffs') != 'True':
381
 
            self.diff.hide()
382
 
 
383
 
        return self.diff_paned
 
292
        return self.revisionview
384
293
 
385
294
    def _tag_selected_cb(self, menuitem, revid):
386
295
        self.treeview.set_revision_id(revid)
391
300
        parents  = self.treeview.get_parents()
392
301
        children = self.treeview.get_children()
393
302
 
394
 
        self.revision_menu.set_revision_ids([revision.revision_id])
395
 
 
396
303
        if revision and revision != NULL_REVISION:
397
304
            prev_menu = gtk.Menu()
398
305
            if len(parents) > 0:
437
344
 
438
345
            self.revisionview.set_revision(revision)
439
346
            self.revisionview.set_children(children)
440
 
            self.update_diff_panel(revision, parents)
441
 
 
 
347
    
442
348
    def _tree_revision_activated(self, widget, path, col):
443
349
        # TODO: more than one parent
444
350
        """Callback for when a treeview row gets activated."""
446
352
        parents  = self.treeview.get_parents()
447
353
 
448
354
        if len(parents) == 0:
449
 
            parent_id = NULL_REVISION
 
355
            parent_id = None
450
356
        else:
451
357
            parent_id = parents[0]
452
358
 
453
359
        self.show_diff(revision.revision_id, parent_id)
454
360
        self.treeview.grab_focus()
455
 
        
 
361
    
 
362
 
456
363
    def _back_clicked_cb(self, *args):
457
364
        """Callback for when the back button is clicked."""
458
365
        self.treeview.back()
486
393
        self.treeview.set_property('compact', self.compact_view)
487
394
        self.treeview.refresh()
488
395
 
489
 
    def _branch_index_cb(self, w):
490
 
        from bzrlib.plugins.search import index as _mod_index
491
 
        _mod_index.index_url(self.branch.base)
492
 
 
493
 
    def _branch_search_cb(self, w):
494
 
        from bzrlib.plugins.search import index as _mod_index
495
 
        from bzrlib.plugins.gtk.search import SearchDialog
496
 
        from bzrlib.plugins.search import errors as search_errors
497
 
 
 
396
    def _tag_revision_cb(self, w):
498
397
        try:
499
 
            index = _mod_index.open_index_url(self.branch.base)
500
 
        except search_errors.NoSearchIndex:
501
 
            dialog = gtk.MessageDialog(self, type=gtk.MESSAGE_QUESTION, 
502
 
                buttons=gtk.BUTTONS_OK_CANCEL, 
503
 
                message_format="This branch has not been indexed yet. "
504
 
                               "Index now?")
505
 
            if dialog.run() == gtk.RESPONSE_OK:
506
 
                dialog.destroy()
507
 
                index = _mod_index.index_url(self.branch.base)
508
 
            else:
509
 
                dialog.destroy()
510
 
                return
511
 
 
512
 
        dialog = SearchDialog(index)
513
 
        
514
 
        if dialog.run() == gtk.RESPONSE_OK:
515
 
            self.set_revision(dialog.get_revision())
516
 
 
517
 
        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)
518
411
 
519
412
    def _about_dialog_cb(self, w):
520
413
        from bzrlib.plugins.gtk.about import AboutDialog
527
420
 
528
421
    def _toolbar_visibility_changed(self, col):
529
422
        if col.get_active():
530
 
            self.toolbar.show()
 
423
            self.toolbar.show() 
531
424
        else:
532
425
            self.toolbar.hide()
533
 
        self.config.set_user_option('viz-toolbar-visible', col.get_active())
534
 
 
535
 
    def _make_diff_nonzero_size(self):
536
 
        """make sure the diff isn't zero-width or zero-height"""
537
 
        alloc = self.diff.get_allocation()
538
 
        if (alloc.width < 10) or (alloc.height < 10):
539
 
            width, height = self.get_size()
540
 
            self.revisionview.set_size_request(width/3, int(height / 2.5))
541
 
 
542
 
    def _diff_visibility_changed(self, col):
543
 
        """Hide or show the diff panel."""
544
 
        if col.get_active():
545
 
            self.diff.show()
546
 
            self._make_diff_nonzero_size()
547
 
        else:
548
 
            self.diff.hide()
549
 
        self.config.set_user_option('viz-show-diffs', str(col.get_active()))
550
 
        self.update_diff_panel()
551
 
 
552
 
    def _diff_placement_changed(self, col):
553
 
        """Toggle the diff panel's position."""
554
 
        self.config.set_user_option('viz-wide-diffs', str(col.get_active()))
555
 
 
556
 
        old = self.paned.get_child2()
557
 
        self.paned.remove(old)
558
 
        self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)
559
 
        self._make_diff_nonzero_size()
560
 
 
561
 
        self.treeview.emit('revision-selected')
562
 
    
563
 
    def _diff_wrap_changed(self, widget):
564
 
        """Toggle word wrap in the diff widget."""
565
 
        self.config.set_user_option('viz-wrap-diffs', widget.get_active())
566
 
        self.diff._on_wraplines_toggled(widget)
567
 
    
 
426
 
568
427
    def _show_about_cb(self, w):
569
428
        dialog = AboutDialog()
570
429
        dialog.connect('response', lambda d,r: d.destroy())
578
437
 
579
438
        if self.branch.supports_tags():
580
439
            tags = self.branch.tags.get_tag_dict().items()
581
 
            tags.sort(reverse=True)
 
440
            tags.sort()
 
441
            tags.reverse()
582
442
            for tag, revid in tags:
583
443
                tag_image = gtk.Image()
584
444
                tag_image.set_from_file(icon_path('tag-16.png'))
585
445
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
586
446
                tag_item.set_image(tag_image)
587
447
                tag_item.connect('activate', self._tag_selected_cb, revid)
588
 
                tag_item.set_sensitive(self.treeview.has_revision_id(revid))
589
448
                menu.add(tag_item)
590
449
            self.go_menu_tags.set_submenu(menu)
591
450
 
595
454
 
596
455
        self.go_menu_tags.show_all()
597
456
 
598
 
    def _load_size(self, name):
599
 
        """Read and parse 'name' from self.config.
600
 
        The value is a string, formatted as WIDTHxHEIGHT
601
 
        Returns None, or (width, height)
602
 
        """
603
 
        size = self.config.get_user_option(name)
604
 
        if size:
605
 
            width, height = [int(num) for num in size.split('x')]
606
 
            # avoid writing config every time we start
607
 
            return width, height
608
 
        return None
609
 
 
610
 
    def show_diff(self, revid=None, parentid=NULL_REVISION):
 
457
    def show_diff(self, revid=None, parentid=None):
611
458
        """Open a new window to show a diff between the given revisions."""
612
459
        from bzrlib.plugins.gtk.diff import DiffWindow
613
460
        window = DiffWindow(parent=self)
614
461
 
 
462
        if parentid is None:
 
463
            parentid = NULL_REVISION
 
464
 
615
465
        rev_tree    = self.branch.repository.revision_tree(revid)
616
466
        parent_tree = self.branch.repository.revision_tree(parentid)
617
467
 
618
 
        description = revid + " - " + self.branch._get_nick(local=True)
 
468
        description = revid + " - " + self.branch.nick
619
469
        window.set_diff(description, rev_tree, parent_tree)
620
470
        window.show()
621
471
 
622
 
    def update_diff_panel(self, revision=None, parents=None):
623
 
        """Show the current revision in the diff panel."""
624
 
        if self.config.get_user_option('viz-show-diffs') != 'True':
625
 
            return
626
 
 
627
 
        if not revision: # default to selected row
628
 
            revision = self.treeview.get_revision()
629
 
        if revision == NULL_REVISION:
630
 
            return
631
 
 
632
 
        if not parents: # default to selected row's parents
633
 
            parents  = self.treeview.get_parents()
634
 
        if len(parents) == 0:
635
 
            parent_id = NULL_REVISION
636
 
        else:
637
 
            parent_id = parents[0]
638
 
 
639
 
        rev_tree    = self.branch.repository.revision_tree(revision.revision_id)
640
 
        parent_tree = self.branch.repository.revision_tree(parent_id)
641
 
 
642
 
        self.diff.set_diff(rev_tree, parent_tree)
643
 
        if self.config.get_user_option('viz-wrap-diffs') == 'True':
644
 
            self.diff._on_wraplines_toggled(wrap=True)
645
 
        self.diff.show_all()
 
472