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

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 16:11:12 UTC
  • mfrom: (475.2.2 gtk)
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629161112-3j4zp0r0e7cv6cds
Merge Chad's progress bar in viz patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
try:
 
18
    import pygtk
 
19
    pygtk.require("2.0")
 
20
except:
 
21
    pass
 
22
 
 
23
import gtk
 
24
import gobject
 
25
import pango
 
26
 
 
27
import os.path
17
28
import re
18
29
 
19
 
from gi.repository import Gdk
20
 
from gi.repository import Gtk
21
 
from gi.repository import GObject
22
 
from gi.repository import Pango
 
30
from bzrlib import errors, osutils
 
31
from bzrlib.trace import mutter
 
32
from bzrlib.util import bencode
23
33
 
24
 
from bzrlib import (
25
 
    bencode,
26
 
    errors,
27
 
    osutils,
28
 
    trace,
29
 
    )
30
 
from bzrlib.plugins.gtk.dialog import question_dialog
31
 
from bzrlib.plugins.gtk.errors import show_bzr_error
32
 
from bzrlib.plugins.gtk.i18n import _i18n
33
 
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
 
34
from bzrlib.plugins.gtk import _i18n
 
35
from dialog import error_dialog, question_dialog
 
36
from errors import show_bzr_error
34
37
 
35
38
try:
36
39
    import dbus
59
62
    last_revision = parents[0]
60
63
 
61
64
    if last_revision is not None:
62
 
        graph = branch.repository.get_graph()
63
 
        ignore = set([r for r,ps in graph.iter_ancestry([last_revision])])
 
65
        try:
 
66
            ignore = set(branch.repository.get_ancestry(last_revision,
 
67
                                                        topo_sorted=False))
 
68
        except errors.NoSuchRevision:
 
69
            # the last revision is a ghost : assume everything is new
 
70
            # except for it
 
71
            ignore = set([None, last_revision])
64
72
    else:
65
 
        ignore = set([])
 
73
        ignore = set([None])
66
74
 
67
75
    pm = []
68
76
    for merge in pending:
89
97
    return pm
90
98
 
91
99
 
92
 
_newline_variants_re = re.compile(r'\r\n?')
93
 
def _sanitize_and_decode_message(utf8_message):
94
 
    """Turn a utf-8 message into a sanitized Unicode message."""
95
 
    fixed_newline = _newline_variants_re.sub('\n', utf8_message)
96
 
    return osutils.safe_unicode(fixed_newline)
97
 
 
98
 
 
99
 
class CommitDialog(Gtk.Dialog):
 
100
class CommitDialog(gtk.Dialog):
100
101
    """Implementation of Commit."""
101
102
 
102
103
    def __init__(self, wt, selected=None, parent=None):
103
 
        super(CommitDialog, self).__init__(
104
 
            title="Commit to %s" % wt.basedir, parent=parent, flags=0)
105
 
        self.connect('delete-event', self._on_delete_window)
 
104
        gtk.Dialog.__init__(self, title="Commit - Olive",
 
105
                                  parent=parent,
 
106
                                  flags=0,
 
107
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
106
108
        self._question_dialog = question_dialog
107
109
 
108
 
        self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
109
 
 
110
110
        self._wt = wt
111
111
        # TODO: Do something with this value, it is used by Olive
112
112
        #       It used to set all changes but this one to False
114
114
        self._enable_per_file_commits = True
115
115
        self._commit_all_changes = True
116
116
        self.committed_revision_id = None # Nothing has been committed yet
117
 
        self._saved_commit_messages_manager = SavedCommitMessagesManager(
118
 
            self._wt, self._wt.branch)
119
117
 
120
118
        self.setup_params()
121
119
        self.construct()
125
123
        """Setup the member variables for state."""
126
124
        self._basis_tree = self._wt.basis_tree()
127
125
        self._delta = None
128
 
        self._wt.lock_read()
129
 
        try:
130
 
            self._pending = pending_revisions(self._wt)
131
 
        finally:
132
 
            self._wt.unlock()
 
126
        self._pending = pending_revisions(self._wt)
133
127
 
134
128
        self._is_checkout = (self._wt.branch.get_bound_location() is not None)
135
129
 
187
181
 
188
182
        all_enabled = (self._selected is None)
189
183
        # The first entry is always the 'whole tree'
190
 
        all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])
 
