/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

Allow bzr-gtk and Bazaar versions to be out of sync. No longer warn about 
newer versions of Bazaar, on the assumption the API is sufficiently stable now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
revisionmenu.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
"""Simple popup menu for revisions."""
17
17
 
18
 
from gi.repository import Gtk
19
 
from gi.repository import GObject
20
 
from bzrlib import ui
 
18
try:
 
19
    import pygtk
 
20
    pygtk.require("2.0")
 
21
except:
 
22
    pass
 
23
 
 
24
import bzrlib
 
25
import gtk
 
26
from bzrlib import (errors, ui)
21
27
from bzrlib.revision import NULL_REVISION
22
28
 
23
 
class RevisionMenu(Gtk.Menu):
24
 
 
25
 
    __gsignals__ = {
26
 
            'tag-added': (
27
 
                GObject.SignalFlags.RUN_FIRST,
28
 
                None,
29
 
                (GObject.TYPE_STRING, GObject.TYPE_STRING)
30
 
            )
31
 
    }
32
 
 
33
 
    def __init__(self, repository, revids, branch=None, wt=None, parent=None):
34
 
        super(RevisionMenu, self).__init__()
35
 
        self._parent = parent
 
29
class RevisionPopupMenu(gtk.Menu):
 
30
    def __init__(self, repository, revids, branch=None, wt=None):
 
31
        super(RevisionPopupMenu, self).__init__()
36
32
        self.branch = branch
37
33
        self.repository = repository
38
34
        self.wt = wt
39
 
        self.set_revision_ids(revids)
40
 
 
41
 
    def set_revision_ids(self, revids):
42
 
        assert isinstance(revids, list)
43
 
        for c in self.get_children():
44
 
            self.remove(c)
45
35
        self.revids = revids
46
36
        self.create_items()
47
37
 
48
38
    def create_items(self):
49
39
        if len(self.revids) == 1:
50
 
            item = Gtk.MenuItem.new_with_mnemonic("View _Changes")
 
40
            item = gtk.MenuItem("View _Changes")
51
41
            item.connect('activate', self.show_diff)
52
42
            self.append(item)
 
43
            self.show_all()
53
44
 
54
 
            item = Gtk.MenuItem.new_with_mnemonic("_Push")
 
45
            item = gtk.MenuItem("_Push")
55
46
            item.connect('activate', self.show_push)
56
47
            self.append(item)
 
48
            self.show_all()
57
49
 
58
 
            item = Gtk.MenuItem.new_with_mnemonic("_Tag Revision")
 
50
            item = gtk.MenuItem("_Tag Revision")
59
51
            item.connect('activate', self.show_tag)
60
52
            self.append(item)
 
53
            self.show_all()
61
54
 
62
 
            item = Gtk.MenuItem.new_with_mnemonic("_Merge Directive")
 
55
            item = gtk.MenuItem("_Merge Directive")
63
56
            item.connect('activate', self.store_merge_directive)
64
57
            # FIXME: self.append(item)
65
 
 
66
 
            item = Gtk.MenuItem.new_with_mnemonic("_Send Merge Directive")
67
 
            item.connect('activate', self.send_merge_directive)
68
 
            self.append(item)
69
 
 
 
58
            self.show_all()
 
59
            
70
60
            if self.wt:
71
 
                item = Gtk.MenuItem.new_with_mnemonic(
72
 
                    "_Revert to this revision")
 
61
                item = gtk.MenuItem("_Revert to this revision")
73
62
                item.connect('activate', self.revert)
74
63
                self.append(item)
75
 
 
76
 
        self.show_all()
 
64
                self.show_all()
77
65
 
78
66
    def store_merge_directive(self, item):
79
67
        from bzrlib.plugins.gtk.mergedirective import CreateMergeDirectiveDialog
80
68
        window = CreateMergeDirectiveDialog(self.branch, self.revids[0])
81
69
        window.show()
82
70
 
83
 
    def send_merge_directive(self, item):
84
 
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
85
 
        from cStringIO import StringIO
86
 
        window = SendMergeDirectiveDialog(self.branch, self.revids[0])
87
 
        if window.run() == Gtk.ResponseType.OK:
88
 
            outf = StringIO()
89
 
            outf.writelines(window.get_merge_directive().to_lines())
90
 
            mail_client = self.branch.get_config().get_mail_client()
91
 
            mail_client.compose_merge_request(window.get_mail_to(), "[MERGE]",
92
 
                                              outf.getvalue())
93
 
        window.destroy()
94
 
 
95
71
    def show_diff(self, item):
96
72
        from bzrlib.plugins.gtk.diff import DiffWindow
97
 
        window = DiffWindow(parent=self._parent)
98
 
        parentids = self.repository.get_revision(self.revids[0]).parent_ids
 
73
        window = DiffWindow(parent=self.parent)
 
74
        parentids = self.repository.revision_parents(self.revids[0])
 
75
 
99
76
        if len(parentids) == 0:
100
77
            parentid = NULL_REVISION
101
78
        else:
102
79
            parentid = parentids[0]
 
80
 
103
81
        rev_tree    = self.repository.revision_tree(self.revids[0])
104
82
        parent_tree = self.repository.revision_tree(parentid)
105
83
        window.set_diff(self.revids[0], rev_tree, parent_tree)
110
88
        dialog = PushDialog(self.repository, self.revids[0], self.branch)
111
89
        response = dialog.run()
112
90
 
113
 
        if response != Gtk.ResponseType.NONE:
 
91
        if response != gtk.RESPONSE_NONE:
114
92
            dialog.destroy()
115
93
 
116
94
    def show_tag(self, item):
118
96
        dialog = AddTagDialog(self.repository, self.revids[0], self.branch)
119
97
        response = dialog.run()
120
98
 
121
 
        if response != Gtk.ResponseType.NONE:
 
99
        if response != gtk.RESPONSE_NONE:
122
100
            dialog.hide()
123
 
 
124
 
            if response == Gtk.ResponseType.OK:
125
 
                self.emit('tag-added', dialog.tagname, dialog._revid)
126
 
 
 
101
        
 
102
            if response == gtk.RESPONSE_OK:
 
103
                try:
 
104
                    self.branch.lock_write()
 
105
                    self.branch.tags.set_tag(dialog.tagname, dialog._revid)
 
106
                finally:
 
107
                    self.branch.unlock()
 
108
            
127
109
            dialog.destroy()
128
 
 
 
110
    
129
111
    def revert(self, item):
130
112
        pb = ui.ui_factory.nested_progress_bar()
131
113
        revision_tree = self.branch.repository.revision_tree(self.revids[0])