/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/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2007-10-30 20:36:16 UTC
  • mfrom: (322.1.1 trunk)
  • mto: (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071030203616-op14zvvmflw6ds1n
Merge in Jelmer's trunk update + conflict resolution.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
733
733
    
734
734
    def on_menuitem_stats_diff_activate(self, widget):
735
735
        """ Statistics/Differences... menu handler. """
736
 
        window = DiffWindow()
 
736
        window = DiffWindow(parent=self.window)
737
737
        parent_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
738
738
        window.set_diff(self.wt.branch.nick, self.wt, parent_tree)
739
739
        window.show()
749
749
    
750
750
    def on_menuitem_stats_log_activate(self, widget):
751
751
        """ Statistics/Log... menu handler. """
752
 
        window = branchwin.BranchWindow(parent=self.window)
 
752
 
753
753
        if not self.remote:
754
 
            window.set_branch(self.wt.branch, self.wt.branch.last_revision(), None)
 
754
            branch = self.wt.branch
755
755
        else:
756
 
            window.set_branch(self.remote_branch, self.remote_branch.last_revision(), None)
 
756
            branch = self.remote_branch
 
757
 
 
758
        window = branchwin.BranchWindow(branch, branch.last_revision(), None, parent=self.window)
757
759
        window.show()
758
760
    
759
761
    def on_menuitem_view_refresh_activate(self, widget):