/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to commit.py

  • Committer: Jelmer Vernooij
  • Date: 2008-03-28 19:26:53 UTC
  • mto: (450.1.13 trunk)
  • mto: This revision was merged to the branch mainline in revision 458.
  • Revision ID: jelmer@samba.org-20080328192653-trzptkwahx1tulz9
Add module for preferences code.

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 Gtk
20
 
from gi.repository import GObject
21
 
from gi.repository import Pango
22
 
 
23
 
from bzrlib import (
24
 
    errors,
25
 
    osutils,
26
 
    trace,
27
 
    )
28
 
try:
29
 
    from bzrlib import bencode
30
 
except ImportError:
31
 
    from bzrlib.util import bencode
32
 
 
33
 
from bzrlib.plugins.gtk.dialog import question_dialog
34
 
from bzrlib.plugins.gtk.errors import show_bzr_error
35
 
from bzrlib.plugins.gtk.i18n import _i18n
 
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
36
36
 
37
37
try:
38
38
    import dbus
96
96
    return pm
97
97
 
98
98
 
99
 
_newline_variants_re = re.compile(r'\r\n?')
100
 
def _sanitize_and_decode_message(utf8_message):
101
 
    """Turn a utf-8 message into a sanitized Unicode message."""
102
 
    fixed_newline = _newline_variants_re.sub('\n', utf8_message)
103
 
    return fixed_newline.decode('utf-8')
104
 
 
105
 
 
106
 
class CommitDialog(Gtk.Dialog):
 
99
class CommitDialog(gtk.Dialog):
107
100
    """Implementation of Commit."""
108
101
 
109
102
    def __init__(self, wt, selected=None, parent=None):
110
 
        GObject.GObject.__init__(self, title="Commit to %s" % wt.basedir,
111
 
                            parent=parent, flags=0,)
112
 
        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))
113
107
        self._question_dialog = question_dialog
114
108
 
115
 
        self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
116
 
 
117
109
        self._wt = wt
118
110
        # TODO: Do something with this value, it is used by Olive
119
111
        #       It used to set all changes but this one to False
121
113
        self._enable_per_file_commits = True
122
114
        self._commit_all_changes = True
123
115
        self.committed_revision_id = None # Nothing has been committed yet
124
 
        self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)
125
116
 
126
117
        self.setup_params()
127
118
        self.construct()
173
164
        store = self._files_store
174
165
        self._treeview_files.set_model(None)
175
166
 
176
 
        added = _i18n('added')
177
 
        removed = _i18n('removed')
178
 
        renamed = _i18n('renamed')
179
 
        renamed_and_modified = _i18n('renamed and modified')
180
 
        modified = _i18n('modified')
181
 
        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')
182
173
 
183
174
        # The store holds:
184
175
        # [file_id, real path, checkbox, display path, changes type, message]
196
187
        self._basis_tree.lock_read()
197
188
        try:
198
189
            from diff import iter_changes_to_status
199
 
            saved_file_messages = self._saved_commit_messages_manager.get()[1]
200
190
            for (file_id, real_path, change_type, display_path
201
191
                ) in iter_changes_to_status(self._basis_tree, self._wt):
202
192
                if self._selected and real_path != self._selected:
203
193
                    enabled = False
204
194
                else:
205
195
                    enabled = True
206
 
                try:
207
 
                    default_message = saved_file_messages[file_id]
208
 
                except KeyError:
209
 
                    default_message = ''
210
196
                item_iter = store.append([
211
197
                    file_id,
212
198
                    real_path.encode('UTF-8'),
213
199
                    enabled,
214
200
                    display_path.encode('UTF-8'),
215
201
                    change_type,
216
 
                    default_message, # Initial comment
 
202
                    '', # Initial comment
217
203
                    ])
218
204
                if self._selected and enabled:
219
205
                    initial_cursor = store.get_path(item_iter)
245
231
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
246
232
                                           '/org/freedesktop/NetworkManager')
247
233
            except dbus.DBusException:
248
 
                trace.mutter("networkmanager not available.")
 
234
                mutter("networkmanager not available.")
249
235
                self._check_local.show()
250
236
                return
251
237
            
257
243
            except dbus.DBusException, e:
258
244
                # Silently drop errors. While DBus may be
259
245
                # available, NetworkManager doesn't necessarily have to be
260
 
                trace.mutter("unable to get networkmanager state: %r" % e)
 
246
                mutter("unable to get networkmanager state: %r" % e)
