/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: Curtis Hovey
  • Date: 2012-02-05 05:14:11 UTC
  • mto: This revision was merged to the branch mainline in revision 775.
  • Revision ID: sinzui.is@verizon.net-20120205051411-y9ra08wae1wsfv52
Remove unneeded gtksourceview1 support.

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