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