261
247
        self._check_local.show()
262
248
 
263
249
    def _fill_in_per_file_info(self):
271
257
            self._enable_per_file_commits = True
272
258
        if not self._enable_per_file_commits:
273
259
            self._file_message_expander.hide()
274
 
            self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
 
260
            self._global_message_label.set_markup(_('<b>Commit Message</b>'))
275
261
 
276
262
    def _compute_delta(self):
277
263
        self._delta = self._wt.changes_from(self._basis_tree)
280
266
        """Build up the dialog widgets."""
281
267
        # The primary pane which splits it into left and right (adjustable)
282
268
        # sections.
283
 
        self._hpane = Gtk.HPaned()
 
269
        self._hpane = gtk.HPaned()
284
270
 
285
271
        self._construct_left_pane()
286
272
        self._construct_right_pane()
287
273
        self._construct_action_pane()
288
274
 
289
 
        self.vbox.pack_start(self._hpane, True, True, 0)
 
275
        self.vbox.pack_start(self._hpane)
290
276
        self._hpane.show()
291
277
        self.set_focus(self._global_message_text_view)
292
278
 
311
297
        self._hpane.set_position(300)
312
298
 
313
299
    def _construct_accelerators(self):
314
 
        group = Gtk.AccelGroup()
315
 
        group.connect_group(Gdk.keyval_from_name('N'),
316
 
                            Gdk.EventMask.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)
317
303
        self.add_accel_group(group)
318
304
 
319
 
        # ignore the escape key (avoid closing the window)
320
 
        self.connect_object('close', self.emit_stop_by_name, 'close')
321
 
 
322
305
    def _construct_left_pane(self):
323
 
        self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
 
306
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
324
307
        self._construct_file_list()
325
308
        self._construct_pending_list()
326
309
 
327
 
        self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
 
310
        self._check_local = gtk.CheckButton(_("_Only commit locally"),
328
311
                                            use_underline=True)
329
312
        self._left_pane_box.pack_end(self._check_local, False, False)
330
313
        self._check_local.set_active(False)
339
322
        # commit, and 1 for file commit, and it looked good. But I don't seem
340
323
        # to have a way to do that with the gtk boxes... :( (Which is extra
341
324
        # weird since wx uses gtk on Linux...)
342
 
        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)
343
326
        self._right_pane_table.set_row_spacings(5)
344
327
        self._right_pane_table.set_col_spacings(5)
345
328
        self._right_pane_table_row = 0
351
334
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
352
335
 
353
336
    def _construct_action_pane(self):
354
 
        self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
355
 
        self._button_cancel.connect('clicked', self._on_cancel_clicked)
356
 
        self._button_cancel.show()
357
 
        self.action_area.pack_end(self._button_cancel)
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
341
        self.action_area.pack_end(self._button_commit)
363
342
        self._button_commit.grab_default()
