/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: Jasper Groenewegen
  • Date: 2008-07-27 12:01:40 UTC
  • mfrom: (576.3.2 improve-merge)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: colbrac@xs4all.nl-20080727120140-1agdlzkc9fumjk5f
Merge merge dialog improvements

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
 
 
27
 
class RevisionPopupMenu(gtk.Menu):
28
 
    def __init__(self, repository, revids, branch=None):
29
 
        super(RevisionPopupMenu, self).__init__()
 
26
import gobject
 
27
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
30
43
        self.branch = branch
31
44
        self.repository = repository
 
45
        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)
32
52
        self.revids = revids
33
53
        self.create_items()
34
54
 
35
55
    def create_items(self):
36
56
        if len(self.revids) == 1:
37
 
            item = gtk.MenuItem("View _Diff")
 
57
            item = gtk.MenuItem("View _Changes")
38
58
            item.connect('activate', self.show_diff)
39
59
            self.append(item)
40
 
            self.show_all()
41
60
 
42
61
            item = gtk.MenuItem("_Push")
43
62
            item.connect('activate', self.show_push)
44
63
            self.append(item)
45
 
            self.show_all()
46
64
 
47
65
            item = gtk.MenuItem("_Tag Revision")
48
66
            item.connect('activate', self.show_tag)
49
67
            self.append(item)
50
 
            self.show_all()
51
68
 
52
69
            item = gtk.MenuItem("_Merge Directive")
53
70
            item.connect('activate', self.store_merge_directive)
54
71
            # FIXME: self.append(item)
55
 
            self.show_all()
 
72
 
 
73
            item = gtk.MenuItem("_Send Merge Directive")
 
74
            item.connect('activate', self.send_merge_directive)
 
75
            self.append(item)
 
76
            
 
77
            if self.wt:
 
78
                item = gtk.MenuItem("_Revert to this revision")
 
79
                item.connect('activate', self.revert)
 
80
                self.append(item)
 
81
 
 
82
        self.show_all()
56
83
 
57
84
    def store_merge_directive(self, item):
58
85
        from bzrlib.plugins.gtk.mergedirective import CreateMergeDirectiveDialog
59
86
        window = CreateMergeDirectiveDialog(self.branch, self.revids[0])
60
87
        window.show()
61
88
 
 
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
 
62
101
    def show_diff(self, item):
63
102
        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]])
 
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)
68
111
        window.set_diff(self.revids[0], rev_tree, parent_tree)
69
112
        window.show()
70
113
 
71
114
    def show_push(self, item):
72
115
        from bzrlib.plugins.gtk.push import PushDialog
73
116
        dialog = PushDialog(self.repository, self.revids[0], self.branch)
74
 
        dialog.run()
 
117
        response = dialog.run()
 
118
 
 
119
        if response != gtk.RESPONSE_NONE:
 
120
            dialog.destroy()
75
121
 
76
122
    def show_tag(self, item):
77
123
        from bzrlib.plugins.gtk.tags import AddTagDialog
78
124
        dialog = AddTagDialog(self.repository, self.revids[0], self.branch)
79
125
        response = dialog.run()
 
126
 
80
127
        if response != gtk.RESPONSE_NONE:
81
128
            dialog.hide()
82
129
        
83
130
            if response == gtk.RESPONSE_OK:
84
 
                self.branch.lock_write()
85
 
                self.branch.tags.set_tag(dialog.tagname, dialog._revid)
86
 
                self.branch.unlock()
 
131
                self.emit('tag-added', dialog.tagname, dialog._revid)
87
132
            
88
133
            dialog.destroy()
 
134
    
 
135
    def revert(self, item):
 
136
        pb = ui.ui_factory.nested_progress_bar()
 
137
        revision_tree = self.branch.repository.revision_tree(self.revids[0])
 
138
        try:
 
139
            self.wt.revert(old_tree = revision_tree, pb = pb)
 
140
        finally:
 
141
            pb.finished()