/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-11-02 14:49:57 UTC
  • mto: (330.6.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 341.
  • Revision ID: daniel.schierbeck@gmail.com-20071102144957-8r4lp70ma5bpk8r8
Renamed logview 'revisionview'.

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