/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: 2011-12-11 17:14:12 UTC
  • Revision ID: jelmer@samba.org-20111211171412-cgcn0yas3zlcahzg
Start on 0.104.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
16
16
 
17
17
import re
18
18
 
 
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
 
19
24
try:
20
 
    import pygtk
21
 
    pygtk.require("2.0")
22
 
except:
23
 
    pass
24
 
 
25
 
import gtk
26
 
import gobject
27
 
import pango
 
25
    from bzrlib import bencode
 
26
except ImportError:
 
27
    from bzrlib.util import bencode
28
28
 
29
29
from bzrlib import (
30
30
    errors,
31
 
    osutils,
32
31
    trace,
33
32
    )
34
 
try:
35
 
    from bzrlib import bencode
36
 
except ImportError:
37
 
    from bzrlib.util import bencode
38
 
 
39
33
from bzrlib.plugins.gtk.dialog import question_dialog
40
34
from bzrlib.plugins.gtk.errors import show_bzr_error
41
35
from bzrlib.plugins.gtk.i18n import _i18n
 
36
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
42
37
 
43
38
try:
44
39
    import dbus
67
62
    last_revision = parents[0]
68
63
 
69
64
    if last_revision is not None:
70
 
        try:
71
 
            ignore = set(branch.repository.get_ancestry(last_revision,
72
 
                                                        topo_sorted=False))
73
 
        except errors.NoSuchRevision:
74
 
            # the last revision is a ghost : assume everything is new
75
 
            # except for it
76
 
            ignore = set([None, last_revision])
 
65
        graph = branch.repository.get_graph()
 
66
        ignore = set([r for r,ps in graph.iter_ancestry([last_revision])])
77
67
    else:
78
 
        ignore = set([None])
 
68
        ignore = set([])
79
69
 
80
70
    pm = []
81
71
    for merge in pending:
109
99
    return fixed_newline.decode('utf-8')
110
100
 
111
101
 
112
 
class CommitDialog(gtk.Dialog):
 
102
class CommitDialog(Gtk.Dialog):
113
103
    """Implementation of Commit."""
114
104
 
115
105
    def __init__(self, wt, selected=None, parent=None):
116
 
        gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
117
 
                            parent=parent, flags=0,)
 
106
        super(CommitDialog, self).__init__(
 
107
            title="Commit to %s" % wt.basedir, parent=parent, flags=0)
118
108
        self.connect('delete-event', self._on_delete_window)
119
109
        self._question_dialog = question_dialog
120
110
 
121
 
        self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
 
111
        self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
122
112
 
123
113
        self._wt = wt
124
114
        # TODO: Do something with this value, it is used by Olive
127
117
        self._enable_per_file_commits = True
128
118
        self._commit_all_changes = True
129
119
        self.committed_revision_id = None # Nothing has been committed yet
130
 
        self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)
 
120
        self._saved_commit_messages_manager = SavedCommitMessagesManager(
 
121
            self._wt, self._wt.branch)
131
122
 
132
123
        self.setup_params()
133
124
        self.construct()
137
128
        """Setup the member variables for state."""
138
129
        self._basis_tree = self._wt.basis_tree()
139
130
        self._delta = None
140
 
        self._pending = pending_revisions(self._wt)
 
131
        self._wt.lock_read()
 
132
        try:
 
133
            self._pending = pending_revisions(self._wt)
 
134
        finally:
 
135
            self._wt.unlock()
141
136
 
142
137
        self._is_checkout = (self._wt.branch.get_bound_location() is not None)
143
138
 
232
227
        # This sets the cursor, which causes the expander to close, which
233
228
        # causes the _file_message_text_view to never get realized. So we have
234
229
        # to give it a little kick, or it warns when we try to grab the focus
235
 
        self._treeview_files.set_cursor(initial_cursor)
 
230
        self._treeview_files.set_cursor(initial_cursor, None, False)
236
231
 
237
232
        def _realize_file_message_tree_view(*args):
238
233
            self._file_message_text_view.realize()
286
281
        """Build up the dialog widgets."""
287
282
        # The primary pane which splits it into left and right (adjustable)
288
283
        # sections.
289
 
        self._hpane = gtk.HPaned()
 
284
        self._hpane = Gtk.HPaned()
290
285
 
291
286
        self._construct_left_pane()
292
287
        self._construct_right_pane()
293
288
        self._construct_action_pane()
