/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: Aaron Bentley
  • Date: 2007-01-17 06:42:55 UTC
  • mto: This revision was merged to the branch mainline in revision 129.
  • Revision ID: aaron.bentley@utoronto.ca-20070117064255-x4gznz5e0lyjq3gk
Remove usused span selector

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/commit.py
21
21
    pass
22
22
 
23
23
import gtk
 
24
import gtk.glade
24
25
import gobject
25
26
import pango
26
27
 
27
 
import os.path
28
 
 
29
 
from bzrlib import errors, osutils
30
 
from bzrlib.trace import mutter
 
28
import bzrlib.errors as errors
 
29
from bzrlib import osutils
31
30
 
32
31
from dialog import error_dialog, question_dialog
33
 
from errors import show_bzr_error
34
 
 
35
 
try:
36
 
    import dbus
37
 
    import dbus.glib
38
 
    have_dbus = True
39
 
except ImportError:
40
 
    have_dbus = False
41
 
 
42
 
class CommitDialog(gtk.Dialog):
43
 
    """ New implementation of the Commit dialog. """
44
 
    def __init__(self, wt, wtpath, notbranch, selected=None, parent=None):
45
 
        """ Initialize the Commit Dialog. """
46
 
        gtk.Dialog.__init__(self, title="Commit - Olive",
47
 
                                  parent=parent,
48
 
                                  flags=0,
49
 
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
32
from guifiles import GLADEFILENAME
 
33
 
 
34
 
 
35
class CommitDialog:
 
36
    """ Display Commit dialog and perform the needed actions. """
 
37
    def __init__(self, wt, wtpath, notbranch):
 
38
        """ Initialize the Commit dialog.
 
39
        :param  wt:         bzr working tree object
 
40
        :param  wtpath:     path to working tree root
 
41
        :param  notbranch:  flag that path is not a brach
 
42
        :type   notbranch:  bool
 
43
        """
 
44
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_commit', 'olive-gtk')
50
45
        
51
 
        # Get arguments
52
46
        self.wt = wt
53
47
        self.wtpath = wtpath
54
48
        self.notbranch = notbranch
55
 
        self.selected = selected
 
49
 
 
50
        # Get some important widgets
 
51
        self.window = self.glade.get_widget('window_commit')
 
52
        self.checkbutton_local = self.glade.get_widget('checkbutton_commit_local')
 
53
        self.textview = self.glade.get_widget('textview_commit')
 
54
        self.file_expander = self.glade.get_widget('expander_commit_select')
 
55
        self.file_view = self.glade.get_widget('treeview_commit_select')
 
56
        self.pending_expander = self.glade.get_widget('expander_commit_pending')
 
57
        self.pending_label = self.glade.get_widget('label_commit_pending')
 
58
        self.pending_view = self.glade.get_widget('treeview_commit_pending')
 
59
 
 
60
        if wt is None or notbranch:
 
61
            return
56
62
        
57
63
        # Set the delta
58
64
        self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
61
67
        # Get pending merges
62
68
        self.pending = self._pending_merges(self.wt)
63
69
        
64
 
        # Do some preliminary checks
65
 
        self._is_checkout = False
66
 
        self._is_pending = False
 
70
        # Dictionary for signal_autoconnect
 
71
        dic = { "on_button_commit_commit_clicked": self.commit,
 
72
                "on_button_commit_cancel_clicked": self.close }
 
73
 
 
74
        # Connect the signals to the handlers
 
75
        self.glade.signal_autoconnect(dic)
 
76
        
 
77
        # Create the file list
 
78
        self._create_file_view()
 
79
        # Create the pending merges
 
80
        self._create_pending_merges()
 
81
    
 
82
    def display(self):
 
83
        """ Display the Push dialog.
 
84
        @return:    True if dialog is shown.
 
85
        """
67
86
        if self.wt is None and not self.notbranch:
68
87
            error_dialog(_('Directory does not have a working tree'),
69
88
                         _('Operation aborted.'))
70
89
            self.close()
71
 
            return
72
 
 
 
90
            return False
73
91
        if self.notbranch:
74
92
            error_dialog(_('Directory is not a branch'),
75
93
                         _('You can perform this action only in a branch.'))
76
94
            self.close()
77
 
            return
 
95
            return False
78
96
        else:
79
97
            if self.wt.branch.get_bound_location() is not None:
80
98
                # we have a checkout, so the local commit checkbox must appear
81
 
                self._is_checkout = True
 
99
                self.checkbutton_local.show()
82
100
            
83
101
            if self.pending:
84
102
                # There are pending merges, file selection not supported
85
 
                self._is_pending = True
86
 
        
87
 
        # Create the widgets
88
 
        self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
89
 
        self._expander_files = gtk.Expander(_("File(s) to commit"))
90
 
        self._vpaned_main = gtk.VPaned()
91
 
        self._scrolledwindow_files = gtk.ScrolledWindow()
92
 
        self._scrolledwindow_message = gtk.ScrolledWindow()
93
 
        self._treeview_files = gtk.TreeView()
94
 
        self._vbox_message = gtk.VBox()
95
 
        self._label_message = gtk.Label(_("Commit message:"))
96
 
        self._textview_message = gtk.TextView()
97
 
        
98
 
        if self._is_pending:
99
 
            self._expander_merges = gtk.Expander(_("Pending merges"))
100
 
            self._vpaned_list = gtk.VPaned()
101
 
            self._scrolledwindow_merges = gtk.ScrolledWindow()
102
 
            self._treeview_merges = gtk.TreeView()
103
 
            self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
104
 
                                                   gtk.POLICY_AUTOMATIC)
