/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 olive/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2006-09-28 13:46:16 UTC
  • mfrom: (0.13.13 olive)
  • mto: (0.8.91 merge)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060928134616-6d697f2f0542ed1a
[merge] changes made on the plane back home.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/commit.py
21
21
    pygtk.require("2.0")
22
22
except:
23
23
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.glade
27
 
    import gobject
28
 
    import pango
29
 
except:
30
 
    sys.exit(1)
 
24
import gtk
 
25
import gtk.glade
 
26
import gobject
 
27
import pango
31
28
 
32
29
from bzrlib import version_info
33
30
 
34
31
import bzrlib.errors as errors
35
32
from bzrlib.workingtree import WorkingTree
36
33
 
 
34
from dialog import error_dialog
 
35
from olive import gladefile
 
36
 
37
37
class OliveCommit:
38
38
    """ Display Commit dialog and perform the needed actions. """
39
 
    def __init__(self, gladefile, comm, dialog):
 
39
    def __init__(self, wt, wtpath):
40
40
        """ Initialize the Commit dialog. """
41
 
        self.gladefile = gladefile
42
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_commit', 'olive-gtk')
43
 
        
44
 
        # Communication object
45
 
        self.comm = comm
46
 
        # Dialog object
47
 
        self.dialog = dialog
48
 
        
 
41
        self.glade = gtk.glade.XML(gladefile, 'window_commit', 'olive-gtk')
 
42
        
 
43
        self.wt = wt
 
44
        self.wtpath = wtpath
 
45
 
49
46
        # Get some important widgets
50
47
        self.window = self.glade.get_widget('window_commit')
51
48
        self.checkbutton_local = self.glade.get_widget('checkbutton_commit_local')
52
49
        self.textview = self.glade.get_widget('textview_commit')
53
50
        self.file_view = self.glade.get_widget('treeview_commit_select')
54
51
 
55
 
        # Check if current location is a branch
56
 
        try:
57
 
            (self.wt, path) = WorkingTree.open_containing(self.comm.get_path())
58
 
            branch = self.wt.branch
59
 
        except errors.NotBranchError:
60
 
            self.notbranch = True
61
 
            return
62
 
        except:
63
 
            raise
64
 
 
65
 
        file_id = self.wt.path2id(path)
 
52
        file_id = self.wt.path2id(wtpath)
66
53
 
67
54
        self.notbranch = False
68
55
        if file_id is None:
71
58
        
72
59
        # Set the delta
73
60
        self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
74
 
        if version_info < (0, 9):
75
 
            self.delta = compare_trees(self.old_tree, self.wt)
76
 
        else:
77
 
            self.delta = self.wt.changes_from(self.old_tree)
 
61
        self.delta = self.wt.changes_from(self.old_tree)
78
62
        
79
63
        # Dictionary for signal_autoconnect
80
64
        dic = { "on_button_commit_commit_clicked": self.commit,
89
73
    def display(self):
90
74
        """ Display the Push dialog. """
91
75
        if self.notbranch:
92
 
            self.dialog.error_dialog(_('Directory is not a branch'),
 
76
            error_dialog(_('Directory is not a branch'),
93
77
                                     _('You can perform this action only in a branch.'))
94
78
            self.close()
95
79
        else:
96
 
            from bzrlib.branch import Branch
97
 
            branch = Branch.open_containing(self.comm.get_path())[0]
98
 
 
99
 
            if branch.get_bound_location() is not None:
 
80
            if self.wt.branch.get_bound_location() is not None:
100
81
                # we have a checkout, so the local commit checkbox must appear
101
82
                self.checkbutton_local.show()
102
83
            
104
85
            self.window.show()
105
86
            
106
87
    
107
 
    # This code is from Jelmer Vernooij's bzr-gtk branch
108
88
    def _create_file_view(self):
109
89
        self.file_store = gtk.ListStore(gobject.TYPE_BOOLEAN,
110
90
                                        gobject.TYPE_STRING,
141
121
            it = self.file_store.iter_next(it)
142
122
 
143
123
        return ret
144
 
    # end of bzr-gtk code
145
124
    
146
125
    def _toggle_commit(self, cell, path, model):
147
126
        model[path][0] = not model[path][0]
157
136
        
158
137
        specific_files = self._get_specific_files()
159
138
        
160
 
        self.comm.set_busy(self.window)
161
 
        # merged from Jelmer Vernooij's olive integration branch
162
139
        try:
163
140
            self.wt.commit(message, 
164
141
                           allow_pointless=checkbutton_force.get_active(),
166
143
                           local=self.checkbutton_local.get_active(),
167
144
                           specific_files=specific_files)
168
145
        except errors.NotBranchError:
169
 
            self.dialog.error_dialog(_('Directory is not a branch'),
 
146
            error_dialog(_('Directory is not a branch'),
170
147
                                     _('You can perform this action only in a branch.'))
171
 
            self.comm.set_busy(self.window, False)
172
148
            return
173
149
        except errors.LocalRequiresBoundBranch:
174
 
            self.dialog.error_dialog(_('Directory is not a checkout'),
 
150
            error_dialog(_('Directory is not a checkout'),
175
151
                                     _('You can perform local commit only on checkouts.'))
176
 
            self.comm.set_busy(self.window, False)
177
152
            return
178
153
        except errors.PointlessCommit:
179
 
            self.dialog.error_dialog(_('No changes to commit'),
 
154
            error_dialog(_('No changes to commit'),
180
155
                                     _('Try force commit if you want to commit anyway.'))
181
 
            self.comm.set_busy(self.window, False)
182
156
            return
183
157
        except errors.ConflictsInTree:
184
 
            self.dialog.error_dialog(_('Conflicts in tree'),
 
158
            error_dialog(_('Conflicts in tree'),
185
159
                                     _('You need to resolve the conflicts before committing.'))
186
 
            self.comm.set_busy(self.window, False)
187
160
            return
188
161
        except errors.StrictCommitFailed:
189
 
            self.dialog.error_dialog(_('Strict commit failed'),
 
162
            error_dialog(_('Strict commit failed'),
190
163
                                     _('There are unknown files in the working tree.\nPlease add or delete them.'))
191
 
            self.comm.set_busy(self.window, False)
192
164
            return
193
165
        except errors.BoundBranchOutOfDate, errmsg:
194
 
            self.dialog.error_dialog(_('Bound branch is out of date'),
 
166
            error_dialog(_('Bound branch is out of date'),
195
167
                                     _('%s') % errmsg)
196
 
            self.comm.set_busy(self.window, False)
197
 
            return
198
 
        except:
199
 
            raise
 
168
            return
 
169
        except errors.BzrError, msg:
 
170
            error_dialog(_('Unknown bzr error'), str(msg))
 
171
            return
 
172
        except Exception, msg:
 
173
            error_dialog(_('Unknown error'), str(msg))
 
174
            return
200
175
        
201
176
        self.close()
202
 
        self.comm.refresh_right()
203
177
        
204
178
    def close(self, widget=None):
205
179
        self.window.destroy()