/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 olive/menu.py

  • Committer: Jelmer Vernooij
  • Date: 2009-05-04 20:06:58 UTC
  • Revision ID: jelmer@samba.org-20090504200658-n6hsag1soygn3n1o
Use _get_nick(local=True) rather than .nick to get at a branches' nick, since 
the previous might check the nickname of the master branch, which will be slow.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/menu.py
310
310
        wt = WorkingTree.open_containing(self.path)[0]
311
311
        window = DiffWindow(self.app)
312
312
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
313
 
        window.set_diff(wt.branch.nick, wt, parent_tree)
 
313
        window.set_diff(wt.branch._get_nick(local=True), wt, parent_tree)
314
314
        window.set_file(wt.relpath(self.path + os.sep + self.selected))
315
315
        window.show()
316
316
    
367
367
        wt = WorkingTree.open_containing(self.path)[0]
368
368
        window = DiffWindow(self.app)
369
369
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
370
 
        window.set_diff(wt.branch.nick, wt, parent_tree)
 
370
        window.set_diff(wt.branch._get_nick(local=True), wt, parent_tree)
371
371
        window.show()
372
372
    
373
373
    def view_remote(self, action):