184
        all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
191
185
        initial_cursor = store.get_path(all_iter)
192
186
        # should we pass specific_files?
193
187
        self._wt.lock_read()
194
188
        self._basis_tree.lock_read()
195
189
        try:
196
190
            from diff import iter_changes_to_status
197
 
            saved_file_messages = self._saved_commit_messages_manager.get()[1]
198
191
            for (file_id, real_path, change_type, display_path
199
192
                ) in iter_changes_to_status(self._basis_tree, self._wt):
200
193
                if self._selected and real_path != self._selected:
201
194
                    enabled = False
202
195
                else:
203
196
                    enabled = True
204
 
                try:
205
 
                    default_message = saved_file_messages[file_id]
206
 
                except KeyError:
207
 
                    default_message = ''
208
197
                item_iter = store.append([
209
198
                    file_id,
210
199
                    real_path.encode('UTF-8'),
211
200
                    enabled,
212
201
                    display_path.encode('UTF-8'),
213
202
                    change_type,
214
 
                    default_message, # Initial comment
 
203
                    '', # Initial comment
215
204
                    ])
216
205
                if self._selected and enabled:
217
206
                    initial_cursor = store.get_path(item_iter)
224
213
        # This sets the cursor, which causes the expander to close, which
225
214
        # causes the _file_message_text_view to never get realized. So we have
226
215
        # to give it a little kick, or it warns when we try to grab the focus
227
 
        self._treeview_files.set_cursor(initial_cursor, None, False)
 
216
        self._treeview_files.set_cursor(initial_cursor)
228
217
 
229
218
        def _realize_file_message_tree_view(*args):
230
219
            self._file_message_text_view.realize()
243
232
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
244
233
                                           '/org/freedesktop/NetworkManager')
245
234
            except dbus.DBusException:
246
 
                trace.mutter("networkmanager not available.")
 
235
                mutter("networkmanager not available.")
247
236
                self._check_local.show()
248
237
                return
249
238
            
255
244
            except dbus.DBusException, e:
256
245
                # Silently drop errors. While DBus may be
257
246
                # available, NetworkManager doesn't necessarily have to be
258
 
                trace.mutter("unable to get networkmanager state: %r" % e)
 
247
                mutter("unable to get networkmanager state: %r" % e)
259
248
        self._check_local.show()
260
249
 
261
250
    def _fill_in_per_file_info(self):
278
267
        """Build up the dialog widgets."""
279
268
        # The primary pane which splits it into left and right (adjustable)
280
269
        # sections.
281
 
        self._hpane = Gtk.HPaned()
 
270
        self._hpane = gtk.HPaned()
282
271
 
283
272
        self._construct_left_pane()
284
273
        self._construct_right_pane()
285
274
        self._construct_action_pane()
286
275
 
287
 
        self.get_content_area().pack_start(self._hpane, True, True, 0)
 
276
        self.vbox.pack_start(self._hpane)
288
277
        self._hpane.show()
289
278
        self.set_focus(self._global_message_text_view)
290
279
 
309
298
        self._hpane.set_position(300)
310
299
 
311
300
    def _construct_accelerators(self):
312
 
        group = Gtk.AccelGroup()