294
289
 
295
 
        self.vbox.pack_start(self._hpane)
 
290
        self.get_content_area().pack_start(self._hpane, True, True, 0)
296
291
        self._hpane.show()
297
292
        self.set_focus(self._global_message_text_view)
298
293
 
317
312
        self._hpane.set_position(300)
318
313
 
319
314
    def _construct_accelerators(self):
320
 
        group = gtk.AccelGroup()
321
 
        group.connect_group(gtk.gdk.keyval_from_name('N'),
322
 
                            gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
 
315
        group = Gtk.AccelGroup()
 
316
        group.connect(Gdk.keyval_from_name('N'),
 
317
                      Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
323
318
        self.add_accel_group(group)
324
319
 
325
320
        # ignore the escape key (avoid closing the window)
326
321
        self.connect_object('close', self.emit_stop_by_name, 'close')
327
322
 
328
323
    def _construct_left_pane(self):
329
 
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
 
324
        self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
330
325
        self._construct_file_list()
331
326
        self._construct_pending_list()
332
327
 
333
 
        self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
 
328
        self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
334
329
                                            use_underline=True)
335
 
        self._left_pane_box.pack_end(self._check_local, False, False)
 
330
        self._left_pane_box.pack_end(self._check_local, False, False, 0)
336
331
        self._check_local.set_active(False)
337
332
 
338
333
        self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
345
340
        # commit, and 1 for file commit, and it looked good. But I don't seem
346
341
        # to have a way to do that with the gtk boxes... :( (Which is extra
347
342
        # weird since wx uses gtk on Linux...)
348
 
        self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
 
343
        self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
349
344
        self._right_pane_table.set_row_spacings(5)
350
345
        self._right_pane_table.set_col_spacings(5)
351
346
        self._right_pane_table_row = 0
357
352
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
358
353
 
359
354
    def _construct_action_pane(self):
360
 
        self._button_cancel = gtk.Button(stock=gtk.STOCK_CANCEL)
 
355
        self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
361
356
        self._button_cancel.connect('clicked', self._on_cancel_clicked)
362
357
        self._button_cancel.show()
363
 
        self.action_area.pack_end(self._button_cancel)
364
 
        self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
 
358
        self.get_action_area().pack_end(
 
359
            self._button_cancel, True, True, 0)
 
360
        self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
365
361
        self._button_commit.connect('clicked', self._on_commit_clicked)
366
 
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
 
362
        self._button_commit.set_can_default(True)
367
363
        self._button_commit.show()
368
 
        self.action_area.pack_end(self._button_commit)
 
364
        self.get_action_area().pack_end(
 
365
            self._button_commit, True, True, 0)
369
366
        self._button_commit.grab_default()
370
367
 
371
368
    def _add_to_right_table(self, widget, weight, expanding=False):
377
374
        """
378
375
        end_row = self._right_pane_table_row + weight
379
376
        options = 0
380
 
        expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
 
377
        expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
381
378
        if expanding:
382
379
            options = expand_opts
383
380
        self._right_pane_table.attach(widget, 0, 1,
386
383
        self._right_pane_table_row = end_row
387
384
 
388
385
    def _construct_file_list(self):
389
 
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
390
 
        file_label = gtk.Label(_i18n('Files'))
 
386
        self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
 
387
        file_label = Gtk.Label(label=_i18n('Files'))
391
388
        # file_label.show()
392
 
        self._files_box.pack_start(file_label, expand=False)
 
389
        self._files_box.pack_start(file_label, False, True, 0)
393
390
 
394
 
        self._commit_all_files_radio = gtk.RadioButton(
 
391
        self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
395
392
            None, _i18n("Commit all changes"))
396
 
        self._files_box.pack_start(self._commit_all_files_radio, expand=False)
 
393
        self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
397
394
        self._commit_all_files_radio.show()
398
395
        self._commit_all_files_radio.connect('toggled',
399
396
            self._toggle_commit_selection)
400
 
        self._commit_selected_radio = gtk.RadioButton(
 
397
        self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
401
398
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
402
 
        self._files_box.pack_start(self._commit_selected_radio, expand=False)
 
399
        self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
403
400
        self._commit_selected_radio.show()
404
401
        self._commit_selected_radio.connect('toggled',
405
402
            self._toggle_commit_selection)
408
405
            self._commit_all_files_radio.set_sensitive(False)
409
406
            self._commit_selected_radio.set_sensitive(False)
410
407
 
411
 
        scroller = gtk.ScrolledWindow()
412
 
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
413
 
        self._treeview_files = gtk.TreeView()
 
408
        scroller = Gtk.ScrolledWindow()
 
409
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
410
        self._treeview_files = Gtk.TreeView()
414
411
        self._treeview_files.show()
415
412
        scroller.add(self._treeview_files)
416
 
        scroller.set_shadow_type(gtk.SHADOW_IN)
 
413
        scroller.set_shadow_type(Gtk.ShadowType.IN)
417
414
        scroller.show()
418
 
        self._files_box.pack_start(scroller,
419
 
                                   expand=True, fill=True)
 
415
        self._files_box.pack_start(scroller, True, True, 0)
420
416
        self._files_box.show()
421
 
        self._left_pane_box.pack_start(self._files_box)
 
417
        self._left_pane_box.pack_start(self._files_box, True, True, 0)
422
418
 
423
419
        # Keep note that all strings stored in a ListStore must be UTF-8
424
420
        # strings. GTK does not support directly setting and restoring Unicode
425
421
        # objects.
426
 
        liststore = gtk.ListStore(
427
 
            gobject.TYPE_STRING,  # [0] file_id
428
 
            gobject.TYPE_STRING,  # [1] real path
429
 
            gobject.TYPE_BOOLEAN, # [2] checkbox
430
 
            gobject.TYPE_STRING,  # [3] display path
431
 
            gobject.TYPE_STRING,  # [4] changes type
432
 
            gobject.TYPE_STRING,  # [5] commit message
 
422
        liststore = Gtk.ListStore(
 
423
            GObject.TYPE_STRING,  # [0] file_id
 
424
            GObject.TYPE_STRING,  # [1] real path
 
425
            GObject.TYPE_BOOLEAN, # [2] checkbox
 
426
            GObject.TYPE_STRING,  # [3] display path
 
427
            GObject.TYPE_STRING,  # [4] changes type
 
428
            GObject.TYPE_STRING,  # [5] commit message
433
429
            )
434
430
        self._files_store = liststore
435
431
        self._treeview_files.set_model(liststore)
436
 
        crt = gtk.CellRendererToggle()
 
432
        crt = Gtk.CellRendererToggle()
437
433
        crt.set_property('activatable', not bool(self._pending))
438
434
        crt.connect("toggled", self._toggle_commit, self._files_store)
439
435
        if self._pending:
440
436
            name = _i18n('Commit*')
441
437
        else:
442
438
            name = _i18n('Commit')
443
 
        commit_col = gtk.TreeViewColumn(name, crt, active=2)
 
439
        commit_col = Gtk.TreeViewColumn(name, crt, active=2)
444
440
        commit_col.set_visible(False)
445
441
        self._treeview_files.append_column(commit_col)
446
 
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
447
 
                                           gtk.CellRendererText(), text=3))
448
 
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
449
 
                                           gtk.CellRendererText(), text=4))
 
442
        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
 
443
                                           Gtk.CellRendererText(), text=3))
 
444
        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
 
445
                                           Gtk.CellRendererText(), text=4))
450
446
        self._treeview_files.connect('cursor-changed',
451
447
                                     self._on_treeview_files_cursor_changed)
452
448
 
467
463
                checked_col.set_visible(False)
468
464
            else:
469
465
                checked_col.set_visible(True)
470
 
            renderer = checked_col.get_cell_renderers()[0]
 
466
            renderer = checked_col.get_cells()[0]
471
467
            renderer.set_property('activatable', not all_files)
472
468
 
473
469
    def _construct_pending_list(self):
474
470
        # Pending information defaults to hidden, we put it all in 1 box, so
475
471
        # that we can show/hide all of them at once
476
 
        self._pending_box = gtk.VBox()
 
472
        self._pending_box = Gtk.VBox()
477
473
        self._pending_box.hide()
478
474
 
479
 
        pending_message = gtk.Label()
 
475
        pending_message = Gtk.Label()
480
476
        pending_message.set_markup(
481
477
            _i18n('<i>* Cannot select specific files when merging</i>'))
482
 
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
 
478
        self._pending_box.pack_start(pending_message, False, True, 5)
483
479
        pending_message.show()
484
480
 
485
 
        pending_label = gtk.Label(_i18n('Pending Revisions'))
486
 
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
 
481
        pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
 
482
        self._pending_box.pack_start(pending_label, False, True, 0)
487
483
        pending_label.show()
488
484
 
489
 
        scroller = gtk.ScrolledWindow()
490
 
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
491
 
        self._treeview_pending = gtk.TreeView()
 
485
        scroller = Gtk.ScrolledWindow()
 
486
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
487
        self._treeview_pending = Gtk.TreeView()
492
488
        scroller.add(self._treeview_pending)
493
 
        scroller.set_shadow_type(gtk.SHADOW_IN)
 
489
        scroller.set_shadow_type(Gtk.ShadowType.IN)
494
490
        scroller.show()
495
 
        self._pending_box.pack_start(scroller,
496
 
                                     expand=True, fill=True, padding=5)
 
491
        self._pending_box.pack_start(scroller, True, True, 5)
497
492
        self._treeview_pending.show()
498
 
        self._left_pane_box.pack_start(self._pending_box)
 
493
        self._left_pane_box.pack_start(self._pending_box, True, True, 0)
499
494
 
500
 
        liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
501
 
                                  gobject.TYPE_STRING, # date
502
 
                                  gobject.TYPE_STRING, # committer
503
 
                                  gobject.TYPE_STRING, # summary
 
495
        liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
 
496
                                  GObject.TYPE_STRING, # date
 
497
                                  GObject.TYPE_STRING, # committer
 
498
                                  GObject.TYPE_STRING, # summary
504
499
                                 )
505
500
        self._pending_store = liststore
506
501
        self._treeview_pending.set_model(liststore)
507
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
508
 
                                             gtk.CellRendererText(), text=1))
509
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
510
 
                                             gtk.CellRendererText(), text=2))
511
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
512
 
                                             gtk.CellRendererText(), text=3))
 
502
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
 
503
                                             Gtk.CellRendererText(), text=1))
 
504
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
 
505
                                             Gtk.CellRendererText(), text=2))
 
506
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
 
507
                                             Gtk.CellRendererText(), text=3))
513
508
 
514
509
    def _construct_diff_view(self):
515
510
        from bzrlib.plugins.gtk.diff import DiffView
518
513
        #       decide that we really don't ever want to display it, we should
519
514
        #       actually remove it, and other references to it, along with the
520
515
        #       tests that it is set properly.
521
 
        self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
 
516
        self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
522
517
        self._diff_label.set_alignment(0, 0)
523
518
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
524
519
        self._add_to_right_table(self._diff_label, 1, False)
529
524
        self._diff_view.show()
530
525
 
531
526
    def _construct_file_message(self):
532
 
        scroller = gtk.ScrolledWindow()
533
 
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
527
        scroller = Gtk.ScrolledWindow()
 
528
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
534
529
 
535
 
        self._file_message_text_view = gtk.TextView()
 
530
        self._file_message_text_view = Gtk.TextView()
536
531
        scroller.add(self._file_message_text_view)
537
 
        scroller.set_shadow_type(gtk.SHADOW_IN)
 
532
        scroller.set_shadow_type(Gtk.ShadowType.IN)
538
533
        scroller.show()
539
534
 
540
 
        self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
541
 
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
 
535
        self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
 
536
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
542
537
        self._file_message_text_view.set_accepts_tab(False)
543
538
        self._file_message_text_view.show()
544
539
 
545
 
        self._file_message_expander = gtk.Expander(_i18n('File commit message'))
 
540
        self._file_message_expander = Gtk.Expander(
 
541
            label=_i18n('File commit message'))
546
542
        self._file_message_expander.set_expanded(True)
547
543
        self._file_message_expander.add(scroller)
548
544
        self._add_to_right_table(self._file_message_expander, 1, False)
549
545
        self._file_message_expander.show()
550
546
 
551
547
    def _construct_global_message(self):
552
 
        self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
 
548
        self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
553
549
        self._global_message_label.set_markup(
554
550
            _i18n('<b>Global Commit Message</b>'))
555
551
        self._global_message_label.set_alignment(0, 0)
558
554
        # Can we remove the spacing between the label and the box?
559
555
        self._global_message_label.show()
560
556
 
561
 
        scroller = gtk.ScrolledWindow()
562
 
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
557
        scroller = Gtk.ScrolledWindow()
 
558
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
563
559
 
564
 
        self._global_message_text_view = gtk.TextView()
 
560
        self._global_message_text_view = Gtk.TextView()
565
561
        self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
566
 
        self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
 
562
        self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
567
563
        scroller.add(self._global_message_text_view)
568
 
        scroller.set_shadow_type(gtk.SHADOW_IN)
 
564
        scroller.set_shadow_type(Gtk.ShadowType.IN)
569
565
        scroller.show()
570
566
        self._add_to_right_table(scroller, 2, True)
571
 
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
 
567
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
572
568
        self._file_message_text_view.set_accepts_tab(False)
573
569
        self._global_message_text_view.show()
574
570
 
599
595
            # We have either made it to the end of the list, or nothing was
600
596
            # selected. Either way, select All Files, and jump to the global
601
597
            # commit message.
602
 
            self._treeview_files.set_cursor((0,))
 
598
            self._treeview_files.set_cursor(
 
599
                Gtk.TreePath(path=0), None, False)
603
600
            self._global_message_text_view.grab_focus()
604
601
        else:
605
602
            # Set the cursor to this entry, and jump to the per-file commit
606
603
            # message
607
 
            self._treeview_files.set_cursor(model.get_path(next))
 
604
            self._treeview_files.set_cursor(model.get_path(next), None, False)
608
605
            self._file_message_text_view.grab_focus()
609
606
 
610
607
    def _save_current_file_message(self):
612
609
            return # Nothing to save
613
610
        text_buffer = self._file_message_text_view.get_buffer()
614
611
        cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
615
 
                                        text_buffer.get_end_iter())
 
612
                                        text_buffer.get_end_iter(), True)
616
613
        last_selected = self._files_store.get_iter(self._last_selected_file)
617
614
        self._files_store.set_value(last_selected, 5, cur_text)
618
615
 
689
686
                _i18n('Commit cancelled'),
690
687
                _i18n('Do you want to save your commit messages ?'),
691
688
                parent=self)
692
 
            if response == gtk.RESPONSE_NO:
 
689
            if response == Gtk.ResponseType.NO:
693
690
                 # save nothing and destroy old comments if any
694
691
                mgr = SavedCommitMessagesManager()
695
692
        mgr.save(self._wt, self._wt.branch)
696
 
        self.response(gtk.RESPONSE_CANCEL) # close window
 
693
        self.response(Gtk.ResponseType.CANCEL) # close window
697
694
 
698
695
    @show_bzr_error
699
696
    def _on_commit_clicked(self, button):
708
705
                _i18n('Commit with an empty message?'),
709
706
                _i18n('You can describe your commit intent in the message.'),
710
707
                parent=self)
711
 
            if response == gtk.RESPONSE_NO:
 
708
            if response == Gtk.ResponseType.NO:
712
709
                # Kindly give focus to message area
713
710
                self._global_message_text_view.grab_focus()
714
711
                return
730
727
                _i18n("Unknown files exist in the working tree. Commit anyway?"),
731
728
                parent=self)
732
729
                # Doesn't set a parent for the dialog..
733
 
            if response == gtk.RESPONSE_NO:
 
730
            if response == Gtk.ResponseType.NO:
734
731
                return
735
732
            break
736
733
 
751
748
                _i18n('There are no changes in the working tree.'
752
749
                      ' Do you want to commit anyway?'),
753
750
                parent=self)
754
 
            if response == gtk.RESPONSE_YES:
 
751
            if response == Gtk.ResponseType.YES:
755
752
                rev_id = self._wt.commit(message,
756
753
                               allow_pointless=True,
757
754
                               strict=False,
761
758
        self.committed_revision_id = rev_id
762
759
        # destroy old comments if any
763
760
        SavedCommitMessagesManager().save(self._wt, self._wt.branch)
764
 
        self.response(gtk.RESPONSE_OK)
 
761
        self.response(Gtk.ResponseType.OK)
765
762
 
766
763
    def _get_global_commit_message(self):
767
764
        buf = self._global_message_text_view.get_buffer()
768
765
        start, end = buf.get_bounds()
769
 
        text = buf.get_text(start, end)
 
766
        text = buf.get_text(start, end, True)
770
767
        return _sanitize_and_decode_message(text)
771
768
 
772
769
    def _set_global_commit_message(self, message):
795
792
        rev_dict['revision_id'] = rev.revision_id
796
793
        return rev_dict
797
794
 
798
 
 
799
 
class SavedCommitMessagesManager:
800
 
    """Save glogal and per-file commit messages.
801
 
 
802
 
    Saves global commit message and utf-8 file_id->message dictionary
803
 
    of per-file commit messages on disk. Re-reads them later for re-using.
804
 
    """
805
 
 
806
 
    def __init__(self, tree=None, branch=None):
807
 
        """If branch is None, builds empty messages, otherwise reads them
808
 
        from branch's disk storage. 'tree' argument is for the future."""
809
 
        if branch is None:
810
 
            self.global_message = u''
811
 
            self.file_messages = {}
812
 
        else:
813
 
            config = branch.get_config()
814
 
            self.global_message = config.get_user_option(
815
 
                'gtk_global_commit_message')
816
 
            if self.global_message is None:
817
 
                self.global_message = u''
818
 
            file_messages = config.get_user_option('gtk_file_commit_messages')
819
 
            if file_messages: # unicode and B-encoded:
820
 
                self.file_messages = bencode.bdecode(
821
 
                    file_messages.encode('UTF-8'))
822
 
            else:
823
 
                self.file_messages = {}
824
 
 
825
 
    def get(self):
826
 
        return self.global_message, self.file_messages
827
 
 
828
 
    def is_not_empty(self):
829
 
        return bool(self.global_message or self.file_messages)
830
 
 
831
 
    def insert(self, global_message, file_info):
832
 
        """Formats per-file commit messages (list of dictionaries, one per file)
833
 
        into one utf-8 file_id->message dictionary and merges this with
834
 
        previously existing dictionary. Merges global commit message too."""
835
 
        file_messages = {}
836
 
        for fi in file_info:
837
 
            file_message = fi['message']
838
 
            if file_message:
839
 
                file_messages[fi['file_id']] = file_message # utf-8 strings
840
 
        for k,v in file_messages.iteritems():
841
 
            try:
842
 
                self.file_messages[k] = v + '\n******\n' + self.file_messages[k]
843
 
            except KeyError:
844
 
                self.file_messages[k] = v
845
 
        if self.global_message:
846
 
            self.global_message = global_message + '\n******\n' \
847
 
                + self.global_message
848
 
        else:
849
 
            self.global_message = global_message
850
 
 
851
 
    def save(self, tree, branch):
852
 
        # We store in branch's config, which can be a problem if two gcommit
853
 
        # are done in two checkouts of one single branch (comments overwrite
854
 
        # each other). Ideally should be in working tree. But uncommit does
855
 
        # not always have a working tree, though it always has a branch.
856
 
        # 'tree' argument is for the future
857
 
        config = branch.get_config()
858
 
        # should it be named "gtk_" or some more neutral name ("gui_" ?) to
859
 
        # be compatible with qbzr in the future?
860
 
        config.set_user_option('gtk_global_commit_message', self.global_message)
861
 
        # bencode() does not know unicode objects but set_user_option()
862
 
        # requires one:
863
 
        config.set_user_option(
864
 
            'gtk_file_commit_messages',
865
 
            bencode.bencode(self.file_messages).decode('UTF-8'))
866
 
 
867
 
 
868
 
def save_commit_messages(local, master, old_revno, old_revid,
869
 
                         new_revno, new_revid):
870
 
    b = local
871
 
    if b is None:
872
 
        b = master
873
 
    mgr = SavedCommitMessagesManager(None, b)
874
 
    revid_iterator = b.repository.iter_reverse_revision_history(old_revid)
875
 
    cur_revno = old_revno
876
 
    new_revision_id = old_revid
877
 
    graph = b.repository.get_graph()
878
 
    for rev_id in revid_iterator:
879
 
        if cur_revno == new_revno:
880
 
            break
881
 
        cur_revno -= 1
882
 
        rev = b.repository.get_revision(rev_id)
883
 
        file_info = rev.properties.get('file-info', None)
884
 
        if file_info is None:
885
 
            file_info = {}
886
 
        else:
887
 
            file_info = bencode.bdecode(file_info.encode('UTF-8'))
888
 
        global_message = osutils.safe_unicode(rev.message)
889
 
        # Concatenate comment of the uncommitted revision
890
 
        mgr.insert(global_message, file_info)
891
 
 
892
 
        parents = graph.get_parent_map([rev_id]).get(rev_id, None)
893
 
        if not parents:
894
 
            continue
895
 
    mgr.save(None, b)