105
 
 
106
 
        # Set callbacks
107
 
        self._button_commit.connect('clicked', self._on_commit_clicked)
108
 
        self._treeview_files.connect('row_activated', self._on_treeview_files_row_activated)
109
 
        
110
 
        # Set properties
111
 
        self._scrolledwindow_files.set_policy(gtk.POLICY_AUTOMATIC,
112
 
                                              gtk.POLICY_AUTOMATIC)
113
 
        self._scrolledwindow_message.set_policy(gtk.POLICY_AUTOMATIC,
114
 
                                                gtk.POLICY_AUTOMATIC)
115
 
        self._textview_message.modify_font(pango.FontDescription("Monospace"))
116
 
        self.set_default_size(500, 500)
117
 
        self._vpaned_main.set_position(200)
118
 
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
119
 
 
120
 
        # Construct the dialog
121
 
        self.action_area.pack_end(self._button_commit)
122
 
        
123
 
        self._scrolledwindow_files.add(self._treeview_files)
124
 
        self._scrolledwindow_message.add(self._textview_message)
125
 
        
126
 
        self._expander_files.add(self._scrolledwindow_files)
127
 
        
128
 
        self._vbox_message.pack_start(self._label_message, False, False)
129
 
        self._vbox_message.pack_start(self._scrolledwindow_message, True, True)
130
 
        
131
 
        if self._is_pending:        
132
 
            self._expander_merges.add(self._scrolledwindow_merges)
133
 
            self._scrolledwindow_merges.add(self._treeview_merges)
134
 
            self._vpaned_list.add1(self._expander_files)
135
 
            self._vpaned_list.add2(self._expander_merges)
136
 
            self._vpaned_main.add1(self._vpaned_list)
137
 
        else:
138
 
            self._vpaned_main.add1(self._expander_files)
139
 
 
140
 
        self._vpaned_main.add2(self._vbox_message)
141
 
        
142
 
        self.vbox.pack_start(self._vpaned_main, True, True)
143
 
        if self._is_checkout: 
144
 
            self._check_local = gtk.CheckButton(_("_Only commit locally"),
145
 
                                                use_underline=True)
146
 
            self.vbox.pack_start(self._check_local, False, False)
147
 
            if have_dbus:
148
 
                bus = dbus.SystemBus()
149
 
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager', 
150
 
                              '/org/freedesktop/NetworkManager')
151
 
                dbus_iface = dbus.Interface(
152
 
                        proxy_obj, 'org.freedesktop.NetworkManager')
153
 
                try:
