/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: Andrew Bennetts
  • Date: 2008-04-29 08:17:01 UTC
  • mto: This revision was merged to the branch mainline in revision 476.
  • Revision ID: andrew@puzzling.org-20080429081701-2pu9uteic8o88nre
Simple hack to fix gannotate.

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