/b-gtk/fix-viz

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

« back to all changes in this revision

Viewing changes to commit.py

  • Committer: Jelmer Vernooij
  • Date: 2011-07-28 15:34:17 UTC
  • Revision ID: jelmer@samba.org-20110728153417-5ubdwh74oe3fe6j0
Use TestCase.get_log rather than TestCase._get_log.

Show diffs side-by-side

added added

removed removed

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