/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-06-18 17:41:11 UTC
  • Revision ID: jelmer@samba.org-20110618174111-1f7601d96qs4h52x
Catch org.freedesktop.DBus.Error.NotSupported

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
 
19
try:
 
20
    import pygtk
 
21
    pygtk.require("2.0")
 
22
except:
 
23
    pass
 
24
 
 
25
import gtk
 
26
import gobject
 
27
import pango
23
28
 
24
29
from bzrlib import (
25
 
    bencode,
26
30
    errors,
 
31
    osutils,
27
32
    trace,
28
33
    )
 
34
try:
 
35
    from bzrlib import bencode
 
36
except ImportError:
 
37
    from bzrlib.util import bencode
 
38
 
29
39
from bzrlib.plugins.gtk.dialog import question_dialog
30
40
from bzrlib.plugins.gtk.errors import show_bzr_error
31
41
from bzrlib.plugins.gtk.i18n import _i18n
32
 
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
33
42
 
34
43
try:
35
44
    import dbus
58
67
    last_revision = parents[0]
59
68
 
60
69
    if last_revision is not None:
61
 
        graph = branch.repository.get_graph()
62
 
        ignore = set([r for r,ps in graph.iter_ancestry([last_revision])])
 
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])
63
77
    else:
64
 
        ignore = set([])
 
78
        ignore = set([None])
65
79
 
66
80
    pm = []
67
81
    for merge in pending:
95
109
    return fixed_newline.decode('utf-8')
96
110
 
97
111
 
98
 
class CommitDialog(Gtk.Dialog):
 
112
class CommitDialog(gtk.Dialog):
99
113
    """Implementation of Commit."""
100
114
 
101
115
    def __init__(self, wt, selected=None, parent=None):
102
 
        super(CommitDialog, self).__init__(
103
 
            title="Commit to %s" % wt.basedir, parent=parent, flags=0)
 
116
        gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
 
117
                            parent=parent, flags=0,)
104
118
        self.connect('delete-event', self._on_delete_window)
105
119
        self._question_dialog = question_dialog
106
120
 
107
 
        self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
 
121
        self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
108
122
 
109
123
        self._wt = wt
110
124
        # TODO: Do something with this value, it is used by Olive
113
127
        self._enable_per_file_commits = True
114
128
        self._commit_all_changes = True
115
129
        self.committed_revision_id = None # Nothing has been committed yet
116
 
        self._saved_commit_messages_manager = SavedCommitMessagesManager(
117
 
            self._wt, self._wt.branch)
 
130
        self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)
118
131
 
119
132
        self.setup_params()
120
133
        self.construct()
124
137
        """Setup the member variables for state."""
125
138
        self._basis_tree = self._wt.basis_tree()
126
139
        self._delta = None
127
 
        self._wt.lock_read()
128
 
        try:
129
 
            self._pending = pending_revisions(self._wt)
130
 
        finally:
131
 
            self._wt.unlock()
 
140
        self._pending = pending_revisions(self._wt)
132
141
 
133
142
        self._is_checkout = (self._wt.branch.get_bound_location() is not None)
134
143
 
223
232
        # This sets the cursor, which causes the expander to close, which
224
233
        # causes the _file_message_text_view to never get realized. So we have
225
234
        # to give it a little kick, or it warns when we try to grab the focus
226
 
        self._treeview_files.set_cursor(initial_cursor, None, False)
 
235
        self._treeview_files.set_cursor(initial_cursor)
227
236
 
228
237
        def _realize_file_message_tree_view(*args):
229
238
            self._file_message_text_view.realize()
277
286
        """Build up the dialog widgets."""
278
287
        # The primary pane which splits it into left and right (adjustable)
279
288
        # sections.
280
 
        self._hpane = Gtk.HPaned()
 
289
        self._hpane = gtk.HPaned()
281
290
 
282
291
        self._construct_left_pane()
283
292
        self._construct_right_pane()
284
293
        self._construct_action_pane()
285
294
 
286
 
        self.get_content_area().pack_start(self._hpane, True, True, 0)
 