371
350
        """
372
351
        end_row = self._right_pane_table_row + weight
373
352
        options = 0
374
 
        expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
 
353
        expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
375
354
        if expanding:
376
355
            options = expand_opts
377
356
        self._right_pane_table.attach(widget, 0, 1,
380
359
        self._right_pane_table_row = end_row
381
360
 
382
361
    def _construct_file_list(self):
383
 
        self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
384
 
        file_label = Gtk.Label(label=_i18n('Files'))
 
362
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
 
363
        file_label = gtk.Label(_('Files'))
385
364
        # file_label.show()
386
 
        self._files_box.pack_start(file_label, False, True, 0)
 
365
        self._files_box.pack_start(file_label, expand=False)
387
366
 
388
 
        self._commit_all_files_radio = Gtk.RadioButton(
389
 
            None, _i18n("Commit all changes"))
390
 
        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)
391
370
        self._commit_all_files_radio.show()
392
371
        self._commit_all_files_radio.connect('toggled',
393
372
            self._toggle_commit_selection)
394
 
        self._commit_selected_radio = Gtk.RadioButton(
395
 
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
396
 
        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)
397
376
        self._commit_selected_radio.show()
398
377
        self._commit_selected_radio.connect('toggled',
399
378
            self._toggle_commit_selection)
400
379
        if self._pending:
401
 
            self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
 
380
            self._commit_all_files_radio.set_label(_('Commit all changes*'))
402
381
            self._commit_all_files_radio.set_sensitive(False)
403
382
            self._commit_selected_radio.set_sensitive(False)
404
383
 
405
 
        scroller = Gtk.ScrolledWindow()
406
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
407
 
        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()
408
387
        self._treeview_files.show()
409
388
        scroller.add(self._treeview_files)
410
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
389
        scroller.set_shadow_type(gtk.SHADOW_IN)
411
390
        scroller.show()
412
391
        self._files_box.pack_start(scroller,
413
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
 
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>'))
 
454
            _('<i>* Cannot select specific files when merging</i>'))
476
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'))
 
458
        pending_label = gtk.Label(_('Pending Revisions'))
480
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
468
        self._pending_box.pack_start(scroller,
490
469
                                     expand=True, fill=True, padding=5)
491
470
        self._treeview_pending.show()
492
 
        self._left_pane_box.pack_start(self._pending_box, True, True, 0)
 
471
        self._left_pane_box.pack_start(self._pending_box)
493
472
 
494
 
        liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
495
 
                                  GObject.TYPE_STRING, # date
496
 
                                  GObject.TYPE_STRING, # committer
497
 
                                  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
498
477
                                 )
499
478
        self._pending_store = liststore
500
479
        self._treeview_pending.set_model(liststore)
501
 
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
502
 
                                             Gtk.CellRendererText(), text=1))
503
 
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
504
 
                                             Gtk.CellRendererText(), text=2))
505
 
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
506
 
                                             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))
507
486
 
508
487
    def _construct_diff_view(self):
509
 
        from bzrlib.plugins.gtk.diff import DiffView
 
488
        from diff import DiffView
510
489
 
511
490
        # TODO: jam 2007-10-30 The diff label is currently disabled. If we
512
491
        #       decide that we really don't ever want to display it, we should
513
492
        #       actually remove it, and other references to it, along with the
514
493
        #       tests that it is set properly.
515
 
        self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
 
494
        self._diff_label = gtk.Label(_('Diff for whole tree'))
516
495
        self._diff_label.set_alignment(0, 0)
517
496
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
518
497
        self._add_to_right_table(self._diff_label, 1, False)
523
502
        self._diff_view.show()
524
503
 
525
504
    def _construct_file_message(self):
526
 
        scroller = Gtk.ScrolledWindow()
527
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
505
        scroller = gtk.ScrolledWindow()
 
506
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
528
507
 
529
 
        self._file_message_text_view = Gtk.TextView()
 
508
        self._file_message_text_view = gtk.TextView()
530
509
        scroller.add(self._file_message_text_view)
531
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
510
        scroller.set_shadow_type(gtk.SHADOW_IN)
532
511
        scroller.show()
533
512
 
534
 
        self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
535
 
        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)
536
515
        self._file_message_text_view.set_accepts_tab(False)
537
516
        self._file_message_text_view.show()
538
517
 
539
 
        self._file_message_expander = Gtk.Expander(_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
 
572
549
 
573
550
        if selection is not None:
574
551
            path, display_path = model.get(selection, 1, 3)
575
 
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
 
552
            self._diff_label.set_text(_('Diff for ') + display_path)
576
553
            if path is None:
577
554
                self._diff_view.show_diff(None)
578
555
            else:
619
596
        text_buffer = self._file_message_text_view.get_buffer()
620
597
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
621
598
        if file_id is None: # Whole tree
622
 
            self._file_message_expander.set_label(_i18n('File commit message'))
 
599
            self._file_message_expander.set_label(_('File commit message'))
623
600
            self._file_message_expander.set_expanded(False)
624
601
            self._file_message_expander.set_sensitive(False)
625
602
            text_buffer.set_text('')
626
603
            self._last_selected_file = None
627
604
        else:
628
 
            self._file_message_expander.set_label(_i18n('Commit message for ')
 
605
            self._file_message_expander.set_label(_('Commit message for ')
629
606
                                                  + display_path)
630
607
            self._file_message_expander.set_expanded(True)
631
608
            self._file_message_expander.set_sensitive(True)
648
625
            if self._commit_all_changes or record[2]:# [2] checkbox
649
626
                file_id = record[0] # [0] file_id
650
627
                path = record[1]    # [1] real path
651
 
                # [5] commit message
652
 
                file_message = _sanitize_and_decode_message(record[5])
 
628
                file_message = record[5] # [5] commit message
653
629
                files.append(path.decode('UTF-8'))
654
630
                if self._enable_per_file_commits and file_message:
655
631
                    # All of this needs to be utf-8 information
656
 
                    file_message = file_message.encode('UTF-8')
657
632
                    file_info.append({'path':path, 'file_id':file_id,
658
633
                                     'message':file_message})
659
634
        file_info.sort(key=lambda x:(x['path'], x['file_id']))
663
638
            return files, []
664
639
 
665
640
    @show_bzr_error
666
 
    def _on_cancel_clicked(self, button):
667
 
        """ Cancel button clicked handler. """
668
 
        self._do_cancel()
669
 
 
670
 
    @show_bzr_error
671
 
    def _on_delete_window(self, source, event):
672
 
        """ Delete window handler. """
673
 
        self._do_cancel()
674
 
 
675
 
    def _do_cancel(self):
676
 
        """If requested, saves commit messages when cancelling gcommit; they are re-used by a next gcommit"""
677
 
        mgr = SavedCommitMessagesManager()
678
 
        self._saved_commit_messages_manager = mgr
679
 
        mgr.insert(self._get_global_commit_message(),
680
 
                   self._get_specific_files()[1])
681
 
        if mgr.is_not_empty(): # maybe worth saving
682
 
            response = self._question_dialog(
683
 
                _i18n('Commit cancelled'),
684
 
                _i18n('Do you want to save your commit messages ?'),
685
 
                parent=self)
686
 
            if response == Gtk.ResponseType.NO:
687
 
                 # save nothing and destroy old comments if any
688
 
                mgr = SavedCommitMessagesManager()
689
 
        mgr.save(self._wt, self._wt.branch)
690
 
        self.response(Gtk.ResponseType.CANCEL) # close window
691
 
 
692
 
    @show_bzr_error
693
641
    def _on_commit_clicked(self, button):
694
642
        """ Commit button clicked handler. """
695
643
        self._do_commit()
699
647
 
700
648
        if message == '':
701
649
            response = self._question_dialog(
702
 
                _i18n('Commit with an empty message?'),
703
 
                _i18n('You can describe your commit intent in the message.'),
704
 
                parent=self)
705
 
            if response == Gtk.ResponseType.NO:
 
650
                            _('Commit with an empty message?'),
 
651
                            _('You can describe your commit intent in the message.'))
 
652
            if response == gtk.RESPONSE_NO:
706
653
                # Kindly give focus to message area
707
654
                self._global_message_text_view.grab_focus()
708
655
                return
720
667
        #       files at this point.
721
668
        for path in self._wt.unknowns():
722
669
            response = self._question_dialog(
723
 
                _i18n("Commit with unknowns?"),
724
 
                _i18n("Unknown files exist in the working tree. Commit anyway?"),
725
 
                parent=self)
726
 
                # Doesn't set a parent for the dialog..
727
 
            if response == Gtk.ResponseType.NO:
 
670
                _("Commit with unknowns?"),
 
671
                _("Unknown files exist in the working tree. Commit anyway?"))
 
672
            if response == gtk.RESPONSE_NO:
728
673
                return
729
674
            break
730
675
 
741
686
                       revprops=revprops)
742
687
        except errors.PointlessCommit:
743
688
            response = self._question_dialog(
744
 
                _i18n('Commit with no changes?'),
745
 
                _i18n('There are no changes in the working tree.'
746
 
                      ' Do you want to commit anyway?'),
747
 
                parent=self)
748
 
            if response == Gtk.ResponseType.YES:
 
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:
749
693
                rev_id = self._wt.commit(message,
750
694
                               allow_pointless=True,
751
695
                               strict=False,
753
697
                               specific_files=specific_files,
754
698
                               revprops=revprops)
755
699
        self.committed_revision_id = rev_id
756
 
        # destroy old comments if any
757
 
        SavedCommitMessagesManager().save(self._wt, self._wt.branch)
758
 
        self.response(Gtk.ResponseType.OK)
 
700
        self.response(gtk.RESPONSE_OK)
759
701
 
760
702
    def _get_global_commit_message(self):
761
703
        buf = self._global_message_text_view.get_buffer()
762
704
        start, end = buf.get_bounds()
763
 
        text = buf.get_text(start, end)
764
 
        return _sanitize_and_decode_message(text)
 
705
        return buf.get_text(start, end).decode('utf-8')
765
706
 
766
707
    def _set_global_commit_message(self, message):
767
708
        """Just a helper for the test suite."""
788
729
                                       show_offset=False)
789
730
        rev_dict['revision_id'] = rev.revision_id
790
731
        return rev_dict
791
 
 
792
 
 
793
 
class SavedCommitMessagesManager:
794
 
    """Save glogal and per-file commit messages.
