/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: John Arbash Meinel
  • Date: 2007-11-02 22:08:54 UTC
  • mto: (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071102220854-thegr866sz1tbwob
Finish connecting the 'Commit all changes' radio buttons.

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
27
 
30
28
class RevisionPopupMenu(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):
 
29
    def __init__(self, repository, revids, branch=None):
41
30
        super(RevisionPopupMenu, self).__init__()
42
31
        self.branch = branch
43
32
        self.repository = repository
44
 
        self.wt = wt
45
33
        self.revids = revids
46
34
        self.create_items()
47
35
 
48
36
    def create_items(self):
49
37
        if len(self.revids) == 1:
50
 
            item = gtk.MenuItem("View _Changes")
 
38
            item = gtk.MenuItem("View _Diff")
51
39
            item.connect('activate', self.show_diff)
52
40
            self.append(item)
53
41
            self.show_all()
67
55
            # FIXME: self.append(item)
68
56
            self.show_all()
69
57
            
70
 
            if self.wt:
 
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 :
71
65
                item = gtk.MenuItem("_Revert to this revision")
72
66
                item.connect('activate', self.revert)
73
67
                self.append(item)
81
75
    def show_diff(self, item):
82
76
        from bzrlib.plugins.gtk.diff import DiffWindow
83
77
        window = DiffWindow(parent=self.parent)
84
 
        parentids = self.repository.revision_parents(self.revids[0])
85
 
 
86
 
        if len(parentids) == 0:
87
 
            parentid = NULL_REVISION
88
 
        else:
89
 
            parentid = parentids[0]
90
 
 
91
 
        rev_tree    = self.repository.revision_tree(self.revids[0])
92
 
        parent_tree = self.repository.revision_tree(parentid)
 
78
        parentid = self.repository.revision_parents(self.revids[0])[0]
 
79
        (parent_tree, rev_tree) = self.repository.revision_trees(
 
80
            [parentid, self.revids[0]])
93
81
        window.set_diff(self.revids[0], rev_tree, parent_tree)
94
82
        window.show()
95
83
 
96
84
    def show_push(self, item):
97
85
        from bzrlib.plugins.gtk.push import PushDialog
98
86
        dialog = PushDialog(self.repository, self.revids[0], self.branch)
99
 
        response = dialog.run()
100
 
 
101
 
        if response != gtk.RESPONSE_NONE:
102
 
            dialog.destroy()
 
87
        dialog.run()
103
88
 
104
89
    def show_tag(self, item):
105
90
        from bzrlib.plugins.gtk.tags import AddTagDialog
106
91
        dialog = AddTagDialog(self.repository, self.revids[0], self.branch)
107
92
        response = dialog.run()
108
 
 
109
93
        if response != gtk.RESPONSE_NONE:
110
94
            dialog.hide()
111
95
        
112
96
            if response == gtk.RESPONSE_OK:
113
 
                self.emit('tag-added', dialog.tagname, dialog._revid)
 
97
                self.branch.lock_write()
 
98
                self.branch.tags.set_tag(dialog.tagname, dialog._revid)
 
99
                self.branch.unlock()
114
100
            
115
101
            dialog.destroy()
116
102