/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: 2008-06-29 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

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
306
        # ignore the escape key (avoid closing the window)
319
307
        self.connect_object('close', self.emit_stop_by_name, 'close')
320
308
 
321
309
    def _construct_left_pane(self):
322
 
        self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
 
310
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
323
311
        self._construct_file_list()
324
312
        self._construct_pending_list()
325
313
 
326
 
        self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
 
314
        self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
327
315
                                            use_underline=True)
328
 
        self._left_pane_box.pack_end(self._check_local, False, False, 0)
 
316
        self._left_pane_box.pack_end(self._check_local, False, False)
329
317
        self._check_local.set_active(False)
330
318
 
331
319
        self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
338
326
        # commit, and 1 for file commit, and it looked good. But I don't seem
339
327
        # to have a way to do that with the gtk boxes... :( (Which is extra
340
328
        # weird since wx uses gtk on Linux...)
341
 
        self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
 
329
        self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
342
330
        self._right_pane_table.set_row_spacings(5)
343
331
        self._right_pane_table.set_col_spacings(5)
344
332
        self._right_pane_table_row = 0
350
338
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
351
339
 
352
340
    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)
 
341
        self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
359
342
        self._button_commit.connect('clicked', self._on_commit_clicked)
360
 
        self._button_commit.set_can_default(True)
 
343
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
361
344
        self._button_commit.show()
362
 
        self.get_action_area().pack_end(
363
 
            self._button_commit, True, True, 0)
 
345
        self.action_area.pack_end(self._button_commit)
364
346
        self._button_commit.grab_default()
365
347
 
366
348
    def _add_to_right_table(self, widget, weight, expanding=False):
