/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to commit.py

  • Committer: Curtis Hovey
  • Date: 2012-02-09 03:43:01 UTC
  • mto: This revision was merged to the branch mainline in revision 776.
  • Revision ID: sinzui.is@verizon.net-20120209034301-0uwkobbb0d64ugrw
Switched from Gtk.VPaned to Gtk.Paned.new(Gtk.Orientation.VERTICAL).

Show diffs side-by-side

added added

removed removed

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