/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: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
try:
 
18
    import pygtk
 
19
    pygtk.require("2.0")
 
20
except:
 
21
    pass
 
22
 
 
23
import gtk
 
24
import gobject
 
25
import pango
 
26
 
 
27
import os.path
17
28
import re
18
29
 
19
 
from gi.repository import Gdk
20
 
from gi.repository import Gtk
21
 
from gi.repository import GObject
22
 
from gi.repository import Pango
 
30
from bzrlib import errors, osutils
 
31
from bzrlib.trace import mutter
 
32
from bzrlib.util import bencode
23
33
 
24
 
from bzrlib import (
25
 
    bencode,
26
 
    errors,
27
 
    osutils,
28
 
    trace,
29
 
    )
30
 
from bzrlib.plugins.gtk.dialog import question_dialog
31
 
from bzrlib.plugins.gtk.errors import show_bzr_error
32
 
from bzrlib.plugins.gtk.i18n import _i18n
33
 
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
 
34
from bzrlib.plugins.gtk import _i18n
 
35
from dialog import error_dialog, question_dialog
 
36
from errors import show_bzr_error
34
37
 
35
38
try:
36
39
    import dbus
59
62
    last_revision = parents[0]
60
63
 
61
64
    if last_revision is not None:
62
 
        graph = branch.repository.get_graph()
63
 
        ignore = set([r for r,ps in graph.iter_ancestry([last_revision])])
 
65
        try:
 
66
            ignore = set(branch.repository.get_ancestry(last_revision,
 
67
                                                        topo_sorted=False))
 
68
        except errors.NoSuchRevision:
 
69
            # the last revision is a ghost : assume everything is new
 
70
            # except for it
 
71
            ignore = set([None, last_revision])
64
72
    else:
65
 
        ignore = set([])
 
73
        ignore = set([None])
66
74
 
67
75
    pm = []
68
76
    for merge in pending:
89
97
    return pm
90
98
 
91
99
 
92
 
_newline_variants_re = re.compile(r'\r\n?')
93
 
def _sanitize_and_decode_message(utf8_message):
94
 
    """Turn a utf-8 message into a sanitized Unicode message."""
95
 
    fixed_newline = _newline_variants_re.sub('\n', utf8_message)
96
 
    return osutils.safe_unicode(fixed_newline)
97
 
 
98
 
 
99
 
class CommitDialog(Gtk.Dialog):
 
100
class CommitDialog(gtk.Dialog):
100
101
    """Implementation of Commit."""
101
102
 
102
103
    def __init__(self, wt, selected=None, parent=None):
103
 
        super(CommitDialog, self).__init__(
104
 
            title="Commit to %s" % wt.basedir, parent=parent, flags=0)
105
 
        self.connect('delete-event', self._on_delete_window)
 
104
        gtk.Dialog.__init__(self, title="Commit - Olive",
 
105
                                  parent=parent,
 
106
                                  flags=0,
 
107
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
106
108
        self._question_dialog = question_dialog
107
109
 
108
 
        self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
109
 
 
110
110
        self._wt = wt
111
111
        # TODO: Do something with this value, it is used by Olive
112
112
        #       It used to set all changes but this one to False
114
114
        self._enable_per_file_commits = True
115
115
        self._commit_all_changes = True
116
116
        self.committed_revision_id = None # Nothing has been committed yet
117
 
        self._last_selected_file = None
118
 
        self._saved_commit_messages_manager = SavedCommitMessagesManager(
119
 
            self._wt, self._wt.branch)
120
117
 
121
118
        self.setup_params()
122
119
        self.construct()
126
123
        """Setup the member variables for state."""
127
124
        self._basis_tree = self._wt.basis_tree()
128
125
        self._delta = None
129
 
        self._wt.lock_read()
130
 
        try:
131
 
            self._pending = pending_revisions(self._wt)
132
 
        finally:
133
 
            self._wt.unlock()
 
126
        self._pending = pending_revisions(self._wt)
134
127
 
135
128
        self._is_checkout = (self._wt.branch.get_bound_location() is not None)
136
129
 
188
181
 
189
182
        all_enabled = (self._selected is None)
190
183
        # The first entry is always the 'whole tree'
191
 
        all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])
 