372
354
        """
373
355
        end_row = self._right_pane_table_row + weight
374
356
        options = 0
375
 
        expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
 
357
        expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
376
358
        if expanding:
377
359
            options = expand_opts
378
360
        self._right_pane_table.attach(widget, 0, 1,
381
363
        self._right_pane_table_row = end_row
382
364
 
383
365
    def _construct_file_list(self):
384
 
        self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
385
 
        file_label = Gtk.Label(label=_i18n('Files'))
 
366
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
 
367
        file_label = gtk.Label(_i18n('Files'))
386
368
        # file_label.show()
387
 
        self._files_box.pack_start(file_label, False, True, 0)
 
369
        self._files_box.pack_start(file_label, expand=False)
388
370
 
389
 
        self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
 
371
        self._commit_all_files_radio = gtk.RadioButton(
390
372
            None, _i18n("Commit all changes"))
391
 
        self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
 
373
        self._files_box.pack_start(self._commit_all_files_radio, expand=False)
392
374
        self._commit_all_files_radio.show()
393
375
        self._commit_all_files_radio.connect('toggled',
394
376
            self._toggle_commit_selection)
395
 
        self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
 
377
        self._commit_selected_radio = gtk.RadioButton(
396
378
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
397
 
        self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
 
379
        self._files_box.pack_start(self._commit_selected_radio, expand=False)
398
380
        self._commit_selected_radio.show()
399
381
        self._commit_selected_radio.connect('toggled',
400
382
            self._toggle_commit_selection)
403
385
            self._commit_all_files_radio.set_sensitive(False)
404
386
            self._commit_selected_radio.set_sensitive(False)
405
387
 
406
 
        scroller = Gtk.ScrolledWindow()
407
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
408
 
        self._treeview_files = Gtk.TreeView()
 
388
        scroller = gtk.ScrolledWindow()
 
389
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
390
        self._treeview_files = gtk.TreeView()
409
391
        self._treeview_files.show()
410
392
        scroller.add(self._treeview_files)
411
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
393
        scroller.set_shadow_type(gtk.SHADOW_IN)
412
394
        scroller.show()
413
 
        self._files_box.pack_start(scroller, True, True, 0)
 
395
        self._files_box.pack_start(scroller,
 
396
                                   expand=True, fill=True)
414
397
        self._files_box.show()
415
 
        self._left_pane_box.pack_start(self._files_box, True, True, 0)
 
398
        self._left_pane_box.pack_start(self._files_box)
416
399
 
417
400
        # Keep note that all strings stored in a ListStore must be UTF-8
418
401
        # strings. GTK does not support directly setting and restoring Unicode
419
402
        # 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
 
403
        liststore = gtk.ListStore(
 
404
            gobject.TYPE_STRING,  # [0] file_id
 
405
            gobject.TYPE_STRING,  # [1] real path
 
406
            gobject.TYPE_BOOLEAN, # [2] checkbox
 
407
            gobject.TYPE_STRING,  # [3] display path
 
408
            gobject.TYPE_STRING,  # [4] changes type
 
409
            gobject.TYPE_STRING,  # [5] commit message
427
410
            )
428
411
        self._files_store = liststore
429
412
        self._treeview_files.set_model(liststore)
430
 
        crt = Gtk.CellRendererToggle()
 
413
        crt = gtk.CellRendererToggle()
431
414
        crt.set_property('activatable', not bool(self._pending))
432
415
        crt.connect("toggled", self._toggle_commit, self._files_store)
433
416
        if self._pending:
434
417
            name = _i18n('Commit*')
435
418
        else:
436
419
            name = _i18n('Commit')
437
 
        commit_col = Gtk.TreeViewColumn(name, crt, active=2)
 
420
        commit_col = gtk.TreeViewColumn(name, crt, active=2)
438
421
        commit_col.set_visible(False)
439
422
        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))
 
423
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
 
424
                                           gtk.CellRendererText(), text=3))
 
425
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
 
426
                                           gtk.CellRendererText(), text=4))
444
427
        self._treeview_files.connect('cursor-changed',
445
428
                                     self._on_treeview_files_cursor_changed)
446
429
 
447
430
    def _toggle_commit(self, cell, path, model):
448
 
        if model[path][0] == "": # No file_id means 'All Files'
 
431
        if model[path][0] is None: # No file_id means 'All Files'
449
432
            new_val = not model[path][2]
450
433
            for node in model:
451
434
                node[2] = new_val
461
444
                checked_col.set_visible(False)
462
445
            else:
463
446
                checked_col.set_visible(True)
464
 
            renderer = checked_col.get_cells()[0]
 
447
            renderer = checked_col.get_cell_renderers()[0]
465
448
            renderer.set_property('activatable', not all_files)
466
449
 
467
450
    def _construct_pending_list(self):
468
451
        # Pending information defaults to hidden, we put it all in 1 box, so
469
452
        # that we can show/hide all of them at once
470
 
        self._pending_box = Gtk.VBox()
 
453
        self._pending_box = gtk.VBox()
471
454
        self._pending_box.hide()
472
455
 
473
 
        pending_message = Gtk.Label()
 
456
        pending_message = gtk.Label()
474
457
        pending_message.set_markup(
475
458
            _i18n('<i>* Cannot select specific files when merging</i>'))
476
 
        self._pending_box.pack_start(pending_message, False, True, 5)
 
459
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
477
460
        pending_message.show()
478
461
 
479
 
        pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
480
 
        self._pending_box.pack_start(pending_label, False, True, 0)
 
462
        pending_label = gtk.Label(_i18n('Pending Revisions'))
 
463
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
481
464
        pending_label.show()
482
465
 
483
 
        scroller = Gtk.ScrolledWindow()
484
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
485
 
        self._treeview_pending = Gtk.TreeView()
 
466
        scroller = gtk.ScrolledWindow()
 
467
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
468
        self._treeview_pending = gtk.TreeView()
486
469
        scroller.add(self._treeview_pending)
487
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
470
        scroller.set_shadow_type(gtk.SHADOW_IN)
488
471
        scroller.show()
489
 
        self._pending_box.pack_start(scroller, True, True, 5)
 
472
        self._pending_box.pack_start(scroller,
 
473
                                     expand=True, fill=True, padding=5)
490
474
        self._treeview_pending.show()
491
 
        self._left_pane_box.pack_start(self._pending_box, True, True, 0)
 
475
        self._left_pane_box.pack_start(self._pending_box)
492
476
 
493
 
        liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
494
 
                                  GObject.TYPE_STRING, # date
495
 
                                  GObject.TYPE_STRING, # committer
496
 
                                  GObject.TYPE_STRING, # summary
 
477
        liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
 
478
                                  gobject.TYPE_STRING, # date
 
479
                                  gobject.TYPE_STRING, # committer
 
480
                                  gobject.TYPE_STRING, # summary
497
481
                                 )
498
482
        self._pending_store = liststore
499
483
        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))
 
484
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
 
485
                                             gtk.CellRendererText(), text=1))
 
486
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
 
487
                                             gtk.CellRendererText(), text=2))
 
488
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
 
489
                                             gtk.CellRendererText(), text=3))
506
490
 
507
491
    def _construct_diff_view(self):
508
 
        from bzrlib.plugins.gtk.diff import DiffView
 
492
        from diff import DiffView
509
493
 
510
494
        # TODO: jam 2007-10-30 The diff label is currently disabled. If we
511
495
        #       decide that we really don't ever want to display it, we should
512
496
        #       actually remove it, and other references to it, along with the
513
497
        #       tests that it is set properly.
514
 
        self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
 
498
        self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
515
499
        self._diff_label.set_alignment(0, 0)
516
500
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
517
501
        self._add_to_right_table(self._diff_label, 1, False)
522
506
        self._diff_view.show()
523
507
 
524
508
    def _construct_file_message(self):
525
 
        scroller = Gtk.ScrolledWindow()
526
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
509
        scroller = gtk.ScrolledWindow()
 
510
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
527
511
 
528
 
        self._file_message_text_view = Gtk.TextView()
 
512
        self._file_message_text_view = gtk.TextView()
529
513
        scroller.add(self._file_message_text_view)
530
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
514
        scroller.set_shadow_type(gtk.SHADOW_IN)
531
515
        scroller.show()
532
516
 
533
 
        self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
534
 
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
 
517
        self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
 
518
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
535
519
        self._file_message_text_view.set_accepts_tab(False)
536
520
        self._file_message_text_view.show()
537
521
 
538
 
        self._file_message_expander = Gtk.Expander(
539
 
            label=_i18n('File commit message'))
 
522
        self._file_message_expander = gtk.Expander(_i18n('File commit message'))
540
523
        self._file_message_expander.set_expanded(True)
541
524
        self._file_message_expander.add(scroller)
542
525
        self._add_to_right_table(self._file_message_expander, 1, False)
543
526
        self._file_message_expander.show()
544
527
 
545
528
    def _construct_global_message(self):
546
 
        self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
 
529
        self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
547
530
        self._global_message_label.set_markup(
548
531
            _i18n('<b>Global Commit Message</b>'))
549
532
        self._global_message_label.set_alignment(0, 0)
552
535
        # Can we remove the spacing between the label and the box?
553
536
        self._global_message_label.show()
554
537
 
555
 
        scroller = Gtk.ScrolledWindow()
556
 
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
538
        scroller = gtk.ScrolledWindow()
 
539
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
557
540
 
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"))
 
541
        self._global_message_text_view = gtk.TextView()
 
542
        self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
561
543
        scroller.add(self._global_message_text_view)
562
 
        scroller.set_shadow_type(Gtk.ShadowType.IN)
 
544
        scroller.set_shadow_type(gtk.SHADOW_IN)
563
545
        scroller.show()
564
546
        self._add_to_right_table(scroller, 2, True)
565
 
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
 
547
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
566
548
        self._file_message_text_view.set_accepts_tab(False)
567
549
        self._global_message_text_view.show()
568
550
 
569
551
    def _on_treeview_files_cursor_changed(self, treeview):
570
552
        treeselection = treeview.get_selection()
571
 
        if treeselection is None:
572
 
            # The treeview was probably destroyed as the dialog closes.
573
 
            return
574
553
        (model, selection) = treeselection.get_selected()
575
554
 
576
555
        if selection is not None:
577
556
            path, display_path = model.get(selection, 1, 3)
578
557
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
579
 
            if path == "":
 
558
            if path is None:
580
559
                self._diff_view.show_diff(None)
581
560
            else:
582
 
                self._diff_view.show_diff([osutils.safe_unicode(path)])
 
561
                self._diff_view.show_diff([path.decode('UTF-8')])
583
562
            self._update_per_file_info(selection)
584
563
 
585
564
    def _on_accel_next(self, accel_group, window, keyval, modifier):
596
575
            # We have either made it to the end of the list, or nothing was
597
576
            # selected. Either way, select All Files, and jump to the global
598
577
            # commit message.
599
 
            self._treeview_files.set_cursor(
600
 
                Gtk.TreePath(path=0), "", False)
 
578
            self._treeview_files.set_cursor((0,))
601
579
            self._global_message_text_view.grab_focus()
602
580
        else:
603
581
            # Set the cursor to this entry, and jump to the per-file commit
604
582
            # message
605
 
            self._treeview_files.set_cursor(model.get_path(next), None, False)
 
583
            self._treeview_files.set_cursor(model.get_path(next))
606
584
            self._file_message_text_view.grab_focus()
607
585
 
608
586
    def _save_current_file_message(self):
610
588
            return # Nothing to save
611
589
        text_buffer = self._file_message_text_view.get_buffer()
612
590
        cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
613
 
                                        text_buffer.get_end_iter(), True)
 
591
                                        text_buffer.get_end_iter())
614
592
        last_selected = self._files_store.get_iter(self._last_selected_file)
615
593
        self._files_store.set_value(last_selected, 5, cur_text)
616
594
 
622
600
        self._save_current_file_message()
623
601
        text_buffer = self._file_message_text_view.get_buffer()
624
602
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
625
 
        if file_id == "": # Whole tree
 
603
        if file_id is None: # Whole tree
626
604
            self._file_message_expander.set_label(_i18n('File commit message'))
627
605
            self._file_message_expander.set_expanded(False)
628
606
            self._file_message_expander.set_sensitive(False)
645
623
        files = []
646
624
        records = iter(self._files_store)
647
625
        rec = records.next() # Skip the All Files record
648
 
        assert rec[0] == "", "Are we skipping the wrong record?"
 
626
        assert rec[0] is None, "Are we skipping the wrong record?"
649
627
 
650
628
        file_info = []
651
629
        for record in records:
652
630
            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])
 
631
                file_id = record[0] # [0] file_id
 
632
                path = record[1]    # [1] real path
 
633
                file_message = record[5] # [5] commit message
657
634
                files.append(path.decode('UTF-8'))
658
635
                if self._enable_per_file_commits and file_message:
659
636
                    # All of this needs to be utf-8 information
660
 
                    file_message = file_message.encode('UTF-8')
661
637
                    file_info.append({'path':path, 'file_id':file_id,
662
638
                                     'message':file_message})
663
639
        file_info.sort(key=lambda x:(x['path'], x['file_id']))
667
643
            return files, []
668
644
 
669
645
    @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
646
    def _on_commit_clicked(self, button):
698
647
        """ Commit button clicked handler. """
699
648
        self._do_commit()
704
653
        if message == '':
705
654
            response = self._question_dialog(
706
655
                _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:
 
656
                _i18n('You can describe your commit intent in the message.'))
 
657
            if response == gtk.RESPONSE_NO:
710
658
                # Kindly give focus to message area
711
659
                self._global_message_text_view.grab_focus()
712
660
                return
725
673
        for path in self._wt.unknowns():
726
674
            response = self._question_dialog(
727
675
                _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:
 
676
                _i18n("Unknown files exist in the working tree. Commit anyway?"))
 
677
            if response == gtk.RESPONSE_NO:
732
678
                return
733
679
            break
734
680
 
747
693
            response = self._question_dialog(
748
694
                _i18n('Commit with no changes?'),
749
695
                _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:
 
696
                      ' Do you want to commit anyway?'))
 
697
            if response == gtk.RESPONSE_YES:
753
698
                rev_id = self._wt.commit(message,
754
699
                               allow_pointless=True,
755
700
                               strict=False,
757
702
                               specific_files=specific_files,
758
703
                               revprops=revprops)
759
704
        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)
 
705
        self.response(gtk.RESPONSE_OK)
763
706
 
764
707
    def _get_global_commit_message(self):
765
708
        buf = self._global_message_text_view.get_buffer()
766
709
        start, end = buf.get_bounds()
767
 
        text = buf.get_text(start, end, True)
768
 
        return _sanitize_and_decode_message(text)
 
710
        return buf.get_text(start, end).decode('utf-8')
769
711
 
770
712
    def _set_global_commit_message(self, message):
771
713
        """Just a helper for the test suite."""
792
734
                                       show_offset=False)
793
735
        rev_dict['revision_id'] = rev.revision_id
794
736
        return rev_dict
795