795
 
 
796
 
    Saves global commit message and utf-8 file_id->message dictionary
797
 
    of per-file commit messages on disk. Re-reads them later for re-using.
798
 
    """
799
 
 
800
 
    def __init__(self, tree=None, branch=None):
801
 
        """If branch is None, builds empty messages, otherwise reads them
802
 
        from branch's disk storage. 'tree' argument is for the future."""
803
 
        if branch is None:
804
 
            self.global_message = u''
805
 
            self.file_messages = {}
806
 
        else:
807
 
            config = branch.get_config()
808
 
            self.global_message = config.get_user_option(
809
 
                'gtk_global_commit_message')
810
 
            if self.global_message is None:
811
 
                self.global_message = u''
812
 
            file_messages = config.get_user_option('gtk_file_commit_messages')
813
 
            if file_messages: # unicode and B-encoded:
814
 
                self.file_messages = bencode.bdecode(
815
 
                    file_messages.encode('UTF-8'))
816
 
            else:
817
 
                self.file_messages = {}
818
 
 
819
 
    def get(self):
820
 
        return self.global_message, self.file_messages
821
 
 
822
 
    def is_not_empty(self):
823
 
        return bool(self.global_message or self.file_messages)
824
 
 
825
 
    def insert(self, global_message, file_info):
