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

  • Committer: Daniel Schierbeck
  • Date: 2007-10-14 15:54:57 UTC
  • mto: This revision was merged to the branch mainline in revision 317.
  • Revision ID: daniel.schierbeck@gmail.com-20071014155457-m3ek29p4ima8ev7d
Added the new Window base class.

Show diffs side-by-side

added added

removed removed

Lines of Context:
revisionmenu.py
23
23
 
24
24
import bzrlib
25
25
import gtk
26
 
from bzrlib import (errors, ui)
27
26
 
28
27
class RevisionPopupMenu(gtk.Menu):
29
28
    def __init__(self, repository, revids, branch=None):
54
53
            item.connect('activate', self.store_merge_directive)
55
54
            # FIXME: self.append(item)
56
55
            self.show_all()
57
 
            
58
 
            self.bzrdir = self.branch.bzrdir
59
 
            self.wt = None
60
 
            try:
61
 
                self.wt = self.bzrdir.open_workingtree()
62
 
            except errors.NoWorkingTree:
63
 
                return False
64
 
            if self.wt :
65
 
                item = gtk.MenuItem("_Revert to this revision")
66
 
                item.connect('activate', self.revert)
67
 
                self.append(item)
68
 
                self.show_all()
69
56
 
70
57
    def store_merge_directive(self, item):
71
58
        from bzrlib.plugins.gtk.mergedirective import CreateMergeDirectiveDialog
74
61
 
75
62
    def show_diff(self, item):
76
63
        from bzrlib.plugins.gtk.diff import DiffWindow
77
 
        window = DiffWindow(parent=self.parent)
 
64
        window = DiffWindow()
78
65
        parentid = self.repository.revision_parents(self.revids[0])[0]
79
66
        (parent_tree, rev_tree) = self.repository.revision_trees(
80
67
            [parentid, self.revids[0]])
99
86
                self.branch.unlock()
100
87
            
101
88
            dialog.destroy()
102
 
    
103
 
    def revert(self, item):
104
 
        pb = ui.ui_factory.nested_progress_bar()
105
 
        revision_tree = self.branch.repository.revision_tree(self.revids[0])
106
 
        try:
107
 
            self.wt.revert(old_tree = revision_tree, pb = pb)
108
 
        finally:
109
 
            pb.finished()