154
 
                    # 3 is the enum value for STATE_CONNECTED
155
 
                    self._check_local.set_active(dbus_iface.state() != 3)
156
 
                except dbus.DBusException, e:
157
 
                    # Silently drop errors. While DBus may be 
158
 
                    # available, NetworkManager doesn't necessarily have to be
159
 
                    mutter("unable to get networkmanager state: %r" % e)
160
 
                
161
 
        # Create the file list
162
 
        self._create_file_view()
163
 
        # Create the pending merges
164
 
        self._create_pending_merges()
165
 
        
166
 
        # Expand the corresponding expander
167
 
        if self._is_pending:
168
 
            self._expander_merges.set_expanded(True)
169
 
        else:
170
 
            self._expander_files.set_expanded(True)
171
 
        
172
 
        # Display dialog
173
 
        self.vbox.show_all()
174
 
        
175
 
        # Default to Commit button
176
 
        self._button_commit.grab_default()
177
 
    
178
 
    def _on_treeview_files_row_activated(self, treeview, path, view_column):
179
 
        # FIXME: the diff window freezes for some reason
180
 
        treeselection = treeview.get_selection()
181
 
        (model, iter) = treeselection.get_selected()
182
 
        
183
 
        if iter is not None:
184
 
            from diff import DiffWindow
185
 
            
186
 
            _selected = model.get_value(iter, 1)
187
 
            
188
 
            diff = DiffWindow()
189
 
            diff.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
190
 
            diff.set_modal(True)
191
 
            parent_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
192
 
            diff.set_diff(self.wt.branch.nick, self.wt, parent_tree)
193
 
            try:
194
 
                diff.set_file(_selected)
195
 
            except errors.NoSuchFile:
196
 
                pass
197
 
            diff.show()
198
 
    
199
 
    @show_bzr_error
200
 
    def _on_commit_clicked(self, button):
201
 
        """ Commit button clicked handler. """
202
 
        textbuffer = self._textview_message.get_buffer()
203
 
        start, end = textbuffer.get_bounds()
204
 
        message = textbuffer.get_text(start, end).decode('utf-8')
205
 
        
 
103
                self.file_expander.set_expanded(False)
 
104
                self.file_view.set_sensitive(False)
 
105
            else:
 
106
                # No pending merges
 
107
                self.pending_expander.hide()
 
108
            
 
109
            self.textview.modify_font(pango.FontDescription("Monospace"))
 
110
            self.window.show()
 
111
            return True
 
112
    
 
113
    def _create_file_view(self):
 
114
        self.file_store = gtk.ListStore(gobject.TYPE_BOOLEAN,   # [0] checkbox
 
115
                                        gobject.TYPE_STRING,    # [1] path to display
 
116
                                        gobject.TYPE_STRING,    # [2] changes type
 
117
                                        gobject.TYPE_STRING)    # [3] real path
 
118
        self.file_view.set_model(self.file_store)
 
119
        crt = gtk.CellRendererToggle()
 
120
        crt.set_property("activatable", True)
 
121
        crt.connect("toggled", self._toggle_commit, self.file_store)
 
122
        self.file_view.append_column(gtk.TreeViewColumn(_('Commit'),
 
123
                                     crt, active=0))
 
124
        self.file_view.append_column(gtk.TreeViewColumn(_('Path'),
 
125
                                     gtk.CellRendererText(), text=1))
 
126
        self.file_view.append_column(gtk.TreeViewColumn(_('Type'),
 
127
                                     gtk.CellRendererText(), text=2))
 
128
 
 
129
        for path, id, kind in self.delta.added:
 
130
            marker = osutils.kind_marker(kind)
 
131
            self.file_store.append([ True, path+marker, _('added'), path ])
 
132
 
 
133
        for path, id, kind in self.delta.removed:
 
134
            marker = osutils.kind_marker(kind)
 
135
            self.file_store.append([ True, path+marker, _('removed'), path ])
 
136
 
 
137
        for oldpath, newpath, id, kind, text_modified, meta_modified in self.delta.renamed:
 
138
            marker = osutils.kind_marker(kind)
 