184
        all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
192
185
        initial_cursor = store.get_path(all_iter)
193
186
        # should we pass specific_files?
194
187
        self._wt.lock_read()
195
188
        self._basis_tree.lock_read()
196
189
        try:
197
190
            from diff import iter_changes_to_status
198
 
            saved_file_messages = self._saved_commit_messages_manager.get()[1]
199
191
            for (file_id, real_path, change_type, display_path
200
192
                ) in iter_changes_to_status(self._basis_tree, self._wt):
201
193
                if self._selected and real_path != self._selected:
202
194
                    enabled = False
203
195
                else:
204
196
                    enabled = True
205
 
                try:
206
 
                    default_message = saved_file_messages[file_id]
207
 
                except KeyError:
208
 
                    default_message = ''
209
197
                item_iter = store.append([
210
198
                    file_id,
211
199
                    real_path.encode('UTF-8'),
212
200
                    enabled,
213
201
                    display_path.encode('UTF-8'),
214
202
                    change_type,
215
 
                    default_message, # Initial comment
 
203
                    '', # Initial comment
216
204
                    ])
217
205
                if self._selected and enabled:
218
206
                    initial_cursor = store.get_path(item_iter)
225
213
        # This sets the cursor, which causes the expander to close, which
226
214
        # causes the _file_message_text_view to never get realized. So we have
227
215
        # to give it a little kick, or it warns when we try to grab the focus
228
 
        self._treeview_files.set_cursor(initial_cursor, None, False)
 
216
        self._treeview_files.set_cursor(initial_cursor)
229
217
 
230
218
        def _realize_file_message_tree_view(*args):
231
219
            self._file_message_text_view.realize()
244
232
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
245
233
                                           '/org/freedesktop/NetworkManager')
246
234
            except dbus.DBusException:
247
 
                trace.mutter("networkmanager not available.")
 
235
                mutter("networkmanager not available.")
248
236
                self._check_local.show()
249
237
                return
250
238
            
256
244
            except dbus.DBusException, e:
257
245
                # Silently drop errors. While DBus may be
258
246
                # available, NetworkManager doesn't necessarily have to be
259
 
                trace.mutter("unable to get networkmanager state: %r" % e)
 
247
                mutter("unable to get networkmanager state: %r" % e)
260
248
        self._check_local.show()
261
249
 
262
250
    def _fill_in_per_file_info(self):
279
267
        """Build up the dialog widgets."""
280
268
        # The primary pane which splits it into left and right (adjustable)
281
269
        # sections.
282
 
        self._hpane = Gtk.HPaned()
 
270
        self._hpane = gtk.HPaned()
283
271
 
284
272
        self._construct_left_pane()
285
273
        self._construct_right_pane()
286
274
        self._construct_action_pane()
287
275
 
288
 
        self.get_content_area().pack_start(self._hpane, True, True, 0)
 
276
        self.vbox.pack_start(self._hpane)
289
277
        self._hpane.show()
290
278
        self.set_focus(self._global_message_text_view)
291
279
 
310
298
        self._hpane.set_position(300)
311
299
 
312
300
    def _construct_accelerators(self):
313
 
        group = Gtk.AccelGroup()