826
 
        """Formats per-file commit messages (list of dictionaries, one per file)
827
 
        into one utf-8 file_id->message dictionary and merges this with
828
 
        previously existing dictionary. Merges global commit message too."""
829
 
        file_messages = {}
830
 
        for fi in file_info:
831
 
            file_message = fi['message']
832
 
            if file_message:
833
 
                file_messages[fi['file_id']] = file_message # utf-8 strings
834
 
        for k,v in file_messages.iteritems():
835
 
            try:
836
 
                self.file_messages[k] = v + '\n******\n' + self.file_messages[k]
837
 
            except KeyError:
838
 
                self.file_messages[k] = v
839
 
        if self.global_message:
840
 
            self.global_message = global_message + '\n******\n' \
841
 
                + self.global_message
842
 
        else:
843
 
            self.global_message = global_message
844
 
 
845
 
    def save(self, tree, branch):
846
 
        # We store in branch's config, which can be a problem if two gcommit
847
 
        # are done in two checkouts of one single branch (comments overwrite
848
 
        # each other). Ideally should be in working tree. But uncommit does
849
 
        # not always have a working tree, though it always has a branch.
850
 
        # 'tree' argument is for the future
851
 
        config = branch.get_config()
852
 
        # should it be named "gtk_" or some more neutral name ("gui_" ?) to
853
 
        # be compatible with qbzr in the future?
854
 
        config.set_user_option('gtk_global_commit_message', self.global_message)
855
 
        # bencode() does not know unicode objects but set_user_option()
856
 
        # requires one:
857
 
        config.set_user_option(
858
 
            'gtk_file_commit_messages',
859
 
            bencode.bencode(self.file_messages).decode('UTF-8'))
860
 
 
861
 
 
862
 
def save_commit_messages(local, master, old_revno, old_revid,
863
 
                         new_revno, new_revid):
864
 
    b = local
865
 
    if b is None:
866
 
        b = master
867
 
    mgr = SavedCommitMessagesManager(None, b)
868
 
    revid_iterator = b.repository.iter_reverse_revision_history(old_revid)
869
 
    cur_revno = old_revno
870
 
    new_revision_id = old_revid
871
 
    graph = b.repository.get_graph()
872
 
    for rev_id in revid_iterator:
873
 
        if cur_revno == new_revno:
874
 
            break
875
 
        cur_revno -= 1
876
 
        rev = b.repository.get_revision(rev_id)
877
 
        file_info = rev.properties.get('file-info', None)
878
 
        if file_info is None:
879
 
            file_info = {}
880
 
        else:
881
 
            file_info = bencode.bdecode(file_info.encode('UTF-8'))
882
 
        global_message = osutils.safe_unicode(rev.message)
883
 
        # Concatenate comment of the uncommitted revision
884
 
        mgr.insert(global_message, file_info)
885
 
 
886
 
        parents = graph.get_parent_map([rev_id]).get(rev_id, None)
887
 
        if not parents:
888
 
            continue
889
 
    mgr.save(None, b)