139
            if text_modified or meta_modified:
 
140
                changes = _('renamed and modified')
 
141
            else:
 
142
                changes = _('renamed')
 
143
            self.file_store.append([ True,
 
144
                                     oldpath+marker + '  =>  ' + newpath+marker,
 
145
                                     changes,
 
146
                                     newpath
 
147
                                   ])
 
148
 
 
149
        for path, id, kind, text_modified, meta_modified in self.delta.modified:
 
150
            marker = osutils.kind_marker(kind)
 
151
            self.file_store.append([ True, path+marker, _('modified'), path ])
 
152
    
 
153
    def _create_pending_merges(self):
206
154
        if not self.pending:
207
 
            specific_files = self._get_specific_files()
208
 
        else:
209
 
            specific_files = None
210
 
 
211
 
        if message == '':
212
 
            response = question_dialog(_('Commit with an empty message?'),
213
 
                                       _('You can describe your commit intent in the message.'))
214
 
            if response == gtk.RESPONSE_NO:
215
 
                # Kindly give focus to message area
216
 
                self._textview_message.grab_focus()
217
 
                return
218
 
 
219
 
        if self._is_checkout:
220
 
            local = self._check_local.get_active()
221
 
        else:
222
 
            local = False
223
 
 
224
 
        if list(self.wt.unknowns()) != []:
225
 
            response = question_dialog(_("Commit with unknowns?"),
226
 
               _("Unknown files exist in the working tree. Commit anyway?"))
227
 
            if response == gtk.RESPONSE_NO:
228
 
                return
229
 
        
230
 
        try:
231
 
            self.wt.commit(message,
232
 
                       allow_pointless=False,
233
 
                       strict=False,
234
 
                       local=local,
235
 
                       specific_files=specific_files)
236
 
        except errors.PointlessCommit:
237
 
            response = question_dialog(_('Commit with no changes?'),
238
 
                                       _('There are no changes in the working tree.'))
239
 
            if response == gtk.RESPONSE_YES:
240
 
                self.wt.commit(message,
241
 
                               allow_pointless=True,
242
 
                               strict=False,
243
 
                               local=local,
244
 
                               specific_files=specific_files)
245
 
        self.response(gtk.RESPONSE_OK)
246
 
 
 
155
            # hide unused pending merge part
 
156
            scrolled_window = self.glade.get_widget('scrolledwindow_commit_pending')
 
157
            parent = scrolled_window.get_parent()
 
158
            parent.remove(scrolled_window)
 
159
            parent = self.pending_label.get_parent()
 
160
            parent.remove(self.pending_label)
 
161
            return
 
162
        
 
163
        liststore = gtk.ListStore(gobject.TYPE_STRING,
 
164
                                  gobject.TYPE_STRING,
 
165
                                  gobject.TYPE_STRING)
 
166
        self.pending_view.set_model(liststore)
 
167
        
 
168
        self.pending_view.append_column(gtk.TreeViewColumn(_('Date'),
 
169
                                        gtk.CellRendererText(), text=0))
 
170
        self.pending_view.append_column(gtk.TreeViewColumn(_('Committer'),
 
171
                                        gtk.CellRendererText(), text=1))
 
172
        self.pending_view.append_column(gtk.TreeViewColumn(_('Summary'),
 
173
                                        gtk.CellRendererText(), text=2))
 
174
        
 
175
        for item in self.pending:
 
176
            liststore.append([ item['date'],
 
177
                               item['committer'],
 
178
                               item['summary'] ])
 
179
    
 
180
    def _get_specific_files(self):
 
181
        ret = []
 
182
        it = self.file_store.get_iter_first()
 
183
        while it:
 
184
            if self.file_store.get_value(it, 0):
 
185
                # get real path from hidden column 3
 
186
                ret.append(self.file_store.get_value(it, 3))
 
187
            it = self.file_store.iter_next(it)
 
188
 
 
189
        return ret
 
190
    
 
191
    def _toggle_commit(self, cell, path, model):
 
192
        model[path][0] = not model[path][0]
 
193
        return
 
194
    
