/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: 2008-01-13 14:12:49 UTC
  • mto: (423.1.2 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080113141249-gd0i2lknr3yik55r
Moved branch view to its own package.

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
27
from bzrlib.revision import NULL_REVISION
29
28
 
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
 
29
class RevisionPopupMenu(gtk.Menu):
 
30
    def __init__(self, repository, revids, branch=None, wt=None):
 
31
        super(RevisionPopupMenu, self).__init__()
43
32
        self.branch = branch
44
33
        self.repository = repository
45
34
        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
35
        self.revids = revids
53
36
        self.create_items()
54
37
 
57
40
            item = gtk.MenuItem("View _Changes")
58
41
            item.connect('activate', self.show_diff)
59
42
            self.append(item)
 
43
            self.show_all()
60
44
 
61
45
            item = gtk.MenuItem("_Push")
62
46
            item.connect('activate', self.show_push)
63
47
            self.append(item)
 
48
            self.show_all()
64
49
 
65
50
            item = gtk.MenuItem("_Tag Revision")
66
51
            item.connect('activate', self.show_tag)
67
52
            self.append(item)
 
53
            self.show_all()
68
54
 
69
55
            item = gtk.MenuItem("_Merge Directive")
70
56
            item.connect('activate', self.store_merge_directive)
71
57
            # FIXME: self.append(item)
72
 
 
73
 
            item = gtk.MenuItem("_Send Merge Directive")
74
 
            item.connect('activate', self.send_merge_directive)
75
 
            self.append(item)
 
58
            self.show_all()
76
59
            
77
60
            if self.wt:
78
61
                item = gtk.MenuItem("_Revert to this revision")
79
62
                item.connect('activate', self.revert)
80
63
                self.append(item)
81
 
 
82
 
        self.show_all()
 
64
                self.show_all()
83
65
 
84
66
    def store_merge_directive(self, item):
85
67
        from bzrlib.plugins.gtk.mergedirective import CreateMergeDirectiveDialog
86
68
        window = CreateMergeDirectiveDialog(self.branch, self.revids[0])
87
69
        window.show()
88
70
 
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
71
    def show_diff(self, item):
102
72
        from bzrlib.plugins.gtk.diff import DiffWindow
103
 
        window = DiffWindow(parent=self._parent)
104
 
        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
 
105
76
        if len(parentids) == 0:
106
77
            parentid = NULL_REVISION
107
78
        else:
108
79
            parentid = parentids[0]
 
80
 
109
81
        rev_tree    = self.repository.revision_tree(self.revids[0])
110
82
        parent_tree = self.repository.revision_tree(parentid)
111
83
        window.set_diff(self.revids[0], rev_tree, parent_tree)
128
100
            dialog.hide()
129
101
        
130
102
            if response == gtk.RESPONSE_OK:
131
 
                self.emit('tag-added', dialog.tagname, dialog._revid)
 
103
                try:
 
104
                    self.branch.lock_write()
 
105
                    self.branch.tags.set_tag(dialog.tagname, dialog._revid)
 
106
                finally:
 
107
                    self.branch.unlock()
132
108
            
133
109
            dialog.destroy()
134
110