/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: 2011-09-05 03:44:26 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110905034426-p98pxnay9rmzkr99
Fix the initializer for many classes.
Replace Gtk.Dialog.vbox with .get_content_area().

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
33
 
 
34
 
from dialog import error_dialog, question_dialog
35
 
from errors import show_bzr_error
 
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
from bzrlib import (
 
25
    errors,
 
26
    osutils,
 
27
    trace,
 
28
    )
 
29
try:
 
30
    from bzrlib import bencode
 
31
except ImportError:
 
32
    from bzrlib.util import bencode
 
33
 
 
34
from bzrlib.plugins.gtk.dialog import question_dialog
 
35
from bzrlib.plugins.gtk.errors import show_bzr_error
 
36
from bzrlib.plugins.gtk.i18n import _i18n
36
37
 
37
38
try:
38
39
    import dbus
96
97
    return pm
97
98
 
98
99
 
99
 
class CommitDialog(gtk.Dialog):
 
100
_newline_variants_re = re.compile(r'\r\n?')
 
101
def _sanitize_and_decode_message(utf8_message):
 
102
    """Turn a utf-8 message into a sanitized Unicode message."""
 
103
    fixed_newline = _newline_variants_re.sub('\n', utf8_message)
 
104
    return fixed_newline.decode('utf-8')
 
105
 
 
106
 
 
107
class CommitDialog(Gtk.Dialog):
100
108
    """Implementation of Commit."""
101
109
 
102
110
    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))
 
111
        super(CommitDialog, self).__init__(
 
112
            title="Commit to %s" % wt.basedir, parent=parent, flags=0)
 
113
        self.connect('delete-event', self._on_delete_window)
107
114
        self._question_dialog = question_dialog
108
115
 
 
116
        self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
 
117
 
109
118
        self._wt = wt
110
119
        # TODO: Do something with this value, it is used by Olive
111
120
        #       It used to set all changes but this one to False
113
122
        self._enable_per_file_commits = True
114
123
        self._commit_all_changes = True
115
124
        self.committed_revision_id = None # Nothing has been committed yet
 
125
        self._saved_commit_messages_manager = SavedCommitMessagesManager(
 
126
            self._wt, self._wt.branch)
116
127
 
117
128
        self.setup_params()
118
129
        self.construct()
164
175
        store = self._files_store
165
176
        self._treeview_files.set_model(None)
166
177
 
167
 
        added = _('added')
168
 
        removed = _('removed')
169
 
        renamed = _('renamed')
170
 
        renamed_and_modified = _('renamed and modified')
171
 
        modified = _('modified')
172
 
        kind_changed = _('kind changed')
 
178
        added = _i18n('added')
 
179
        removed = _i18n('removed')
 
180
        renamed = _i18n('renamed')
 
181
        renamed_and_modified = _i18n('renamed and modified')
 
182
        modified = _i18n('modified')
 
183
        kind_changed = _i18n('kind changed')
173
184
 
174
185
        # The store holds:
175
186
        # [file_id, real path, checkbox, display path, changes type, message]
187
198
        self._basis_tree.lock_read()
188
199
        try:
189
200
            from diff import iter_changes_to_status
 
201
            saved_file_messages = self._saved_commit_messages_manager.get()[1]
190
202
            for (file_id, real_path, change_type, display_path
191
203
                ) in iter_changes_to_status(self._basis_tree, self._wt):
192
204
                if self._selected and real_path != self._selected:
193
205
                    enabled = False
194
206
                else:
195
207
                    enabled = True
 
208
                try:
 
209
                    default_message = saved_file_messages[file_id]
 
210
                except KeyError:
 
211
                    default_message = ''
196
212
                item_iter = store.append([
197
213
                    file_id,
198
214
                    real_path.encode('UTF-8'),
199
215
                    enabled,
200
216
                    display_path.encode('UTF-8'),
201
217
                    change_type,
202
 
                    '', # Initial comment
 
218
                    default_message, # Initial comment
203
219
                    ])
