/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
18
18
from bzrlib.plugins.gtk.tags import AddTagDialog
19
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
20
20
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
21
 
 
22
 
from bzrlib.config import BranchConfig, GlobalConfig
23
21
from bzrlib.revision import Revision, NULL_REVISION
24
 
from bzrlib.trace import mutter
 
22
from bzrlib.config import BranchConfig
 
23
from bzrlib.config import GlobalConfig
25
24
 
26
25
class BranchWindow(Window):
27
26
    """Branch window.
67
66
 
68
67
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
69
68
        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
69
 
72
70
        self.accel_group = gtk.AccelGroup()
73
71
        self.add_accel_group(self.accel_group)
86
84
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
87
85
        self.next_rev_action.connect_accelerator()
88
86
 
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
87
        self.construct()
96
88
 
97
89
    def set_revision(self, revid):
152
144
        view_menuitem = gtk.MenuItem("_View")
153
145
        view_menuitem.set_submenu(view_menu)
154
146
 
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
147
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
162
148
        view_menu_toolbar.set_active(True)
163
149
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
209
195
 
210
196
        revision_menu_diff = gtk.MenuItem("View Changes")
211
197
        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)
 
198
                lambda w: self.treeview.show_diff())
217
199
 
218
200
        revision_menu_tag = gtk.MenuItem("Tag Revision")
219
201
        revision_menu_tag.connect('activate', self._tag_revision_cb)
220
202
 
221
203
        revision_menu.add(revision_menu_tag)
222
204
        revision_menu.add(revision_menu_diff)
223
 
        revision_menu.add(revision_menu_compare)
224
205
 
225
206
        branch_menu = gtk.Menu()
226
207
        branch_menuitem = gtk.MenuItem("_Branch")
229
210
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
230
211
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
231
212
 
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
213
        help_menu = gtk.Menu()
242
214
        help_menuitem = gtk.MenuItem("_Help")
243
215
        help_menuitem.set_submenu(help_menu)
275
247
            option = self.config.get_user_option(col + '-column-visible')
276
248
            if option is not None:
277
249
                self.treeview.set_property(col + '-column-visible', option == 'True')
278
 
            else:
279
 
                self.treeview.set_property(col + '-column-visible', False)
280
250
 
 
251
        self.treeview.set_property(col + '-column-visible', False)
281
252
        self.treeview.show()
282
253
 
283
254
        align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
387
358
 
388
359
        self.show_diff(revision.revision_id, parent_id)
389
360
        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)    
 
361
    
403
362
 
404
363
    def _back_clicked_cb(self, *args):
405
364
        """Callback for when the back button is clicked."""
419
378
        self.show_diff(revid, parentid)
420
379
        self.treeview.grab_focus()
421
380
 
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
381
    def _set_revision_cb(self, w, revision_id):
439
382
        self.treeview.set_revision_id(revision_id)
440
383
 
466
409
        finally:
467
410
            self.treeview.set_sensitive(True)
468
411
 
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
412
    def _about_dialog_cb(self, w):
474
413
        from bzrlib.plugins.gtk.about import AboutDialog
475
414