295
        self.vbox.pack_start(self._hpane)
287
296
        self._hpane.show()
288
297
        self.set_focus(self._global_message_text_view)
289
298
 
308
317
        self._hpane.set_position(300)
309
318
 
310
319
    def _construct_accelerators(self):
311
 
        group = Gtk.AccelGroup()
312
 
        group.connect(Gdk.keyval_from_name('N'),
313
 
                      Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
 
320
        group = gtk.AccelGroup()
 
321
        group.connect_group(gtk.gdk.keyval_from_name('N'),
 
322
                            gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
314
323
        self.add_accel_group(group)
315
324
 
316
325
        # ignore the escape key (avoid closing the window)
317
326
        self.connect_object('close', self.emit_stop_by_name, 'close')
318
327
 
319
328
    def _construct_left_pane(self):
320
 
        self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
 
329
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
321
330
        self._construct_file_list()
322
331
        self._construct_pending_list()
323
332
 
324
 
        self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
 
333
        self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
325
334
                                            use_underline=True)
326
 
        self._left_pane_box.pack_end(self._check_local, False, False, 0)
 
335
        self._left_pane_box.pack_end(self._check_local, False, False)
327
336
        self._check_local.set_active(False)
328
337
 
329
338
        self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
336
345
        # commit, and 1 for file commit, and it looked good. But I don't seem
337
346
        # to have a way to do that with the gtk boxes... :( (Which is extra
338
347
        # weird since wx uses gtk on Linux...)
339
 
        self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
 
348
        self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
340
349
        self._right_pane_table.set_row_spacings(5)
341
350
        self._right_pane_table.set_col_spacings(5)
342
351
        self._right_pane_table_row = 0
348
357
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
349
358
 
350
359
    def _construct_action_pane(self):
351
 
        self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
 
360
        self._button_cancel = gtk.Button(stock=gtk.STOCK_CANCEL)
352
361
        self._button_cancel.connect('clicked', self._on_cancel_clicked)
353
362
        self._button_cancel.show()
354
 
        self.get_action_area().pack_end(
355
 
            self._button_cancel, True, True, 0)
356
 
        self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
 
363
        self.action_area.pack_end(self._button_cancel)
 
364
        self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
357
365
        self._button_commit.connect('clicked', self._on_commit_clicked)
358
 
        self._button_commit.set_can_default(True)
 
366
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
359
367
        self._button_commit.show()
360
 
        self.get_action_area().pack_end(
361
 
            self._button_commit, True, True, 0)
 
368
        self.action_area.pack_end(self._button_commit)
362
369
        self._button_commit.grab_default()
363
370
 
364
371
    def _add_to_right_table(self, widget, weight, expanding=False):
370
377
        """
371
378
        end_row = self._right_pane_table_row + weight
372
379
        options = 0
373
 
        expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
 
380
        expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
374
381
        if expanding:
375
382
            options = expand_opts
376
383
        self._right_pane_table.attach(widget, 0, 1,
379
386
        self._right_pane_table_row = end_row
380
387
 
381
388
    def _construct_file_list(self):
382
 
        self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
383
 
        file_label = Gtk.Label(label=_i18n('Files'))
 
389
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
 
390
        file_label = gtk.Label(_i18n('Files'))
384
391
        # file_label.show()
385
 
        self._files_box.pack_start(file_label, False, True, 0)
 
392
        self._files_box.pack_start(file_label, expand=False)
386
393
 
387
 
        self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
 
394
        self._commit_all_files_radio = gtk.RadioButton(
388
395
            None, _i18n("Commit all changes"))
389
 
        self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
 
396
        self._files_box.pack_start(self._commit_all_files_radio, expand=False)
390
397
        self._commit_all_files_radio.show()
391
398
        self._commit_all_files_radio.connect('toggled',
392
399
            self._toggle_commit_selection)
393
 
        self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
 
400
        self._commit_selected_radio = gtk.RadioButton(
394
401
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
395
 
        self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
 
402
        self._files_box.pack_start(self._commit_selected_radio, expand=False)
396
403
        self._commit_selected_radio.show()
397
404
        self._commit_selected_radio.connect('toggled',
398
405
            self._toggle_commit_selection)
401
408
            self._commit_all_files_radio.set_sensitive(False)
402
409
            self._commit_selected_radio.set_sensitive(False)
403
410
 
404
 
        scroller = Gtk.ScrolledWindow()
405
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
406
 
        self._treeview_files = Gtk.TreeView()
 
411
        scroller = gtk.ScrolledWindow()
 
412
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
413
        self._treeview_files = gtk.TreeView()
407
414
        self._treeview_files.show()
408
415
        scroller.add(self._treeview_files)
409
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
416
        scroller.set_shadow_type(gtk.SHADOW_IN)
410
417
        scroller.show()
411
 
        self._files_box.pack_start(scroller, True, True, 0)
 
418
        self._files_box.pack_start(scroller,
 
419
                                   expand=True, fill=True)
412
420
        self._files_box.show()
413
 
        self._left_pane_box.pack_start(self._files_box, True, True, 0)
 
421
        self._left_pane_box.pack_start(self._files_box)
414
422
 
415
423
        # Keep note that all strings stored in a ListStore must be UTF-8
416
424
        # strings. GTK does not support directly setting and restoring Unicode
417
425
        # objects.
418
 
        liststore = Gtk.ListStore(
419
 
            GObject.TYPE_STRING,  # [0] file_id
420
 
            GObject.TYPE_STRING,  # [1] real path
421
 
            GObject.TYPE_BOOLEAN, # [2] checkbox
422
 
            GObject.TYPE_STRING,  # [3] display path
423
 
            GObject.TYPE_STRING,  # [4] changes type
424
 
            GObject.TYPE_STRING,  # [5] commit message
 
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
425
433
            )
426
434
        self._files_store = liststore
427
435
        self._treeview_files.set_model(liststore)
428
 
        crt = Gtk.CellRendererToggle()
 
436
        crt = gtk.CellRendererToggle()
429
437
        crt.set_property('activatable', not bool(self._pending))
430
438
        crt.connect("toggled", self._toggle_commit, self._files_store)
431
439
        if self._pending:
432
440
            name = _i18n('Commit*')
433
441
        else:
434
442
            name = _i18n('Commit')
435
 
        commit_col = Gtk.TreeViewColumn(name, crt, active=2)
 
443
        commit_col = gtk.TreeViewColumn(name, crt, active=2)
436
444
        commit_col.set_visible(False)
437
445
        self._treeview_files.append_column(commit_col)
438
 
        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
439
 
                                           Gtk.CellRendererText(), text=3))
440
 
        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
441
 
                                           Gtk.CellRendererText(), text=4))
 
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
450
        self._treeview_files.connect('cursor-changed',
443
451
                                     self._on_treeview_files_cursor_changed)
444
452
 
459
467
                checked_col.set_visible(False)
460
468
            else:
461
469
                checked_col.set_visible(True)
462
 
            renderer = checked_col.get_cells()[0]
 
470
            renderer = checked_col.get_cell_renderers()[0]
463
471
            renderer.set_property('activatable', not all_files)
464
472
 
465
473
    def _construct_pending_list(self):
466
474
        # Pending information defaults to hidden, we put it all in 1 box, so
467
475
        # that we can show/hide all of them at once
468
 
        self._pending_box = Gtk.VBox()
 
476
        self._pending_box = gtk.VBox()
469
477
        self._pending_box.hide()
470
478
 
471
 
        pending_message = Gtk.Label()
 
479
        pending_message = gtk.Label()
472
480
        pending_message.set_markup(
473
481
            _i18n('<i>* Cannot select specific files when merging</i>'))
474
 
        self._pending_box.pack_start(pending_message, False, True, 5)
 
482
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
475
483
        pending_message.show()
476
484
 
477
 
        pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
478
 
        self._pending_box.pack_start(pending_label, False, True, 0)
 
485
        pending_label = gtk.Label(_i18n('Pending Revisions'))
 
486
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
479
487
        pending_label.show()
480
488
 
481
 
        scroller = Gtk.ScrolledWindow()
482
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
483
 
        self._treeview_pending = Gtk.TreeView()
 
489
        scroller = gtk.ScrolledWindow()
 
490
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
491
        self._treeview_pending = gtk.TreeView()
484
492
        scroller.add(self._treeview_pending)
485
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
493
        scroller.set_shadow_type(gtk.SHADOW_IN)
486
494
        scroller.show()
487
 
        self._pending_box.pack_start(scroller, True, True, 5)
 
495
        self._pending_box.pack_start(scroller,
 
496
                                     expand=True, fill=True, padding=5)
488
497
        self._treeview_pending.show()
489
 
        self._left_pane_box.pack_start(self._pending_box, True, True, 0)
 
498
        self._left_pane_box.pack_start(self._pending_box)
490
499
 
491
 
        liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
492
 
                                  GObject.TYPE_STRING, # date
493
 
                                  GObject.TYPE_STRING, # committer
494
 
                                  GObject.TYPE_STRING, # summary
 
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
504
                                 )
496
505
        self._pending_store = liststore
497
506
        self._treeview_pending.set_model(liststore)
498
 
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
499
 
                                             Gtk.CellRendererText(), text=1))
500
 
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
501
 
                                             Gtk.CellRendererText(), text=2))
502
 
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
503
 
                                             Gtk.CellRendererText(), text=3))
 
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))
504
513
 
505
514
    def _construct_diff_view(self):
506
515
        from bzrlib.plugins.gtk.diff import DiffView
509
518
        #       decide that we really don't ever want to display it, we should
510
519
        #       actually remove it, and other references to it, along with the
511
520
        #       tests that it is set properly.
512
 
        self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
 
521
        self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
513
522
        self._diff_label.set_alignment(0, 0)
514
523
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
515
524
        self._add_to_right_table(self._diff_label, 1, False)
520
529
        self._diff_view.show()
521
530
 
522
531
    def _construct_file_message(self):
523
 
        scroller = Gtk.ScrolledWindow()
524
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
532
        scroller = gtk.ScrolledWindow()
 
533
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
525
534
 
526
 
        self._file_message_text_view = Gtk.TextView()
 
535
        self._file_message_text_view = gtk.TextView()
527
536
        scroller.add(self._file_message_text_view)
528
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
537
        scroller.set_shadow_type(gtk.SHADOW_IN)
529
538
        scroller.show()
530
539
 
531
 
        self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
532
 
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
 
540
        self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
 
541
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
533
542
        self._file_message_text_view.set_accepts_tab(False)
534
543
        self._file_message_text_view.show()
535
544
 
536
 
        self._file_message_expander = Gtk.Expander(
537
 
            label=_i18n('File commit message'))
 
545
        self._file_message_expander = gtk.Expander(_i18n('File commit message'))
538
546
        self._file_message_expander.set_expanded(True)
539
547
        self._file_message_expander.add(scroller)
540
548
        self._add_to_right_table(self._file_message_expander, 1, False)
541
549
        self._file_message_expander.show()
542
550
 
543
551
    def _construct_global_message(self):
544
 
        self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
 
552
        self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
545
553
        self._global_message_label.set_markup(
546
554
            _i18n('<b>Global Commit Message</b>'))
547
555
        self._global_message_label.set_alignment(0, 0)
550
558
        # Can we remove the spacing between the label and the box?
551
559
        self._global_message_label.show()
552
560
 
553
 
        scroller = Gtk.ScrolledWindow()
554
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
561
        scroller = gtk.ScrolledWindow()
 
562
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
555
563
 
556
 
        self._global_message_text_view = Gtk.TextView()
 
564
        self._global_message_text_view = gtk.TextView()
557
565
        self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
558
 
        self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
 
566
        self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
559
567
        scroller.add(self._global_message_text_view)
560
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
568
        scroller.set_shadow_type(gtk.SHADOW_IN)
561
569
        scroller.show()
562
570
        self._add_to_right_table(scroller, 2, True)
563
 
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
 
571
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
564
572
        self._file_message_text_view.set_accepts_tab(False)
565
573
        self._global_message_text_view.show()
566
574
 
591
599
            # We have either made it to the end of the list, or nothing was
592
600
            # selected. Either way, select All Files, and jump to the global
593
601
            # commit message.
594
 
            self._treeview_files.set_cursor(
595
 
                Gtk.TreePath(path=0), None, False)
 
602
            self._treeview_files.set_cursor((0,))
596
603
            self._global_message_text_view.grab_focus()
597
604
        else:
598
605
            # Set the cursor to this entry, and jump to the per-file commit
599
606
            # message
600
 
            self._treeview_files.set_cursor(model.get_path(next), None, False)
 
607
            self._treeview_files.set_cursor(model.get_path(next))
601
608
            self._file_message_text_view.grab_focus()
602
609
 
603
610
    def _save_current_file_message(self):
605
612
            return # Nothing to save
606
613
        text_buffer = self._file_message_text_view.get_buffer()
607
614
        cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
608
 
                                        text_buffer.get_end_iter(), True)
 
615
                                        text_buffer.get_end_iter())
609
616
        last_selected = self._files_store.get_iter(self._last_selected_file)
610
617
        self._files_store.set_value(last_selected, 5, cur_text)
611
618
 
682
689
                _i18n('Commit cancelled'),
683
690
                _i18n('Do you want to save your commit messages ?'),
684
691
                parent=self)
685
 
            if response == Gtk.ResponseType.NO:
 
692
            if response == gtk.RESPONSE_NO:
686
693
                 # save nothing and destroy old comments if any
687
694
                mgr = SavedCommitMessagesManager()
688
695
        mgr.save(self._wt, self._wt.branch)
689
 
        self.response(Gtk.ResponseType.CANCEL) # close window
 
696
        self.response(gtk.RESPONSE_CANCEL) # close window
690
697
 
691
698
    @show_bzr_error
692
699
    def _on_commit_clicked(self, button):
701
708
                _i18n('Commit with an empty message?'),
702
709
                _i18n('You can describe your commit intent in the message.'),
703
710
                parent=self)
704
 
            if response == Gtk.ResponseType.NO:
 
711
            if response == gtk.RESPONSE_NO:
705
712
                # Kindly give focus to message area
706
713
                self._global_message_text_view.grab_focus()
707
714
                return
723
730
                _i18n("Unknown files exist in the working tree. Commit anyway?"),
724
731
                parent=self)
725
732
                # Doesn't set a parent for the dialog..
726
 
            if response == Gtk.ResponseType.NO:
 
733
            if response == gtk.RESPONSE_NO:
727
734
                return
728
735
            break
729
736
 
744
751
                _i18n('There are no changes in the working tree.'
745
752
                      ' Do you want to commit anyway?'),
746
753
                parent=self)
747
 
            if response == Gtk.ResponseType.YES:
 
754
            if response == gtk.RESPONSE_YES:
748
755
                rev_id = self._wt.commit(message,
749
756
                               allow_pointless=True,
750
757
                               strict=False,
754
761
        self.committed_revision_id = rev_id
755
762
        # destroy old comments if any
756
763
        SavedCommitMessagesManager().save(self._wt, self._wt.branch)
757
 
        self.response(Gtk.ResponseType.OK)
 
764
        self.response(gtk.RESPONSE_OK)
758
765
 
759
766
    def _get_global_commit_message(self):
760
767
        buf = self._global_message_text_view.get_buffer()
761
768
        start, end = buf.get_bounds()
762
 
        text = buf.get_text(start, end, True)
 
769
        text = buf.get_text(start, end)
763
770
        return _sanitize_and_decode_message(text)
764
771
 
765
772
    def _set_global_commit_message(self, message):
788
795
        rev_dict['revision_id'] = rev.revision_id
789
796
        return rev_dict
790
797
 
 
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)