204
220
                if self._selected and enabled:
205
221
                    initial_cursor = store.get_path(item_iter)
212
228
        # This sets the cursor, which causes the expander to close, which
213
229
        # causes the _file_message_text_view to never get realized. So we have
214
230
        # to give it a little kick, or it warns when we try to grab the focus
215
 
        self._treeview_files.set_cursor(initial_cursor)
 
231
        self._treeview_files.set_cursor(initial_cursor, None, False)
216
232
 
217
233
        def _realize_file_message_tree_view(*args):
218
234
            self._file_message_text_view.realize()
231
247
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
232
248
                                           '/org/freedesktop/NetworkManager')
233
249
            except dbus.DBusException:
234
 
                mutter("networkmanager not available.")
 
250
                trace.mutter("networkmanager not available.")
235
251
                self._check_local.show()
236
252
                return
237
253
            
243
259
            except dbus.DBusException, e:
244
260
                # Silently drop errors. While DBus may be
245
261
                # available, NetworkManager doesn't necessarily have to be
246
 
                mutter("unable to get networkmanager state: %r" % e)
 
262
                trace.mutter("unable to get networkmanager state: %r" % e)
247
263
        self._check_local.show()
248
264
 
249
265
    def _fill_in_per_file_info(self):
257
273
            self._enable_per_file_commits = True
258
274
        if not self._enable_per_file_commits:
259
275
            self._file_message_expander.hide()
260
 
            self._global_message_label.set_markup(_('<b>Commit Message</b>'))
 
276
            self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
261
277
 
262
278
    def _compute_delta(self):
263
279
        self._delta = self._wt.changes_from(self._basis_tree)
266
282
        """Build up the dialog widgets."""
267
283
        # The primary pane which splits it into left and right (adjustable)
268
284
        # sections.
269
 
        self._hpane = gtk.HPaned()
 
285
        self._hpane = Gtk.HPaned()
270
286
 
271
287
        self._construct_left_pane()
272
288
        self._construct_right_pane()
273
289
        self._construct_action_pane()
274
290
 
275
 
        self.vbox.pack_start(self._hpane)
 
291
        self.get_content_area().pack_start(self._hpane, True, True, 0)
276
292
        self._hpane.show()
277
293
        self.set_focus(self._global_message_text_view)
278
294
 
297
313
        self._hpane.set_position(300)
298
314
 
299
315
    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)
 
316
        group = Gtk.AccelGroup()
 