313
 
        group.connect(Gdk.keyval_from_name('N'),
314
 
                      Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
 
301
        group = gtk.AccelGroup()
 
302
        group.connect_group(gtk.gdk.keyval_from_name('N'),
 
303
                            gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
315
304
        self.add_accel_group(group)
316
305
 
317
306
        # ignore the escape key (avoid closing the window)
318
307
        self.connect_object('close', self.emit_stop_by_name, 'close')
319
308
 
320
309
    def _construct_left_pane(self):
321
 
        self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
 
310
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
322
311
        self._construct_file_list()
323
312
        self._construct_pending_list()
324
313
 
325
 
        self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
 
314
        self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
326
315
                                            use_underline=True)
327
 
        self._left_pane_box.pack_end(self._check_local, False, False, 0)
 
316
        self._left_pane_box.pack_end(self._check_local, False, False)
328
317
        self._check_local.set_active(False)
329
318
 
330
319
        self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
337
326
        # commit, and 1 for file commit, and it looked good. But I don't seem
338
327
        # to have a way to do that with the gtk boxes... :( (Which is extra
339
328
        # weird since wx uses gtk on Linux...)
340
 
        self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
 
329
        self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
341
330
        self._right_pane_table.set_row_spacings(5)
342
331
        self._right_pane_table.set_col_spacings(5)
343
332
        self._right_pane_table_row = 0
349
338
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
350
339
 
351
340
    def _construct_action_pane(self):
352
 
        self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
353
 
        self._button_cancel.connect('clicked', self._on_cancel_clicked)
354
 
        self._button_cancel.show()
355
 
        self.get_action_area().pack_end(
356
 
            self._button_cancel, True, True, 0)
357
 
        self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
 
341
        self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
358
342
        self._button_commit.connect('clicked', self._on_commit_clicked)
359
 
        self._button_commit.set_can_default(True)
 
343
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
360
344
        self._button_commit.show()
361
 
        self.get_action_area().pack_end(
362
 
            self._button_commit, True, True, 0)
 
345
        self.action_area.pack_end(self._button_commit)
363
346
        self._button_commit.grab_default()
364
347
 
365
348
    def _add_to_right_table(self, widget, weight, expanding=False):
371
354
        """
372
355
        end_row = self._right_pane_table_row + weight
373
356
        options = 0
374
 
        expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
 
357
        expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
375
358
        if expanding:
376
359
            options = expand_opts
377
360
        self._right_pane_table.attach(widget, 0, 1,
380
363
        self._right_pane_table_row = end_row
381
364
 
382
365
    def _construct_file_list(self):
383
 
        self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
384
 
        file_label = Gtk.Label(label=_i18n('Files'))
 
366
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
 
367
        file_label = gtk.Label(_i18n('Files'))
385
368
        # file_label.show()
386
 
        self._files_box.pack_start(file_label, False, True, 0)
 
369
        self._files_box.pack_start(file_label, expand=False)
387
370
 
388
 
        self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
 
371
        self._commit_all_files_radio = gtk.RadioButton(
389
372
            None, _i18n("Commit all changes"))
390
 
        self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
 
373
        self._files_box.pack_start(self._commit_all_files_radio, expand=False)
391
374
        self._commit_all_files_radio.show()
392
375
        self._commit_all_files_radio.connect('toggled',
393
376
            self._toggle_commit_selection)
394
 
        self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
 
377
        self._commit_selected_radio = gtk.RadioButton(
395
378
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
396
 
        self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
 
379
        self._files_box.pack_start(self._commit_selected_radio, expand=False)
397
380
        self._commit_selected_radio.show()
398
381
        self._commit_selected_radio.connect('toggled',
399
382
            self._toggle_commit_selection)
402
385
            self._commit_all_files_radio.set_sensitive(False)
403
386
            self._commit_selected_radio.set_sensitive(False)
404
387
 
405
 
        scroller = Gtk.ScrolledWindow()
406
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
407
 
        self._treeview_files = Gtk.TreeView()
 
388
        scroller = gtk.ScrolledWindow()
 
389
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
390
        self._treeview_files = gtk.TreeView()
408
391
        self._treeview_files.show()
409
392
        scroller.add(self._treeview_files)
410
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
393
        scroller.set_shadow_type(gtk.SHADOW_IN)
411
394
        scroller.show()
412
 
        self._files_box.pack_start(scroller, True, True, 0)
 
395
        self._files_box.pack_start(scroller,
 
396
                                   expand=True, fill=True)
413
397
        self._files_box.show()
414
 
        self._left_pane_box.pack_start(self._files_box, True, True, 0)
 
398
        self._left_pane_box.pack_start(self._files_box)
415
399
 
416
400
        # Keep note that all strings stored in a ListStore must be UTF-8
417
401
        # strings. GTK does not support directly setting and restoring Unicode
418
402
        # objects.
419
 
        liststore = Gtk.ListStore(
420
 
            GObject.TYPE_STRING,  # [0] file_id
421
 
            GObject.TYPE_STRING,  # [1] real path
422
 
            GObject.TYPE_BOOLEAN, # [2] checkbox
423
 
            GObject.TYPE_STRING,  # [3] display path
424
 
            GObject.TYPE_STRING,  # [4] changes type
425
 
            GObject.TYPE_STRING,  # [5] commit message
 
403
        liststore = gtk.ListStore(
 
404
            gobject.TYPE_STRING,  # [0] file_id
 
405
            gobject.TYPE_STRING,  # [1] real path
 
406
            gobject.TYPE_BOOLEAN, # [2] checkbox
 
407
            gobject.TYPE_STRING,  # [3] display path
 
408
            gobject.TYPE_STRING,  # [4] changes type
 
409
            gobject.TYPE_STRING,  # [5] commit message
426
410
            )
427
411
        self._files_store = liststore
428
412
        self._treeview_files.set_model(liststore)
429
 
        crt = Gtk.CellRendererToggle()
 
413
        crt = gtk.CellRendererToggle()
430
414
        crt.set_property('activatable', not bool(self._pending))
431
415
        crt.connect("toggled", self._toggle_commit, self._files_store)
432
416
        if self._pending:
433
417
            name = _i18n('Commit*')
434
418
        else:
435
419
            name = _i18n('Commit')
436
 
        commit_col = Gtk.TreeViewColumn(name, crt, active=2)
 
420
        commit_col = gtk.TreeViewColumn(name, crt, active=2)
437
421
        commit_col.set_visible(False)
438
422
        self._treeview_files.append_column(commit_col)
439
 
        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
440
 
                                           Gtk.CellRendererText(), text=3))
441
 
        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
442
 
                                           Gtk.CellRendererText(), text=4))
 
423
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
 
424
                                           gtk.CellRendererText(), text=3))
 
425
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
 
426
                                           gtk.CellRendererText(), text=4))
443
427
        self._treeview_files.connect('cursor-changed',
444
428
                                     self._on_treeview_files_cursor_changed)
445
429
 
446
430
    def _toggle_commit(self, cell, path, model):
447
 
        if model[path][0] == "": # No file_id means 'All Files'
 
431
        if model[path][0] is None: # No file_id means 'All Files'
448
432
            new_val = not model[path][2]
449
433
            for node in model:
450
434
                node[2] = new_val
460
444
                checked_col.set_visible(False)
461
445
            else:
462
446
                checked_col.set_visible(True)
463
 
            renderer = checked_col.get_cells()[0]
 
447
            renderer = checked_col.get_cell_renderers()[0]
464
448
            renderer.set_property('activatable', not all_files)
465
449
 
466
450
    def _construct_pending_list(self):
467
451
        # Pending information defaults to hidden, we put it all in 1 box, so
468
452
        # that we can show/hide all of them at once
469
 
        self._pending_box = Gtk.VBox()
 
453
        self._pending_box = gtk.VBox()
470
454
        self._pending_box.hide()
471
455
 
472
 
        pending_message = Gtk.Label()
 
456
        pending_message = gtk.Label()
473
457
        pending_message.set_markup(
474
458
            _i18n('<i>* Cannot select specific files when merging</i>'))
475
 
        self._pending_box.pack_start(pending_message, False, True, 5)
 
459
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
476
460
        pending_message.show()
477
461
 
478
 
        pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
479
 
        self._pending_box.pack_start(pending_label, False, True, 0)
 
462
        pending_label = gtk.Label(_i18n('Pending Revisions'))
 
463
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
480
464
        pending_label.show()
481
465
 
482
 
        scroller = Gtk.ScrolledWindow()
483
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
484
 
        self._treeview_pending = Gtk.TreeView()
 
466
        scroller = gtk.ScrolledWindow()
 
467
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
468
        self._treeview_pending = gtk.TreeView()
485
469
        scroller.add(self._treeview_pending)
486
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
470
        scroller.set_shadow_type(gtk.SHADOW_IN)
487
471
        scroller.show()
488
 
        self._pending_box.pack_start(scroller, True, True, 5)
 
472
        self._pending_box.pack_start(scroller,
 
473
                                     expand=True, fill=True, padding=5)
489
474
        self._treeview_pending.show()
490
 
        self._left_pane_box.pack_start(self._pending_box, True, True, 0)
 
475
        self._left_pane_box.pack_start(self._pending_box)
491
476
 
492
 
        liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
493
 
                                  GObject.TYPE_STRING, # date
494
 
                                  GObject.TYPE_STRING, # committer
495
 
                                  GObject.TYPE_STRING, # summary
 
477
        liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
 
478
                                  gobject.TYPE_STRING, # date
 
479
                                  gobject.TYPE_STRING, # committer
 
480
                                  gobject.TYPE_STRING, # summary
496
481
                                 )
497
482
        self._pending_store = liststore
498
483
        self._treeview_pending.set_model(liststore)
499
 
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
500
 
                                             Gtk.CellRendererText(), text=1))
501
 
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
502
 
                                             Gtk.CellRendererText(), text=2))
503
 
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
504
 
                                             Gtk.CellRendererText(), text=3))
 
484
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
 
485
                                             gtk.CellRendererText(), text=1))
 
486
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
 
487
                                             gtk.CellRendererText(), text=2))
 
488
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
 
489
                                             gtk.CellRendererText(), text=3))
505
490
 
506
491
    def _construct_diff_view(self):
507
 
        from bzrlib.plugins.gtk.diff import DiffView
 
492
        from diff import DiffView
508
493
 
509
494
        # TODO: jam 2007-10-30 The diff label is currently disabled. If we
510
495
        #       decide that we really don't ever want to display it, we should
511
496
        #       actually remove it, and other references to it, along with the
512
497
        #       tests that it is set properly.
513
 
        self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
 
498
        self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
514
499
        self._diff_label.set_alignment(0, 0)
515
500
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
516
501
        self._add_to_right_table(self._diff_label, 1, False)
521
506
        self._diff_view.show()
522
507
 
523
508
    def _construct_file_message(self):
524
 
        scroller = Gtk.ScrolledWindow()
525
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
509
        scroller = gtk.ScrolledWindow()
 
510
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
526
511
 
527
 
        self._file_message_text_view = Gtk.TextView()
 
512
        self._file_message_text_view = gtk.TextView()
528
513
        scroller.add(self._file_message_text_view)
529
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
514
        scroller.set_shadow_type(gtk.SHADOW_IN)
530
515
        scroller.show()
531
516
 
532
 
        self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
533
 
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
 
517
        self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
 
518
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
534
519
        self._file_message_text_view.set_accepts_tab(False)
535
520
        self._file_message_text_view.show()
536
521
 
537
 
        self._file_message_expander = Gtk.Expander(
538
 
            label=_i18n('File commit message'))
 
522
        self._file_message_expander = gtk.Expander(_i18n('File commit message'))
539
523
        self._file_message_expander.set_expanded(True)
540
524
        self._file_message_expander.add(scroller)
541
525
        self._add_to_right_table(self._file_message_expander, 1, False)
542
526
        self._file_message_expander.show()
543
527
 
544
528
    def _construct_global_message(self):
545
 
        self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
 
529
        self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
546
530
        self._global_message_label.set_markup(
547
531
            _i18n('<b>Global Commit Message</b>'))
548
532
        self._global_message_label.set_alignment(0, 0)
551
535
        # Can we remove the spacing between the label and the box?
552
536
        self._global_message_label.show()
553
537
 
554
 
        scroller = Gtk.ScrolledWindow()
555
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
538
        scroller = gtk.ScrolledWindow()
 
539
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
556
540
 
557
 
        self._global_message_text_view = Gtk.TextView()
558
 
        self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
559
 
        self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
 
541
        self._global_message_text_view = gtk.TextView()
 
542
        self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
560
543
        scroller.add(self._global_message_text_view)
561
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
544
        scroller.set_shadow_type(gtk.SHADOW_IN)
562
545
        scroller.show()
563
546
        self._add_to_right_table(scroller, 2, True)
564
 
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
 
547
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
565
548
        self._file_message_text_view.set_accepts_tab(False)
566
549
        self._global_message_text_view.show()
567
550
 
572
555
        if selection is not None:
573
556
            path, display_path = model.get(selection, 1, 3)
574
557
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
575
 
            if path == "":
 
558
            if path is None:
576
559
                self._diff_view.show_diff(None)
577
560
            else:
578
 
                self._diff_view.show_diff([osutils.safe_unicode(path)])
 
561
                self._diff_view.show_diff([path.decode('UTF-8')])
579
562
            self._update_per_file_info(selection)
580
563
 
581
564
    def _on_accel_next(self, accel_group, window, keyval, modifier):
592
575
            # We have either made it to the end of the list, or nothing was
593
576
            # selected. Either way, select All Files, and jump to the global
594
577
            # commit message.
595
 
            self._treeview_files.set_cursor(
596
 
                Gtk.TreePath(path=0), "", False)
 
578
            self._treeview_files.set_cursor((0,))
597
579
            self._global_message_text_view.grab_focus()
598
580
        else:
599
581
            # Set the cursor to this entry, and jump to the per-file commit
600
582
            # message
601
 
            self._treeview_files.set_cursor(model.get_path(next), None, False)
 
583
            self._treeview_files.set_cursor(model.get_path(next))
602
584
            self._file_message_text_view.grab_focus()
603
585
 
604
586
    def _save_current_file_message(self):
606
588
            return # Nothing to save
607
589
        text_buffer = self._file_message_text_view.get_buffer()
608
590
        cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
609
 
                                        text_buffer.get_end_iter(), True)
 
591
                                        text_buffer.get_end_iter())
610
592
        last_selected = self._files_store.get_iter(self._last_selected_file)
611
593
        self._files_store.set_value(last_selected, 5, cur_text)
612
594
 
618
600
        self._save_current_file_message()
619
601
        text_buffer = self._file_message_text_view.get_buffer()
620
602
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
621
 
        if file_id == "": # Whole tree
 
603
        if file_id is None: # Whole tree
622
604
            self._file_message_expander.set_label(_i18n('File commit message'))
623
605
            self._file_message_expander.set_expanded(False)
624
606
            self._file_message_expander.set_sensitive(False)
641
623
        files = []
642
624
        records = iter(self._files_store)
643
625
        rec = records.next() # Skip the All Files record
644
 
        assert rec[0] == "", "Are we skipping the wrong record?"
 
626
        assert rec[0] is None, "Are we skipping the wrong record?"
645
627
 
646
628
        file_info = []
647
629
        for record in records:
648
630
            if self._commit_all_changes or record[2]:# [2] checkbox
649
 
                file_id = osutils.safe_utf8(record[0]) # [0] file_id
650
 
                path = osutils.safe_utf8(record[1])    # [1] real path
651
 
                # [5] commit message
652
 
                file_message = _sanitize_and_decode_message(record[5])
 
631
                file_id = record[0] # [0] file_id
 
632
                path = record[1]    # [1] real path
 
633
                file_message = record[5] # [5] commit message
653
634
                files.append(path.decode('UTF-8'))
654
635
                if self._enable_per_file_commits and file_message:
655
636
                    # All of this needs to be utf-8 information
656
 
                    file_message = file_message.encode('UTF-8')
657
637
                    file_info.append({'path':path, 'file_id':file_id,
658
638
                                     'message':file_message})
659
639
        file_info.sort(key=lambda x:(x['path'], x['file_id']))
663
643
            return files, []
664
644
 
665
645
    @show_bzr_error
666
 
    def _on_cancel_clicked(self, button):
667
 
        """ Cancel button clicked handler. """
668
 
        self._do_cancel()
669
 
 
670
 
    @show_bzr_error
671
 
    def _on_delete_window(self, source, event):
672
 
        """ Delete window handler. """
673
 
        self._do_cancel()
674
 
 
675
 
    def _do_cancel(self):
676
 
        """If requested, saves commit messages when cancelling gcommit; they are re-used by a next gcommit"""
677
 
        mgr = SavedCommitMessagesManager()
678
 
        self._saved_commit_messages_manager = mgr
679
 
        mgr.insert(self._get_global_commit_message(),
680
 
                   self._get_specific_files()[1])
681
 
        if mgr.is_not_empty(): # maybe worth saving
682
 
            response = self._question_dialog(
683
 
                _i18n('Commit cancelled'),
684
 
                _i18n('Do you want to save your commit messages ?'),
685
 
                parent=self)
686
 
            if response == Gtk.ResponseType.NO:
687
 
                 # save nothing and destroy old comments if any
688
 
                mgr = SavedCommitMessagesManager()
689
 
        mgr.save(self._wt, self._wt.branch)
690
 
        self.response(Gtk.ResponseType.CANCEL) # close window
691
 
 
692
 
    @show_bzr_error
693
646
    def _on_commit_clicked(self, button):
694
647
        """ Commit button clicked handler. """
695
648
        self._do_commit()
700
653
        if message == '':
701
654
            response = self._question_dialog(
702
655
                _i18n('Commit with an empty message?'),
703
 
                _i18n('You can describe your commit intent in the message.'),
704
 
                parent=self)
705
 
            if response == Gtk.ResponseType.NO:
 
656
                _i18n('You can describe your commit intent in the message.'))
 
657
            if response == gtk.RESPONSE_NO:
706
658
                # Kindly give focus to message area
707
659
                self._global_message_text_view.grab_focus()
708
660
                return
721
673
        for path in self._wt.unknowns():
722
674
            response = self._question_dialog(
723
675
                _i18n("Commit with unknowns?"),
724
 
                _i18n("Unknown files exist in the working tree. Commit anyway?"),
725
 
                parent=self)
726
 
                # Doesn't set a parent for the dialog..
727
 
            if response == Gtk.ResponseType.NO:
 
676
                _i18n("Unknown files exist in the working tree. Commit anyway?"))
 
677
            if response == gtk.RESPONSE_NO:
728
678
                return
729
679
            break
730
680
 
743
693
            response = self._question_dialog(
744
694
                _i18n('Commit with no changes?'),
745
695
                _i18n('There are no changes in the working tree.'
746
 
                      ' Do you want to commit anyway?'),
747
 
                parent=self)
748
 
            if response == Gtk.ResponseType.YES:
 
696
                      ' Do you want to commit anyway?'))
 
697
            if response == gtk.RESPONSE_YES:
749
698
                rev_id = self._wt.commit(message,
750
699
                               allow_pointless=True,
751
700
                               strict=False,
753
702
                               specific_files=specific_files,
754
703
                               revprops=revprops)
755
704
        self.committed_revision_id = rev_id
756
 
        # destroy old comments if any
757
 
        SavedCommitMessagesManager().save(self._wt, self._wt.branch)
758
 
        self.response(Gtk.ResponseType.OK)
 
705
        self.response(gtk.RESPONSE_OK)
759
706
 
760
707
    def _get_global_commit_message(self):
761
708
        buf = self._global_message_text_view.get_buffer()
762
709
        start, end = buf.get_bounds()
763
 
        text = buf.get_text(start, end, True)
764
 
        return _sanitize_and_decode_message(text)
 
710
        return buf.get_text(start, end).decode('utf-8')
765
711
 
766
712
    def _set_global_commit_message(self, message):
767
713
        """Just a helper for the test suite."""
788
734
                                       show_offset=False)
789
735
        rev_dict['revision_id'] = rev.revision_id
790
736
        return rev_dict
791