/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: 2011-03-14 20:12:19 UTC
  • Revision ID: jelmer@samba.org-20110314201219-wo692nzwywu6mevh
Fix formatting, imports.

Show diffs side-by-side

added added

removed removed

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