317
        group.connect(Gdk.keyval_from_name('N'),
 
318
                      Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
303
319
        self.add_accel_group(group)
304
320
 
 
321
        # ignore the escape key (avoid closing the window)
 
322
        self.connect_object('close', self.emit_stop_by_name, 'close')
 
323
 
305
324
    def _construct_left_pane(self):
306
 
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
 
325
        self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
307
326
        self._construct_file_list()
308
327
        self._construct_pending_list()
309
328
 
310
 
        self._check_local = gtk.CheckButton(_("_Only commit locally"),
 
329
        self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
311
330
                                            use_underline=True)
312
 
        self._left_pane_box.pack_end(self._check_local, False, False)
 
331
        self._left_pane_box.pack_end(self._check_local, False, False, 0)
313
332
        self._check_local.set_active(False)
314
333
 
315
334
        self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
322
341
        # commit, and 1 for file commit, and it looked good. But I don't seem
323
342
        # to have a way to do that with the gtk boxes... :( (Which is extra
324
343
        # weird since wx uses gtk on Linux...)
325
 
        self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
 
344
        self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
326
345
        self._right_pane_table.set_row_spacings(5)
327
346
        self._right_pane_table.set_col_spacings(5)
328
347
        self._right_pane_table_row = 0
334
353
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
335
354
 
336
355
    def _construct_action_pane(self):
337
 
        self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
 
356
        self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
 
357
        self._button_cancel.connect('clicked', self._on_cancel_clicked)
 
358
        self._button_cancel.show()
 
359
        self.get_action_area().pack_end(
 
360
            self._button_cancel, True, True, 0)
 
361
        self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
338
362
        self._button_commit.connect('clicked', self._on_commit_clicked)
339
 
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
 
363
        self._button_commit.set_can_default(True)
340
364
        self._button_commit.show()
341
 
        self.action_area.pack_end(self._button_commit)
 
365
        self.get_action_area().pack_end(
 
366
            self._button_commit, True, True, 0)
342
367
        self._button_commit.grab_default()
343
368
 
344
369
    def _add_to_right_table(self, widget, weight, expanding=False):
350
375
        """
351
376
        end_row = self._right_pane_table_row + weight
352
377
        options = 0
353
 
        expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
 
378
        expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
354
379
        if expanding:
355
380
            options = expand_opts
356
381
        self._right_pane_table.attach(widget, 0, 1,
359
384
        self._right_pane_table_row = end_row
360
385
 
361
386
    def _construct_file_list(self):
362
 
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
363
 
        file_label = gtk.Label(_('Files'))
 
387
        self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
 
388
        file_label = Gtk.Label(label=_i18n('Files'))
364
389
        # file_label.show()
365
 
        self._files_box.pack_start(file_label, expand=False)
 
390
        self._files_box.pack_start(file_label, False, True, 0)
366
391
 
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
        self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
 
393
            None, _i18n("Commit all changes"))
 
394
        self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
370
395
        self._commit_all_files_radio.show()
371
396
        self._commit_all_files_radio.connect('toggled',
372
397
            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)
 
398
        self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
 
399
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
 
400
        self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
376
401
        self._commit_selected_radio.show()
377
402
        self._commit_selected_radio.connect('toggled',
378
403
            self._toggle_commit_selection)
379
404
        if self._pending:
380
 
            self._commit_all_files_radio.set_label(_('Commit all changes*'))
 
405
            self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
381
406
            self._commit_all_files_radio.set_sensitive(False)
382
407
            self._commit_selected_radio.set_sensitive(False)
383
408
 
384
 
        scroller = gtk.ScrolledWindow()
385
 
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
386
 
        self._treeview_files = gtk.TreeView()
 
409
        scroller = Gtk.ScrolledWindow()
 
410
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
411
        self._treeview_files = Gtk.TreeView()
387
412
        self._treeview_files.show()
388
413
        scroller.add(self._treeview_files)
389
 
        scroller.set_shadow_type(gtk.SHADOW_IN)
 
414
        scroller.set_shadow_type(Gtk.ShadowType.IN)
390
415
        scroller.show()
391
 
        self._files_box.pack_start(scroller,
392
 
                                   expand=True, fill=True)
 
416
        self._files_box.pack_start(scroller, True, True, 0)
393
417
        self._files_box.show()
394
 
        self._left_pane_box.pack_start(self._files_box)
 
418
        self._left_pane_box.pack_start(self._files_box, True, True, 0)
395
419
 
396
420
        # Keep note that all strings stored in a ListStore must be UTF-8
397
421
        # strings. GTK does not support directly setting and restoring Unicode
398
422
        # 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
 
423
        liststore = Gtk.ListStore(
 
424
            GObject.TYPE_STRING,  # [0] file_id
 
425
            GObject.TYPE_STRING,  # [1] real path
 
426
            GObject.TYPE_BOOLEAN, # [2] checkbox
 
427
            GObject.TYPE_STRING,  # [3] display path
 
428
            GObject.TYPE_STRING,  # [4] changes type
 
429
            GObject.TYPE_STRING,  # [5] commit message
406
430
            )
407
431
        self._files_store = liststore
408
432
        self._treeview_files.set_model(liststore)
409
 
        crt = gtk.CellRendererToggle()
 
433
        crt = Gtk.CellRendererToggle()
410
434
        crt.set_property('activatable', not bool(self._pending))
411
435
        crt.connect("toggled", self._toggle_commit, self._files_store)
412
436
        if self._pending:
413
 
            name = _('Commit*')
 
437
            name = _i18n('Commit*')
414
438
        else:
415
 
            name = _('Commit')
416
 
        commit_col = gtk.TreeViewColumn(name, crt, active=2)
 
439
            name = _i18n('Commit')
 
440
        commit_col = Gtk.TreeViewColumn(name, crt, active=2)
417
441
        commit_col.set_visible(False)
418
442
        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))
 
443
        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
 
444
                                           Gtk.CellRendererText(), text=3))
 
445
        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
 
446
                                           Gtk.CellRendererText(), text=4))
423
447
        self._treeview_files.connect('cursor-changed',
424
448
                                     self._on_treeview_files_cursor_changed)
425
449
 
440
464
                checked_col.set_visible(False)
441
465
            else:
442
466
                checked_col.set_visible(True)
443
 
            renderer = checked_col.get_cell_renderers()[0]
 
467
            renderer = checked_col.get_cells()[0]
444
468
            renderer.set_property('activatable', not all_files)
445
469
 
446
470
    def _construct_pending_list(self):
447
471
        # Pending information defaults to hidden, we put it all in 1 box, so
448
472
        # that we can show/hide all of them at once
449
 
        self._pending_box = gtk.VBox()
 
473
        self._pending_box = Gtk.VBox()
450
474
        self._pending_box.hide()
451
475
 
452
 
        pending_message = gtk.Label()
 
476
        pending_message = Gtk.Label()
453
477
        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)
 
478
            _i18n('<i>* Cannot select specific files when merging</i>'))
 
479
        self._pending_box.pack_start(pending_message, False, True, 5)
456
480
        pending_message.show()
457
481
 
458
 
        pending_label = gtk.Label(_('Pending Revisions'))
459
 
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
 
482
        pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
 
483
        self._pending_box.pack_start(pending_label, False, True, 0)
460
484
        pending_label.show()
461
485
 
462
 
        scroller = gtk.ScrolledWindow()
463
 
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
464
 
        self._treeview_pending = gtk.TreeView()
 
486
        scroller = Gtk.ScrolledWindow()
 
487
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
488
        self._treeview_pending = Gtk.TreeView()
465
489
        scroller.add(self._treeview_pending)
466
 
        scroller.set_shadow_type(gtk.SHADOW_IN)
 
490
        scroller.set_shadow_type(Gtk.ShadowType.IN)
467
491
        scroller.show()
468
 
        self._pending_box.pack_start(scroller,
469
 
                                     expand=True, fill=True, padding=5)
 
492
        self._pending_box.pack_start(scroller, True, True, 5)
470
493
        self._treeview_pending.show()
471
 
        self._left_pane_box.pack_start(self._pending_box)
 
494
        self._left_pane_box.pack_start(self._pending_box, True, True, 0)
472
495
 
473
 
        liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
474
 
                                  gobject.TYPE_STRING, # date
475
 
                                  gobject.TYPE_STRING, # committer
476
 
                                  gobject.TYPE_STRING, # summary
 
496
        liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
 
497
                                  GObject.TYPE_STRING, # date
 
498
                                  GObject.TYPE_STRING, # committer
 
499
                                  GObject.TYPE_STRING, # summary
477
500
                                 )
478
501
        self._pending_store = liststore
479
502
        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))
 
503
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
 
504
                                             Gtk.CellRendererText(), text=1))
 
505
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
 
506
                                             Gtk.CellRendererText(), text=2))
 
507
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
 
508
                                             Gtk.CellRendererText(), text=3))
486
509
 
487
510
    def _construct_diff_view(self):
488
 
        from diff import DiffView
 
511
        from bzrlib.plugins.gtk.diff import DiffView
489
512
 
490
513
        # TODO: jam 2007-10-30 The diff label is currently disabled. If we
491
514
        #       decide that we really don't ever want to display it, we should
492
515
        #       actually remove it, and other references to it, along with the
493
516
        #       tests that it is set properly.
494
 
        self._diff_label = gtk.Label(_('Diff for whole tree'))
 
517
        self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
495
518
        self._diff_label.set_alignment(0, 0)
496
519
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
497
520
        self._add_to_right_table(self._diff_label, 1, False)
502
525
        self._diff_view.show()
503
526
 
504
527
    def _construct_file_message(self):
505
 
        scroller = gtk.ScrolledWindow()
506
 
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
528
        scroller = Gtk.ScrolledWindow()
 
529
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
507
530
 
508
 
        self._file_message_text_view = gtk.TextView()
 
531
        self._file_message_text_view = Gtk.TextView()
509
532
        scroller.add(self._file_message_text_view)
510
 
        scroller.set_shadow_type(gtk.SHADOW_IN)
 
533
        scroller.set_shadow_type(Gtk.ShadowType.IN)
511
534
        scroller.show()
512
535
 
513
 
        self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
514
 
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
 
536
        self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
 
537
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
515
538
        self._file_message_text_view.set_accepts_tab(False)
516
539
        self._file_message_text_view.show()
517
540
 
518
 
        self._file_message_expander = gtk.Expander(_('File commit message'))
 
541
        self._file_message_expander = Gtk.Expander(
 
542
            label=_i18n('File commit message'))
519
543
        self._file_message_expander.set_expanded(True)
520
544
        self._file_message_expander.add(scroller)
521
545
        self._add_to_right_table(self._file_message_expander, 1, False)
522
546
        self._file_message_expander.show()
523
547
 
524
548
    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>'))
 
549
        self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
 
550
        self._global_message_label.set_markup(
 
551
            _i18n('<b>Global Commit Message</b>'))
527
552
        self._global_message_label.set_alignment(0, 0)
528
553
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
529
554
        self._add_to_right_table(self._global_message_label, 1, False)
530
555
        # Can we remove the spacing between the label and the box?
531
556
        self._global_message_label.show()
532
557
 
533
 
        scroller = gtk.ScrolledWindow()
534
 
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
558
        scroller = Gtk.ScrolledWindow()
 
559
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
535
560
 
536
 
        self._global_message_text_view = gtk.TextView()
537
 
        self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
 
561
        self._global_message_text_view = Gtk.TextView()
 
562
        self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
 
563
        self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
538
564
        scroller.add(self._global_message_text_view)
539
 
        scroller.set_shadow_type(gtk.SHADOW_IN)
 
565
        scroller.set_shadow_type(Gtk.ShadowType.IN)
540
566
        scroller.show()
541
567
        self._add_to_right_table(scroller, 2, True)
542
 
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
 
568
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
543
569
        self._file_message_text_view.set_accepts_tab(False)
544
570
        self._global_message_text_view.show()
545
571
 
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)
 
578
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
553
579
            if path is None:
554
580
                self._diff_view.show_diff(None)
555
581
            else:
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), None, 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
 
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
625
        if file_id is None: # Whole tree
599
 
            self._file_message_expander.set_label(_('File commit message'))
 
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)
625
652
            if self._commit_all_changes or record[2]:# [2] checkbox
626
653
                file_id = record[0] # [0] file_id
627
654
                path = record[1]    # [1] real path
628
 
                file_message = record[5] # [5] commit message
 
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
 
 
796
 
 
797
class SavedCommitMessagesManager:
 
798
    """Save glogal and per-file commit messages.
 
799
 
 
800
    Saves global commit message and utf-8 file_id->message dictionary
 
801
    of per-file commit messages on disk. Re-reads them later for re-using.
 
802
    """
 
803
 
 
804
    def __init__(self, tree=None, branch=None):
 
805
        """If branch is None, builds empty messages, otherwise reads them
 
806
        from branch's disk storage. 'tree' argument is for the future."""
 
807
        if branch is None:
 
808
            self.global_message = u''
 
809
            self.file_messages = {}
 
810
        else:
 
811
            config = branch.get_config()
 
812
            self.global_message = config.get_user_option(
 
813
                'gtk_global_commit_message')
 
814
            if self.global_message is None:
 
815
                self.global_message = u''
 
816
            file_messages = config.get_user_option('gtk_file_commit_messages')
 
817
            if file_messages: # unicode and B-encoded:
 
818
                self.file_messages = bencode.bdecode(
 
819
                    file_messages.encode('UTF-8'))
 
820
            else:
 
821
                self.file_messages = {}
 
822
 
 
823
    def get(self):
 
824
        return self.global_message, self.file_messages
 
825
 
 
826
    def is_not_empty(self):
 
827
        return bool(self.global_message or self.file_messages)
 
828
 
 
829
    def insert(self, global_message, file_info):
 
830
        """Formats per-file commit messages (list of dictionaries, one per file)
 
831
        into one utf-8 file_id->message dictionary and merges this with
 
832
        previously existing dictionary. Merges global commit message too."""
 
833
        file_messages = {}
 
834
        for fi in file_info:
 
835
            file_message = fi['message']
 
836
            if file_message:
 
837
                file_messages[fi['file_id']] = file_message # utf-8 strings
 
838
        for k,v in file_messages.iteritems():
 
839
            try:
 
840
                self.file_messages[k] = v + '\n******\n' + self.file_messages[k]
 
841
            except KeyError:
 
842
                self.file_messages[k] = v
 
843
        if self.global_message:
 
844
            self.global_message = global_message + '\n******\n' \
 
845
                + self.global_message
 
846
        else:
 
847
            self.global_message = global_message
 
848
 
 
849
    def save(self, tree, branch):
 
850
        # We store in branch's config, which can be a problem if two gcommit
 
851
        # are done in two checkouts of one single branch (comments overwrite
 
852
        # each other). Ideally should be in working tree. But uncommit does
 
853
        # not always have a working tree, though it always has a branch.
 
854
        # 'tree' argument is for the future
 
855
        config = branch.get_config()
 
856
        # should it be named "gtk_" or some more neutral name ("gui_" ?) to
 
857
        # be compatible with qbzr in the future?
 
858
        config.set_user_option('gtk_global_commit_message', self.global_message)
 
859
        # bencode() does not know unicode objects but set_user_option()
 
860
        # requires one:
 
861
        config.set_user_option(
 
862
            'gtk_file_commit_messages',
 
863
            bencode.bencode(self.file_messages).decode('UTF-8'))
 
864
 
 
865
 
 
866
def save_commit_messages(local, master, old_revno, old_revid,
 
867
                         new_revno, new_revid):
 
868
    b = local
 
869
    if b is None:
 
870
        b = master
 
871
    mgr = SavedCommitMessagesManager(None, b)
 
872
    revid_iterator = b.repository.iter_reverse_revision_history(old_revid)
 
873
    cur_revno = old_revno
 
874
    new_revision_id = old_revid
 
875
    graph = b.repository.get_graph()
 
876
    for rev_id in revid_iterator:
 
877
        if cur_revno == new_revno:
 
878
            break
 
879
        cur_revno -= 1
 
880
        rev = b.repository.get_revision(rev_id)
 
881
        file_info = rev.properties.get('file-info', None)
 
882
        if file_info is None:
 
883
            file_info = {}
 
884
        else:
 
885
            file_info = bencode.bdecode(file_info.encode('UTF-8'))
 
886
        global_message = osutils.safe_unicode(rev.message)
 
887
        # Concatenate comment of the uncommitted revision
 
888
        mgr.insert(global_message, file_info)
 
889
 
 
890
        parents = graph.get_parent_map([rev_id]).get(rev_id, None)
 
891
        if not parents:
 
892
            continue
 
893
    mgr.save(None, b)