247
195
    def _pending_merges(self, wt):
248
196
        """ Return a list of pending merges or None if there are none of them. """
249
197
        parents = wt.get_parent_ids()
308
256
        
309
257
        return pm
310
258
 
311
 
    def _create_file_view(self):
312
 
        self._file_store = gtk.ListStore(gobject.TYPE_BOOLEAN,   # [0] checkbox
313
 
                                         gobject.TYPE_STRING,    # [1] path to display
314
 
                                         gobject.TYPE_STRING,    # [2] changes type
315
 
                                         gobject.TYPE_STRING)    # [3] real path
316
 
        self._treeview_files.set_model(self._file_store)
317
 
        crt = gtk.CellRendererToggle()
318
 
        crt.set_property("activatable", True)
319
 
        crt.connect("toggled", self._toggle_commit, self._file_store)
320
 
        commit_column = gtk.TreeViewColumn(_('Commit'), crt, active=0)
321
 
        if self._is_pending:
322
 
            commit_column.set_visible(False)
323
 
        self._treeview_files.append_column(commit_column)
324
 
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
325
 
                                     gtk.CellRendererText(), text=1))
326
 
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
327
 
                                     gtk.CellRendererText(), text=2))
328
 
 
329
 
        for path, id, kind in self.delta.added:
330
 
            marker = osutils.kind_marker(kind)
331
 
            if self.selected is not None:
332
 
                if path == os.path.join(self.wtpath, self.selected):
333
 
                    self._file_store.append([ True, path+marker, _('added'), path ])
334
 
                else:
335
 
                    self._file_store.append([ False, path+marker, _('added'), path ])
336
 
            else:
337
 
                self._file_store.append([ True, path+marker, _('added'), path ])
338
 
 
339
 
        for path, id, kind in self.delta.removed:
340
 
            marker = osutils.kind_marker(kind)
341
 
            if self.selected is not None:
342
 
                if path == os.path.join(self.wtpath, self.selected):
343
 
                    self._file_store.append([ True, path+marker, _('removed'), path ])
344
 
                else:
345
 
                    self._file_store.append([ False, path+marker, _('removed'), path ])
346
 
            else:
347
 
                self._file_store.append([ True, path+marker, _('removed'), path ])
348
 
 
349
 
        for oldpath, newpath, id, kind, text_modified, meta_modified in self.delta.renamed:
350
 
            marker = osutils.kind_marker(kind)
351
 
            if text_modified or meta_modified:
352
 
                changes = _('renamed and modified')
353
 
            else:
354
 
                changes = _('renamed')
355
 
            if self.selected is not None:
356
 
                if newpath == os.path.join(self.wtpath, self.selected):
357
 
                    self._file_store.append([ True,
358
 
                                              oldpath+marker + '  =>  ' + newpath+marker,
359
 
                                              changes,
360
 
                                              newpath
361
 
                                            ])
362
 
                else:
363
 
                    self._file_store.append([ False,
364
 
                                              oldpath+marker + '  =>  ' + newpath+marker,
365
 
                                              changes,
366
 
                                              newpath
367
 
                                            ])
368
 
            else:
369
 
                self._file_store.append([ True,
370
 
                                          oldpath+marker + '  =>  ' + newpath+marker,
371
 
                                          changes,
372
 
                                          newpath
373
 
                                        ])
374
 
 
375
 
        for path, id, kind, text_modified, meta_modified in self.delta.modified:
376
 
            marker = osutils.kind_marker(kind)
377
 
            if self.selected is not None:
378
 
                if path == os.path.join(self.wtpath, self.selected):
379
 
                    self._file_store.append([ True, path+marker, _('modified'), path ])
380
 
                else:
381
 
                    self._file_store.append([ False, path+marker, _('modified'), path ])
382
 
            else:
383
 
                self._file_store.append([ True, path+marker, _('modified'), path ])
384
 
    
385
 
    def _create_pending_merges(self):
 
259
    def commit(self, widget):
 
260
        textbuffer = self.textview.get_buffer()
 
261
        start, end = textbuffer.get_bounds()
 
