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