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