314
 
        group.connect(Gdk.keyval_from_name('N'),
315
 
                      Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
 
301
        group = gtk.AccelGroup()
 
302
        group.connect_group(gtk.gdk.keyval_from_name('N'),
 
303
                            gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
316
304
        self.add_accel_group(group)
317
305
 
318
 
        # ignore the escape key (avoid closing the window)
319
 
        self.connect_object('close', self.emit_stop_by_name, 'close')
320
 
 
321
306
    def _construct_left_pane(self):
322
 
        self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
 
307
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
323
308
        self._construct_file_list()
324
309
        self._construct_pending_list()
325
310
 
326
 
        self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
 
311
        self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
327
312
                                            use_underline=True)
328
 
        self._left_pane_box.pack_end(self._check_local, False, False, 0)
 
313
        self._left_pane_box.pack_end(self._check_local, False, False)
329
314
        self._check_local.set_active(False)
330
315
 
331
316
        self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
338
323
        # commit, and 1 for file commit, and it looked good. But I don't seem
339
324
        # to have a way to do that with the gtk boxes... :( (Which is extra
340
325
        # weird since wx uses gtk on Linux...)
341
 
        self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
 
326
        self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
342
327
        self._right_pane_table.set_row_spacings(5)
343
328
        self._right_pane_table.set_col_spacings(5)
344
329
        self._right_pane_table_row = 0
350
335
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
351
336
 
352
337
    def _construct_action_pane(self):
353
 
        self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
354
 
        self._button_cancel.connect('clicked', self._on_cancel_clicked)
355
 
        self._button_cancel.show()
356
 
        self.get_action_area().pack_end(
357
 
            self._button_cancel, True, True, 0)
358
 
        self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
 
338
        self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
359
339
        self._button_commit.connect('clicked', self._on_commit_clicked)
360
 
        self._button_commit.set_can_default(True)
 
340
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
361
341
        self._button_commit.show()
362
 
        self.get_action_area().pack_end(
363
 
            self._button_commit, True, True, 0)
 
342
        self.action_area.pack_end(self._button_commit)
364
343
        self._button_commit.grab_default()
365
344
 
366
345
    def _add_to_right_table(self, widget, weight, expanding=False):
372
351
        """
373
352
        end_row = self._right_pane_table_row + weight
374
353
        options = 0
375
 
        expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
 
354
        expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
376
355
        if expanding:
377
356
            options = expand_opts
378
357
        self._right_pane_table.attach(widget, 0, 1,
381
360
        self._right_pane_table_row = end_row
382
361
 
383
362
    def _construct_file_list(self):
384
 
        self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
385
 
        file_label = Gtk.Label(label=_i18n('Files'))
 
363
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
 
364
        file_label = gtk.Label(_i18n('Files'))
386
365
        # file_label.show()
387
 
        self._files_box.pack_start(file_label, False, True, 0)
 
366
        self._files_box.pack_start(file_label, expand=False)
388
367
 
389
 
        self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
 
368
        self._commit_all_files_radio = gtk.RadioButton(
390
369
            None, _i18n("Commit all changes"))
391
 
        self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
 
370
        self._files_box.pack_start(self._commit_all_files_radio, expand=False)
392
371
        self._commit_all_files_radio.show()
393
372
        self._commit_all_files_radio.connect('toggled',
394
373
            self._toggle_commit_selection)
395
 
        self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
 
374
        self._commit_selected_radio = gtk.RadioButton(
396
375
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
397
 
        self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
 
376
        self._files_box.pack_start(self._commit_selected_radio, expand=False)
398
377
        self._commit_selected_radio.show()
399
378
        self._commit_selected_radio.connect('toggled',
400
379
            self._toggle_commit_selection)
403
382
            self._commit_all_files_radio.set_sensitive(False)
404
383
            self._commit_selected_radio.set_sensitive(False)
405
384
 
406
 
        scroller = Gtk.ScrolledWindow()
407
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
408
 
        self._treeview_files = Gtk.TreeView()
 
385
        scroller = gtk.ScrolledWindow()
 
386
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
387
        self._treeview_files = gtk.TreeView()
409
388
        self._treeview_files.show()
410
389
        scroller.add(self._treeview_files)
411
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
390
        scroller.set_shadow_type(gtk.SHADOW_IN)
412
391
        scroller.show()
413
 
        self._files_box.pack_start(scroller, True, True, 0)
 
392
        self._files_box.pack_start(scroller,
 
393
                                   expand=True, fill=True)
414
394
        self._files_box.show()
415
 
        self._left_pane_box.pack_start(self._files_box, True, True, 0)
 
395
        self._left_pane_box.pack_start(self._files_box)
416
396
 
417
397
        # Keep note that all strings stored in a ListStore must be UTF-8
418
398
        # strings. GTK does not support directly setting and restoring Unicode
419
399
        # objects.
420
 
        liststore = Gtk.ListStore(
421
 
            GObject.TYPE_STRING,  # [0] file_id
422
 
            GObject.TYPE_STRING,  # [1] real path
423
 
            GObject.TYPE_BOOLEAN, # [2] checkbox
424
 
            GObject.TYPE_STRING,  # [3] display path
425
 
            GObject.TYPE_STRING,  # [4] changes type
426
 
            GObject.TYPE_STRING,  # [5] commit message
 
400
        liststore = gtk.ListStore(
 
401
            gobject.TYPE_STRING,  # [0] file_id
 
402
            gobject.TYPE_STRING,  # [1] real path
 
403
            gobject.TYPE_BOOLEAN, # [2] checkbox
 
404
            gobject.TYPE_STRING,  # [3] display path
 
405
            gobject.TYPE_STRING,  # [4] changes type
 
406
            gobject.TYPE_STRING,  # [5] commit message
427
407
            )
428
408
        self._files_store = liststore
429
409
        self._treeview_files.set_model(liststore)
430
 
        crt = Gtk.CellRendererToggle()
 
410
        crt = gtk.CellRendererToggle()
431
411
        crt.set_property('activatable', not bool(self._pending))
432
412
        crt.connect("toggled", self._toggle_commit, self._files_store)
433
413
        if self._pending:
434
414
            name = _i18n('Commit*')
435
415
        else:
436
416
            name = _i18n('Commit')
437
 
        commit_col = Gtk.TreeViewColumn(name, crt, active=2)
 
417
        commit_col = gtk.TreeViewColumn(name, crt, active=2)
438
418
        commit_col.set_visible(False)
439
419
        self._treeview_files.append_column(commit_col)
440
 
        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
441
 
                                           Gtk.CellRendererText(), text=3))
442
 
        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
443
 
                                           Gtk.CellRendererText(), text=4))
 
420
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
 
421
                                           gtk.CellRendererText(), text=3))
 
422
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
 
423
                                           gtk.CellRendererText(), text=4))
444
424
        self._treeview_files.connect('cursor-changed',
445
425
                                     self._on_treeview_files_cursor_changed)
446
426
 
447
427
    def _toggle_commit(self, cell, path, model):
448
 
        if model[path][0] == "": # No file_id means 'All Files'
 
428
        if model[path][0] is None: # No file_id means 'All Files'
449
429
            new_val = not model[path][2]
450
430
            for node in model:
451
431
                node[2] = new_val
461
441
                checked_col.set_visible(False)
462
442
            else:
463
443
                checked_col.set_visible(True)
464
 
            renderer = checked_col.get_cells()[0]
 
444
            renderer = checked_col.get_cell_renderers()[0]
465
445
            renderer.set_property('activatable', not all_files)
466
446
 
467
447
    def _construct_pending_list(self):
468
448
        # Pending information defaults to hidden, we put it all in 1 box, so
469
449
        # that we can show/hide all of them at once
470
 
        self._pending_box = Gtk.VBox()
 
450
        self._pending_box = gtk.VBox()
471
451
        self._pending_box.hide()
472
452
 
473
 
        pending_message = Gtk.Label()
 
453
        pending_message = gtk.Label()
474
454
        pending_message.set_markup(
475
455
            _i18n('<i>* Cannot select specific files when merging</i>'))
476
 
        self._pending_box.pack_start(pending_message, False, True, 5)
 
456
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
477
457
        pending_message.show()
478
458
 
479
 
        pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
480
 
        self._pending_box.pack_start(pending_label, False, True, 0)
 
459
        pending_label = gtk.Label(_i18n('Pending Revisions'))
 
460
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
481
461
        pending_label.show()
482
462
 
483
 
        scroller = Gtk.ScrolledWindow()
484
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
485
 
        self._treeview_pending = Gtk.TreeView()
 
463
        scroller = gtk.ScrolledWindow()
 
464
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
465
        self._treeview_pending = gtk.TreeView()
486
466
        scroller.add(self._treeview_pending)
487
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
467
        scroller.set_shadow_type(gtk.SHADOW_IN)
488
468
        scroller.show()
489
 
        self._pending_box.pack_start(scroller, True, True, 5)
 
469
        self._pending_box.pack_start(scroller,
 
470
                                     expand=True, fill=True, padding=5)
490
471
        self._treeview_pending.show()
491
 
        self._left_pane_box.pack_start(self._pending_box, True, True, 0)
 
472
        self._left_pane_box.pack_start(self._pending_box)
492
473
 
493
 
        liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
494
 
                                  GObject.TYPE_STRING, # date
495
 
                                  GObject.TYPE_STRING, # committer
496
 
                                  GObject.TYPE_STRING, # summary
 
474
        liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
 
475
                                  gobject.TYPE_STRING, # date
 
476
                                  gobject.TYPE_STRING, # committer
 
477
                                  gobject.TYPE_STRING, # summary
497
478
                                 )
498
479
        self._pending_store = liststore
499
480
        self._treeview_pending.set_model(liststore)
500
 
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
501
 
                                             Gtk.CellRendererText(), text=1))
502
 
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
503
 
                                             Gtk.CellRendererText(), text=2))
504
 
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
505
 
                                             Gtk.CellRendererText(), text=3))
 
481
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
 
482
                                             gtk.CellRendererText(), text=1))
 
483
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
 
484
                                             gtk.CellRendererText(), text=2))
 
485
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
 
486
                                             gtk.CellRendererText(), text=3))
506
487
 
507
488
    def _construct_diff_view(self):
508
 
        from bzrlib.plugins.gtk.diff import DiffView
 
489
        from diff import DiffView
509
490
 
510
491
        # TODO: jam 2007-10-30 The diff label is currently disabled. If we
511
492
        #       decide that we really don't ever want to display it, we should
512
493
        #       actually remove it, and other references to it, along with the
513
494
        #       tests that it is set properly.
514
 
        self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
 
495
        self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
515
496
        self._diff_label.set_alignment(0, 0)
516
497
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
517
498
        self._add_to_right_table(self._diff_label, 1, False)
522
503
        self._diff_view.show()
523
504
 
524
505
    def _construct_file_message(self):
525
 
        scroller = Gtk.ScrolledWindow()
526
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
506
        scroller = gtk.ScrolledWindow()
 
507
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
527
508
 
528
 
        self._file_message_text_view = Gtk.TextView()
 
509
        self._file_message_text_view = gtk.TextView()
529
510
        scroller.add(self._file_message_text_view)
530
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
511
        scroller.set_shadow_type(gtk.SHADOW_IN)
531
512
        scroller.show()
532
513
 
533
 
        self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
534
 
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
 
514
        self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
 
515
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
535
516
        self._file_message_text_view.set_accepts_tab(False)
536
517
        self._file_message_text_view.show()
537
518
 
538
 
        self._file_message_expander = Gtk.Expander(
539
 
            label=_i18n('File commit message'))
 
519
        self._file_message_expander = gtk.Expander(_i18n('File commit message'))
540
520
        self._file_message_expander.set_expanded(True)
541
521
        self._file_message_expander.add(scroller)
542
522
        self._add_to_right_table(self._file_message_expander, 1, False)
543
523
        self._file_message_expander.show()
544
524
 
545
525
    def _construct_global_message(self):
546
 
        self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
 
526
        self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
547
527
        self._global_message_label.set_markup(
548
528
            _i18n('<b>Global Commit Message</b>'))
549
529
        self._global_message_label.set_alignment(0, 0)
552
532
        # Can we remove the spacing between the label and the box?
553
533
        self._global_message_label.show()
554
534
 
555
 
        scroller = Gtk.ScrolledWindow()
556
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
535
        scroller = gtk.ScrolledWindow()
 
536
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
557
537
 
558
 
        self._global_message_text_view = Gtk.TextView()
559
 
        self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
560
 
        self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
 
538
        self._global_message_text_view = gtk.TextView()
 
539
        self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
561
540
        scroller.add(self._global_message_text_view)
562
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
541
        scroller.set_shadow_type(gtk.SHADOW_IN)
563
542
        scroller.show()
564
543
        self._add_to_right_table(scroller, 2, True)
565
 
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
 
544
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
566
545
        self._file_message_text_view.set_accepts_tab(False)
567
546
        self._global_message_text_view.show()
568
547
 
569
548
    def _on_treeview_files_cursor_changed(self, treeview):
570
549
        treeselection = treeview.get_selection()
571
 
        if treeselection is None:
572
 
            # The treeview was probably destroyed as the dialog closes.
573
 
            return
574
550
        (model, selection) = treeselection.get_selected()
575
551
 
576
552
        if selection is not None:
577
553
            path, display_path = model.get(selection, 1, 3)
578
554
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
579
 
            if path == "":
 
555
            if path is None:
580
556
                self._diff_view.show_diff(None)
581
557
            else:
582
 
                self._diff_view.show_diff([osutils.safe_unicode(path)])
 
558
                self._diff_view.show_diff([path.decode('UTF-8')])
583
559
            self._update_per_file_info(selection)
584
560
 
585
561
    def _on_accel_next(self, accel_group, window, keyval, modifier):
596
572
            # We have either made it to the end of the list, or nothing was
597
573
            # selected. Either way, select All Files, and jump to the global
598
574
            # commit message.
599
 
            self._treeview_files.set_cursor(
600
 
                Gtk.TreePath(path=0), "", False)
 
575
            self._treeview_files.set_cursor((0,))
601
576
            self._global_message_text_view.grab_focus()
602
577
        else:
603
578
            # Set the cursor to this entry, and jump to the per-file commit
604
579
            # message
605
 
            self._treeview_files.set_cursor(model.get_path(next), None, False)
 
580
            self._treeview_files.set_cursor(model.get_path(next))
606
581
            self._file_message_text_view.grab_focus()
607
582
 
608
583
    def _save_current_file_message(self):
610
585
            return # Nothing to save
611
586
        text_buffer = self._file_message_text_view.get_buffer()
612
587
        cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
613
 
                                        text_buffer.get_end_iter(), True)
 
588
                                        text_buffer.get_end_iter())
614
589
        last_selected = self._files_store.get_iter(self._last_selected_file)
615
590
        self._files_store.set_value(last_selected, 5, cur_text)
616
591
 
622
597
        self._save_current_file_message()
623
598
        text_buffer = self._file_message_text_view.get_buffer()
624
599
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
625
 
        if file_id == "": # Whole tree
 
600
        if file_id is None: # Whole tree
626
601
            self._file_message_expander.set_label(_i18n('File commit message'))
627
602
            self._file_message_expander.set_expanded(False)
628
603
            self._file_message_expander.set_sensitive(False)
645
620
        files = []
646
621
        records = iter(self._files_store)
647
622
        rec = records.next() # Skip the All Files record
648
 
        assert rec[0] == "", "Are we skipping the wrong record?"
 
623
        assert rec[0] is None, "Are we skipping the wrong record?"
649
624
 
650
625
        file_info = []
651
626
        for record in records:
652
627
            if self._commit_all_changes or record[2]:# [2] checkbox
653
 
                file_id = osutils.safe_utf8(record[0]) # [0] file_id
654
 
                path = osutils.safe_utf8(record[1])    # [1] real path
655
 
                # [5] commit message
656
 
                file_message = _sanitize_and_decode_message(record[5])
 
628
                file_id = record[0] # [0] file_id
 
629
                path = record[1]    # [1] real path
 
630
                file_message = record[5] # [5] commit message
657
631
                files.append(path.decode('UTF-8'))
658
632
                if self._enable_per_file_commits and file_message:
659
633
                    # All of this needs to be utf-8 information
660
 
                    file_message = file_message.encode('UTF-8')
661
634
                    file_info.append({'path':path, 'file_id':file_id,
662
635
                                     'message':file_message})
663
636
        file_info.sort(key=lambda x:(x['path'], x['file_id']))
667
640
            return files, []
668
641
 
669
642
    @show_bzr_error
670
 
    def _on_cancel_clicked(self, button):
671
 
        """ Cancel button clicked handler. """
672
 
        self._do_cancel()
673
 
 
674
 
    @show_bzr_error
675
 
    def _on_delete_window(self, source, event):
676
 
        """ Delete window handler. """
677
 
        self._do_cancel()
678
 
 
679
 
    def _do_cancel(self):
680
 
        """If requested, saves commit messages when cancelling gcommit; they are re-used by a next gcommit"""
681
 
        mgr = SavedCommitMessagesManager()
682
 
        self._saved_commit_messages_manager = mgr
683
 
        mgr.insert(self._get_global_commit_message(),
684
 
                   self._get_specific_files()[1])
685
 
        if mgr.is_not_empty(): # maybe worth saving
686
 
            response = self._question_dialog(
687
 
                _i18n('Commit cancelled'),
688
 
                _i18n('Do you want to save your commit messages ?'),
689
 
                parent=self)
690
 
            if response == Gtk.ResponseType.NO:
691
 
                 # save nothing and destroy old comments if any
692
 
                mgr = SavedCommitMessagesManager()
693
 
        mgr.save(self._wt, self._wt.branch)
694
 
        self.response(Gtk.ResponseType.CANCEL) # close window
695
 
 
696
 
    @show_bzr_error
697
643
    def _on_commit_clicked(self, button):
698
644
        """ Commit button clicked handler. """
699
645
        self._do_commit()
704
650
        if message == '':
705
651
            response = self._question_dialog(
706
652
                _i18n('Commit with an empty message?'),
707
 
                _i18n('You can describe your commit intent in the message.'),
708
 
                parent=self)
709
 
            if response == Gtk.ResponseType.NO:
 
653
                _i18n('You can describe your commit intent in the message.'))
 
654
            if response == gtk.RESPONSE_NO:
710
655
                # Kindly give focus to message area
711
656
                self._global_message_text_view.grab_focus()
712
657
                return
725
670
        for path in self._wt.unknowns():
726
671
            response = self._question_dialog(
727
672
                _i18n("Commit with unknowns?"),
728
 
                _i18n("Unknown files exist in the working tree. Commit anyway?"),
729
 
                parent=self)
730
 
                # Doesn't set a parent for the dialog..
731
 
            if response == Gtk.ResponseType.NO:
 
673
                _i18n("Unknown files exist in the working tree. Commit anyway?"))
 
674
            if response == gtk.RESPONSE_NO:
732
675
                return
733
676
            break
734
677
 
747
690
            response = self._question_dialog(
748
691
                _i18n('Commit with no changes?'),
749
692
                _i18n('There are no changes in the working tree.'
750
 
                      ' Do you want to commit anyway?'),
751
 
                parent=self)
752
 
            if response == Gtk.ResponseType.YES:
 
693
                      ' Do you want to commit anyway?'))
 
694
            if response == gtk.RESPONSE_YES:
753
695
                rev_id = self._wt.commit(message,
754
696
                               allow_pointless=True,
755
697
                               strict=False,
757
699
                               specific_files=specific_files,
758
700
                               revprops=revprops)
759
701
        self.committed_revision_id = rev_id
760
 
        # destroy old comments if any
761
 
        SavedCommitMessagesManager().save(self._wt, self._wt.branch)
762
 
        self.response(Gtk.ResponseType.OK)
 
702
        self.response(gtk.RESPONSE_OK)
763
703
 
764
704
    def _get_global_commit_message(self):
765
705
        buf = self._global_message_text_view.get_buffer()
766
706
        start, end = buf.get_bounds()
767
 
        text = buf.get_text(start, end, True)
768
 
        return _sanitize_and_decode_message(text)
 
707
        return buf.get_text(start, end).decode('utf-8')
769
708
 
770
709
    def _set_global_commit_message(self, message):
771
710
        """Just a helper for the test suite."""
792
731
                                       show_offset=False)
793
732
        rev_dict['revision_id'] = rev.revision_id
794
733
        return rev_dict
795