/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: Jelmer Vernooij
  • Date: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

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
 
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)
27
 
 
28
 
class RevisionPopupMenu(gtk.Menu):
29
 
    def __init__(self, repository, revids, branch=None):
30
 
        super(RevisionPopupMenu, self).__init__()
 
18
from gi.repository import Gtk
 
19
from gi.repository import GObject
 
20
from bzrlib import ui
 
21
from bzrlib.revision import NULL_REVISION
 
22
 
 
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
31
36
        self.branch = branch
32
37
        self.repository = repository
 
38
        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)
33
45
        self.revids = revids
34
46
        self.create_items()
35
47
 
36
48
    def create_items(self):
37
49
        if len(self.revids) == 1:
38
 
            item = gtk.MenuItem("View _Diff")
 
50
            item = Gtk.MenuItem.new_with_mnemonic("View _Changes")
39
51
            item.connect('activate', self.show_diff)
40
52
            self.append(item)
41
 
            self.show_all()
42
53
 
43
 
            item = gtk.MenuItem("_Push")
 
54
            item = Gtk.MenuItem.new_with_mnemonic("_Push")
44
55
            item.connect('activate', self.show_push)
45
56
            self.append(item)
46
 
            self.show_all()
47
57
 
48
 
            item = gtk.MenuItem("_Tag Revision")
 
58
            item = Gtk.MenuItem.new_with_mnemonic("_Tag Revision")
49
59
            item.connect('activate', self.show_tag)
50
60
            self.append(item)
51
 
            self.show_all()
52
61
 
53
 
            item = gtk.MenuItem("_Merge Directive")
 
62
            item = Gtk.MenuItem.new_with_mnemonic("_Merge Directive")
54
63
            item.connect('activate', self.store_merge_directive)
55
64
            # FIXME: self.append(item)
56
 
            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")
 
65
 
 
66
            item = Gtk.MenuItem.new_with_mnemonic("_Send Merge Directive")
 
67
            item.connect('activate', self.send_merge_directive)
 
68
            self.append(item)
 
69
 
 
70
            if self.wt:
 
71
                item = Gtk.MenuItem.new_with_mnemonic(
 
72
                    "_Revert to this revision")
66
73
                item.connect('activate', self.revert)
67
74
                self.append(item)
68
 
                self.show_all()
 
75
 
 
76
        self.show_all()
69
77
 
70
78
    def store_merge_directive(self, item):
71
79
        from bzrlib.plugins.gtk.mergedirective import CreateMergeDirectiveDialog
72
80
        window = CreateMergeDirectiveDialog(self.branch, self.revids[0])
73
81
        window.show()
74
82
 
 
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
 
75
95
    def show_diff(self, item):
76
96
        from bzrlib.plugins.gtk.diff import DiffWindow
77
 
        window = DiffWindow(parent=self.parent)
78
 
        parentid = self.repository.revision_parents(self.revids[0])[0]
79
 
        (parent_tree, rev_tree) = self.repository.revision_trees(
80
 
            [parentid, self.revids[0]])
 
97
        window = DiffWindow(parent=self._parent)
 
98
        parentids = self.repository.get_revision(self.revids[0]).parent_ids
 
99
        if len(parentids) == 0:
 
100
            parentid = NULL_REVISION
 
101
        else:
 
102
            parentid = parentids[0]
 
103
        rev_tree    = self.repository.revision_tree(self.revids[0])
 
104
        parent_tree = self.repository.revision_tree(parentid)
81
105
        window.set_diff(self.revids[0], rev_tree, parent_tree)
82
106
        window.show()
83
107
 
84
108
    def show_push(self, item):
85
109
        from bzrlib.plugins.gtk.push import PushDialog
86
110
        dialog = PushDialog(self.repository, self.revids[0], self.branch)
87
 
        dialog.run()
 
111
        response = dialog.run()
 
112
 
 
113
        if response != Gtk.ResponseType.NONE:
 
114
            dialog.destroy()
88
115
 
89
116
    def show_tag(self, item):
90
117
        from bzrlib.plugins.gtk.tags import AddTagDialog
91
118
        dialog = AddTagDialog(self.repository, self.revids[0], self.branch)
92
119
        response = dialog.run()
93
 
        if response != gtk.RESPONSE_NONE:
 
120
 
 
121
        if response != Gtk.ResponseType.NONE:
94
122
            dialog.hide()
95
 
        
96
 
            if response == gtk.RESPONSE_OK:
97
 
                self.branch.lock_write()
98
 
                self.branch.tags.set_tag(dialog.tagname, dialog._revid)
99
 
                self.branch.unlock()
100
 
            
 
123
 
 
124
            if response == Gtk.ResponseType.OK:
 
125
                self.emit('tag-added', dialog.tagname, dialog._revid)
 
126
 
101
127
            dialog.destroy()
102
 
    
 
128
 
103
129
    def revert(self, item):
104
130
        pb = ui.ui_factory.nested_progress_bar()
105
131
        revision_tree = self.branch.repository.revision_tree(self.revids[0])