262
        message = textbuffer.get_text(start, end).decode('utf-8')
 
263
        
 
264
        checkbutton_strict = self.glade.get_widget('checkbutton_commit_strict')
 
265
        checkbutton_force = self.glade.get_widget('checkbutton_commit_force')
 
266
        
386
267
        if not self.pending:
387
 
            return
388
 
        
389
 
        liststore = gtk.ListStore(gobject.TYPE_STRING,
390
 
                                  gobject.TYPE_STRING,
391
 
                                  gobject.TYPE_STRING)
392
 
        self._treeview_merges.set_model(liststore)
393
 
        
394
 
        self._treeview_merges.append_column(gtk.TreeViewColumn(_('Date'),
395
 
                                            gtk.CellRendererText(), text=0))
396
 
        self._treeview_merges.append_column(gtk.TreeViewColumn(_('Committer'),
397
 
                                            gtk.CellRendererText(), text=1))
398
 
        self._treeview_merges.append_column(gtk.TreeViewColumn(_('Summary'),
399
 
                                            gtk.CellRendererText(), text=2))
400
 
        
401
 
        for item in self.pending:
402
 
            liststore.append([ item['date'],
403
 
                               item['committer'],
404
 
                               item['summary'] ])
405
 
    
406
 
    def _get_specific_files(self):
407
 
        ret = []
408
 
        it = self._file_store.get_iter_first()
409
 
        while it:
410
 
            if self._file_store.get_value(it, 0):
411
 
                # get real path from hidden column 3
412
 
                ret.append(self._file_store.get_value(it, 3))
413
 
            it = self._file_store.iter_next(it)
414
 
 
415
 
        return ret
416
 
    
417
 
    def _toggle_commit(self, cell, path, model):
418
 
        model[path][0] = not model[path][0]
419
 
        return
 
268
            specific_files = self._get_specific_files()
 
269
        else:
 
270
            specific_files = None
 
271
 
 
272
        if message == '':
 
273
            response = question_dialog('Commit with an empty message ?',
 
274
                                       'You can describe your commit intent'
 
275
                                       +' in the message')
 
276
            if response == gtk.RESPONSE_NO:
 
277
                # Kindly give focus to message area
 
278
                self.textview.grab_focus()
 
279
                return
 
280
 
 
281
        try:
 
282
            self.wt.commit(message,
 
283
                           allow_pointless=checkbutton_force.get_active(),
 
284
                           strict=checkbutton_strict.get_active(),
 
285
                           local=self.checkbutton_local.get_active(),
 
286
                           specific_files=specific_files)
 
287
        except errors.NotBranchError:
 
288
            error_dialog(_('Directory is not a branch'),
 
289
                         _('You can perform this action only in a branch.'))
 
290
            return
 
291
        except errors.LocalRequiresBoundBranch:
 
292
            error_dialog(_('Directory is not a checkout'),
 
293
                         _('You can perform local commit only on checkouts.'))
 
294
            return
 
295
        except errors.PointlessCommit:
 
296
            error_dialog(_('No changes to commit'),
 
297
                         _('Try force commit if you want to commit anyway.'))
 
298
            return
 
299
        except errors.ConflictsInTree:
 
300
            error_dialog(_('Conflicts in tree'),
 
301
                         _('You need to resolve the conflicts before committing.'))
 
302
            return
 
303
        except errors.StrictCommitFailed:
 
304
            error_dialog(_('Strict commit failed'),
 
305
                         _('There are unknown files in the working tree.\nPlease add or delete them.'))
 
306
            return
 
307
        except errors.BoundBranchOutOfDate, errmsg:
 
308
            error_dialog(_('Bound branch is out of date'),
 
309
                         _('%s') % errmsg)
 
310
            return
 
311
        except errors.BzrError, msg:
 
312
            error_dialog(_('Unknown bzr error'), str(msg))
 
313
            return
 
314
        except Exception, msg:
 
315
            error_dialog(_('Unknown error'), str(msg))
 
316
            return
 
317
 
 
318
        self.close()
 
319
 
 
320
    def close(self, widget=None):
 
321
        self.window.destroy()