/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
2
#
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
7
#
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
12
#
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
import sys
18
19
try:
20
    import pygtk
21
    pygtk.require("2.0")
22
except:
23
    pass
24
try:
25
    import gtk
26
    import gtk.glade
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
27
    import gobject
0.8.26 by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit)
28
    import pango
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
29
except:
30
    sys.exit(1)
31
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
32
from bzrlib import version_info
0.8.26 by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit)
33
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
34
if version_info < (0, 9):
0.8.26 by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit)
35
    # function deprecated after 0.9
36
    from bzrlib.delta import compare_trees
37
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
38
import bzrlib.errors as errors
39
from bzrlib.workingtree import WorkingTree
40
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
41
class OliveCommit:
42
    """ Display Commit dialog and perform the needed actions. """
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
43
    def __init__(self, gladefile, comm, dialog):
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
44
        """ Initialize the Commit dialog. """
45
        self.gladefile = gladefile
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
46
        self.glade = gtk.glade.XML(self.gladefile, 'window_commit', 'olive-gtk')
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
47
        
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
48
        # Communication object
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
49
        self.comm = comm
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
50
        # Dialog object
51
        self.dialog = dialog
52
        
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
53
        # Get some important widgets
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
54
        self.window = self.glade.get_widget('window_commit')
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
55
        self.checkbutton_local = self.glade.get_widget('checkbutton_commit_local')
56
        self.textview = self.glade.get_widget('textview_commit')
57
        self.file_view = self.glade.get_widget('treeview_commit_select')
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
58
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
59
        # Check if current location is a branch
60
        try:
61
            (self.wt, path) = WorkingTree.open_containing(self.comm.get_path())
62
            branch = self.wt.branch
63
        except errors.NotBranchError:
64
            self.notbranch = True
65
            return
66
        except:
67
            raise
68
69
        file_id = self.wt.path2id(path)
70
71
        self.notbranch = False
72
        if file_id is None:
73
            self.notbranch = True
74
            return
75
        
76
        # Set the delta
77
        self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
78
        if version_info < (0, 9):
0.8.23 by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update
79
            self.delta = compare_trees(self.old_tree, self.wt)
80
        else:
81
            self.delta = self.wt.changes_from(self.old_tree)
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
82
        
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
83
        # Dictionary for signal_autoconnect
84
        dic = { "on_button_commit_commit_clicked": self.commit,
85
                "on_button_commit_cancel_clicked": self.close }
86
        
87
        # Connect the signals to the handlers
88
        self.glade.signal_autoconnect(dic)
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
89
        
90
        # Create the file list
91
        self._create_file_view()
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
92
    
93
    def display(self):
94
        """ Display the Push dialog. """
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
95
        if self.notbranch:
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
96
            self.dialog.error_dialog(_('Directory is not a branch'),
97
                                     _('You can perform this action only in a branch.'))
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
98
            self.close()
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
99
        else:
0.8.23 by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update
100
            from olive.backend.info import is_checkout
101
            if is_checkout(self.comm.get_path()):
102
                # we have a checkout, so the local commit checkbox must appear
103
                self.checkbutton_local.show()
104
            
0.8.26 by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit)
105
            self.textview.modify_font(pango.FontDescription("Monospace"))
0.8.23 by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update
106
            self.window.show()
107
            
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
108
    
109
    # This code is from Jelmer Vernooij's bzr-gtk branch
110
    def _create_file_view(self):
0.8.21 by Szilveszter Farkas (Phanatic)
2006-07-25 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
111
        self.file_store = gtk.ListStore(gobject.TYPE_BOOLEAN,
112
                                        gobject.TYPE_STRING,
113
                                        gobject.TYPE_STRING)
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
114
        self.file_view.set_model(self.file_store)
115
        crt = gtk.CellRendererToggle()
116
        crt.set_property("activatable", True)
117
        crt.connect("toggled", self._toggle_commit, self.file_store)
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
118
        self.file_view.append_column(gtk.TreeViewColumn(_('Commit'),
0.8.21 by Szilveszter Farkas (Phanatic)
2006-07-25 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
119
                                     crt, active=0))
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
120
        self.file_view.append_column(gtk.TreeViewColumn(_('Path'),
0.8.21 by Szilveszter Farkas (Phanatic)
2006-07-25 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
121
                                     gtk.CellRendererText(), text=1))
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
122
        self.file_view.append_column(gtk.TreeViewColumn(_('Type'),
0.8.21 by Szilveszter Farkas (Phanatic)
2006-07-25 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
123
                                     gtk.CellRendererText(), text=2))
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
124
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
125
        for path, id, kind in self.delta.added:
126
            self.file_store.append([ True, path, _('added') ])
127
128
        for path, id, kind in self.delta.removed:
129
            self.file_store.append([ True, path, _('removed') ])
130
131
        for oldpath, newpath, id, kind, text_modified, meta_modified in self.delta.renamed:
132
            self.file_store.append([ True, oldpath, _('renamed') ])
133
134
        for path, id, kind, text_modified, meta_modified in self.delta.modified:
135
            self.file_store.append([ True, path, _('modified') ])
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
136
    
137
    def _get_specific_files(self):
138
        ret = []
139
        it = self.file_store.get_iter_first()
140
        while it:
141
            if self.file_store.get_value(it, 0):
0.8.21 by Szilveszter Farkas (Phanatic)
2006-07-25 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
142
                ret.append(self.file_store.get_value(it, 1))
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
143
            it = self.file_store.iter_next(it)
144
145
        return ret
146
    # end of bzr-gtk code
147
    
148
    def _toggle_commit(self, cell, path, model):
149
        model[path][0] = not model[path][0]
150
        return
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
151
    
152
    def commit(self, widget):
0.8.26 by Szilveszter Farkas (Phanatic)
Implemented Diff window; added menu.py (was missing from last commit)
153
        textbuffer = self.textview.get_buffer()
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
154
        start, end = textbuffer.get_bounds()
155
        message = textbuffer.get_text(start, end)
156
        
157
        checkbutton_strict = self.glade.get_widget('checkbutton_commit_strict')
158
        checkbutton_force = self.glade.get_widget('checkbutton_commit_force')
159
        
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
160
        specific_files = self._get_specific_files()
161
        
0.8.23 by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update
162
        self.comm.set_busy(self.window)
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
163
        # merged from Jelmer Vernooij's olive integration branch
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
164
        try:
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
165
            self.wt.commit(message, 
166
                           allow_pointless=checkbutton_force.get_active(),
167
                           strict=checkbutton_strict.get_active(),
0.8.23 by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update
168
                           local=self.checkbutton_local.get_active(),
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
169
                           specific_files=specific_files)
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
170
        except errors.NotBranchError:
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
171
            self.dialog.error_dialog(_('Directory is not a branch'),
172
                                     _('You can perform this action only in a branch.'))
0.8.23 by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update
173
            self.comm.set_busy(self.window, False)
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
174
            return
175
        except errors.LocalRequiresBoundBranch:
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
176
            self.dialog.error_dialog(_('Directory is not a checkout'),
177
                                     _('You can perform local commit only on checkouts.'))
0.8.23 by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update
178
            self.comm.set_busy(self.window, False)
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
179
            return
180
        except errors.PointlessCommit:
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
181
            self.dialog.error_dialog(_('No changes to commit'),
182
                                     _('Try force commit if you want to commit anyway.'))
0.8.23 by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update
183
            self.comm.set_busy(self.window, False)
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
184
            return
185
        except errors.ConflictsInTree:
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
186
            self.dialog.error_dialog(_('Conflicts in tree'),
187
                                     _('You need to resolve the conflicts before committing.'))
0.8.23 by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update
188
            self.comm.set_busy(self.window, False)
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
189
            return
190
        except errors.StrictCommitFailed:
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
191
            self.dialog.error_dialog(_('Strict commit failed'),
192
                                     _('There are unknown files in the working tree.\nPlease add or delete them.'))
0.8.23 by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update
193
            self.comm.set_busy(self.window, False)
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
194
            return
195
        except errors.BoundBranchOutOfDate, errmsg:
0.8.55 by Szilveszter Farkas (Phanatic)
Gettext support added.
196
            self.dialog.error_dialog(_('Bound branch is out of date'),
197
                                     _('%s') % errmsg)
0.8.23 by Szilveszter Farkas (Phanatic)
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update
198
            self.comm.set_busy(self.window, False)
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
199
            return
200
        except:
201
            raise
202
        
203
        self.close()
204
        self.comm.refresh_right()
205
        
206
    def close(self, widget=None):
207
        self.window.destroy()