/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-03-28 19:26:53 UTC
  • mto: (450.1.13 trunk)
  • mto: This revision was merged to the branch mainline in revision 458.
  • Revision ID: jelmer@samba.org-20080328192653-trzptkwahx1tulz9
Add module for preferences code.

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
 
import os.path
18
 
import re
19
 
 
20
17
try:
21
18
    import pygtk
22
19
    pygtk.require("2.0")
27
24
import gobject
28
25
import pango
29
26
 
30
 
from bzrlib import (
31
 
    branch,
32
 
    errors,
33
 
    osutils,
34
 
    trace,
35
 
    )
 
27
import os.path
 
28
import re
 
29
 
 
30
from bzrlib import errors, osutils
 
31
from bzrlib.trace import mutter
36
32
from bzrlib.util import bencode
37
33
 
38
 
from bzrlib.plugins.gtk import _i18n
39
 
from bzrlib.plugins.gtk.dialog import question_dialog
40
 
from bzrlib.plugins.gtk.errors import show_bzr_error
 
34
from dialog import error_dialog, question_dialog
 
35
from errors import show_bzr_error
41
36
 
42
37
try:
43
38
    import dbus
101
96
    return pm
102
97
 
103
98
 
104
 
_newline_variants_re = re.compile(r'\r\n?')
105
 
def _sanitize_and_decode_message(utf8_message):
106
 
    """Turn a utf-8 message into a sanitized Unicode message."""
107
 
    fixed_newline = _newline_variants_re.sub('\n', utf8_message)
108
 
    return fixed_newline.decode('utf-8')
109
 
 
110
 
 
111
99
class CommitDialog(gtk.Dialog):
112
100
    """Implementation of Commit."""
113
101
 
114
102
    def __init__(self, wt, selected=None, parent=None):
115
 
        gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
116
 
                            parent=parent, flags=0,)
117
 
        self.connect('delete-event', self._on_delete_window)
 
103
        gtk.Dialog.__init__(self, title="Commit - Olive",
 
104
                                  parent=parent,
 
105
                                  flags=0,
 
106
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
118
107
        self._question_dialog = question_dialog
119
108
 
120
 
        self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
121
 
 
122
109
        self._wt = wt
123
110
        # TODO: Do something with this value, it is used by Olive
124
111
        #       It used to set all changes but this one to False
126
113
        self._enable_per_file_commits = True
127
114
        self._commit_all_changes = True
128
115
        self.committed_revision_id = None # Nothing has been committed yet
129
 
        self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)
130
116
 
131
117
        self.setup_params()
132
118
        self.construct()
178
164
        store = self._files_store
179
165
        self._treeview_files.set_model(None)
180
166
 
181
 
        added = _i18n('added')
182
 
        removed = _i18n('removed')
183
 
        renamed = _i18n('renamed')
184
 
        renamed_and_modified = _i18n('renamed and modified')
185
 
        modified = _i18n('modified')
186
 
        kind_changed = _i18n('kind changed')
 
167
        added = _('added')
 
168
        removed = _('removed')
 
169
        renamed = _('renamed')
 
170
        renamed_and_modified = _('renamed and modified')
 
171
        modified = _('modified')
 
172
        kind_changed = _('kind changed')
187
173
 
188
174
        # The store holds:
189
175
        # [file_id, real path, checkbox, display path, changes type, message]
201
187
        self._basis_tree.lock_read()
202
188
        try:
203
189
            from diff import iter_changes_to_status
204
 
            saved_file_messages = self._saved_commit_messages_manager.get()[1]
205
190
            for (file_id, real_path, change_type, display_path
206
191
                ) in iter_changes_to_status(self._basis_tree, self._wt):
207
192
                if self._selected and real_path != self._selected:
208
193
                    enabled = False
209
194
                else:
210
195
                    enabled = True
211
 
                try:
212
 
                    default_message = saved_file_messages[file_id]
213
 
                except KeyError:
214
 
                    default_message = ''
215
196
                item_iter = store.append([
216
197
                    file_id,
217
198
                    real_path.encode('UTF-8'),
218
199
                    enabled,
219
200
                    display_path.encode('UTF-8'),
220
201
                    change_type,
221
 
                    default_message, # Initial comment
 
202
                    '', # Initial comment
222
203
                    ])
223
204
                if self._selected and enabled:
224
205
                    initial_cursor = store.get_path(item_iter)
250
231
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
251
232
                                           '/org/freedesktop/NetworkManager')
252
233
            except dbus.DBusException:
253
 
                trace.mutter("networkmanager not available.")
 
234
                mutter("networkmanager not available.")
254
235
                self._check_local.show()
255
236
                return
256
237
            
262
243
            except dbus.DBusException, e:
263
244
                # Silently drop errors. While DBus may be
264
245
                # available, NetworkManager doesn't necessarily have to be
265
 
                trace.mutter("unable to get networkmanager state: %r" % e)
 
246
                mutter("unable to get networkmanager state: %r" % e)
266
247
        self._check_local.show()
267
248
 
268
249
    def _fill_in_per_file_info(self):
276
257
            self._enable_per_file_commits = True
277
258
        if not self._enable_per_file_commits:
278
259
            self._file_message_expander.hide()
279
 
            self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
 
260
            self._global_message_label.set_markup(_('<b>Commit Message</b>'))
280
261
 
281
262
    def _compute_delta(self):
282
263
        self._delta = self._wt.changes_from(self._basis_tree)
321
302
                            gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
322
303
        self.add_accel_group(group)
323
304
 
324
 
        # ignore the escape key (avoid closing the window)
325
 
        self.connect_object('close', self.emit_stop_by_name, 'close')
326
 
 
327
305
    def _construct_left_pane(self):
328
306
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
329
307
        self._construct_file_list()
330
308
        self._construct_pending_list()
331
309
 
332
 
        self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
 
310
        self._check_local = gtk.CheckButton(_("_Only commit locally"),
333
311
                                            use_underline=True)
334
312
        self._left_pane_box.pack_end(self._check_local, False, False)
335
313
        self._check_local.set_active(False)
356
334
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
357
335
 
358
336
    def _construct_action_pane(self):
359
 
        self._button_cancel = gtk.Button(stock=gtk.STOCK_CANCEL)
360
 
        self._button_cancel.connect('clicked', self._on_cancel_clicked)
361
 
        self._button_cancel.show()
362
 
        self.action_area.pack_end(self._button_cancel)
363
 
        self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
 
337
        self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
364
338
        self._button_commit.connect('clicked', self._on_commit_clicked)
365
339
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
366
340
        self._button_commit.show()
386
360
 
387
361
    def _construct_file_list(self):
388
362
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
389
 
        file_label = gtk.Label(_i18n('Files'))
 
363
        file_label = gtk.Label(_('Files'))
390
364
        # file_label.show()
391
365
        self._files_box.pack_start(file_label, expand=False)
392
366
 
393
367
        self._commit_all_files_radio = gtk.RadioButton(
394
 
            None, _i18n("Commit all changes"))
 
368
            None, _("Commit all changes"))
395
369
        self._files_box.pack_start(self._commit_all_files_radio, expand=False)
396
370
        self._commit_all_files_radio.show()
397
371
        self._commit_all_files_radio.connect('toggled',
398
372
            self._toggle_commit_selection)
399
373
        self._commit_selected_radio = gtk.RadioButton(
400
 
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
 
374
            self._commit_all_files_radio, _("Only commit selected changes"))
401
375
        self._files_box.pack_start(self._commit_selected_radio, expand=False)
402
376
        self._commit_selected_radio.show()
403
377
        self._commit_selected_radio.connect('toggled',
404
378
            self._toggle_commit_selection)
405
379
        if self._pending:
406
 
            self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
 
380
            self._commit_all_files_radio.set_label(_('Commit all changes*'))
407
381
            self._commit_all_files_radio.set_sensitive(False)
408
382
            self._commit_selected_radio.set_sensitive(False)
409
383
 
436
410
        crt.set_property('activatable', not bool(self._pending))
437
411
        crt.connect("toggled", self._toggle_commit, self._files_store)
438
412
        if self._pending:
439
 
            name = _i18n('Commit*')
 
413
            name = _('Commit*')
440
414
        else:
441
 
            name = _i18n('Commit')
 
415
            name = _('Commit')
442
416
        commit_col = gtk.TreeViewColumn(name, crt, active=2)
443
417
        commit_col.set_visible(False)
444
418
        self._treeview_files.append_column(commit_col)
445
 
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
 
419
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
446
420
                                           gtk.CellRendererText(), text=3))
447
 
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
 
421
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
448
422
                                           gtk.CellRendererText(), text=4))
449
423
        self._treeview_files.connect('cursor-changed',
450
424
                                     self._on_treeview_files_cursor_changed)
477
451
 
478
452
        pending_message = gtk.Label()
479
453
        pending_message.set_markup(
480
 
            _i18n('<i>* Cannot select specific files when merging</i>'))
 
454
            _('<i>* Cannot select specific files when merging</i>'))
481
455
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
482
456
        pending_message.show()
483
457
 
484
 
        pending_label = gtk.Label(_i18n('Pending Revisions'))
 
458
        pending_label = gtk.Label(_('Pending Revisions'))
485
459
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
486
460
        pending_label.show()
487
461
 
503
477
                                 )
504
478
        self._pending_store = liststore
505
479
        self._treeview_pending.set_model(liststore)
506
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
 
480
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Date'),
507
481
                                             gtk.CellRendererText(), text=1))
508
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
 
482
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Committer'),
509
483
                                             gtk.CellRendererText(), text=2))
510
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
 
484
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Summary'),
511
485
                                             gtk.CellRendererText(), text=3))
512
486
 
513
487
    def _construct_diff_view(self):
517
491
        #       decide that we really don't ever want to display it, we should
518
492
        #       actually remove it, and other references to it, along with the
519
493
        #       tests that it is set properly.
520
 
        self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
 
494
        self._diff_label = gtk.Label(_('Diff for whole tree'))
521
495
        self._diff_label.set_alignment(0, 0)
522
496
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
523
497
        self._add_to_right_table(self._diff_label, 1, False)
541
515
        self._file_message_text_view.set_accepts_tab(False)
542
516
        self._file_message_text_view.show()
543
517
 
544
 
        self._file_message_expander = gtk.Expander(_i18n('File commit message'))
 
518
        self._file_message_expander = gtk.Expander(_('File commit message'))
545
519
        self._file_message_expander.set_expanded(True)
546
520
        self._file_message_expander.add(scroller)
547
521
        self._add_to_right_table(self._file_message_expander, 1, False)
548
522
        self._file_message_expander.show()
549
523
 
550
524
    def _construct_global_message(self):
551
 
        self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
552
 
        self._global_message_label.set_markup(
553
 
            _i18n('<b>Global Commit Message</b>'))
 
525
        self._global_message_label = gtk.Label(_('Global Commit Message'))
 
526
        self._global_message_label.set_markup(_('<b>Global Commit Message</b>'))
554
527
        self._global_message_label.set_alignment(0, 0)
555
528
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
556
529
        self._add_to_right_table(self._global_message_label, 1, False)
561
534
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
562
535
 
563
536
        self._global_message_text_view = gtk.TextView()
564
 
        self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
565
537
        self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
566
538
        scroller.add(self._global_message_text_view)
567
539
        scroller.set_shadow_type(gtk.SHADOW_IN)
577
549
 
578
550
        if selection is not None:
579
551
            path, display_path = model.get(selection, 1, 3)
580
 
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
 
552
            self._diff_label.set_text(_('Diff for ') + display_path)
581
553
            if path is None:
582
554
                self._diff_view.show_diff(None)
583
555
            else:
624
596
        text_buffer = self._file_message_text_view.get_buffer()
625
597
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
626
598
        if file_id is None: # Whole tree
627
 
            self._file_message_expander.set_label(_i18n('File commit message'))
 
599
            self._file_message_expander.set_label(_('File commit message'))
628
600
            self._file_message_expander.set_expanded(False)
629
601
            self._file_message_expander.set_sensitive(False)
630
602
            text_buffer.set_text('')
631
603
            self._last_selected_file = None
632
604
        else:
633
 
            self._file_message_expander.set_label(_i18n('Commit message for ')
 
605
            self._file_message_expander.set_label(_('Commit message for ')
634
606
                                                  + display_path)
635
607
            self._file_message_expander.set_expanded(True)
636
608
            self._file_message_expander.set_sensitive(True)
653
625
            if self._commit_all_changes or record[2]:# [2] checkbox
654
626
                file_id = record[0] # [0] file_id
655
627
                path = record[1]    # [1] real path
656
 
                # [5] commit message
657
 
                file_message = _sanitize_and_decode_message(record[5])
 
628
                file_message = record[5] # [5] commit message
658
629
                files.append(path.decode('UTF-8'))
659
630
                if self._enable_per_file_commits and file_message:
660
631
                    # All of this needs to be utf-8 information
661
 
                    file_message = file_message.encode('UTF-8')
662
632
                    file_info.append({'path':path, 'file_id':file_id,
663
633
                                     'message':file_message})
664
634
        file_info.sort(key=lambda x:(x['path'], x['file_id']))
668
638
            return files, []
669
639
 
670
640
    @show_bzr_error
671
 
    def _on_cancel_clicked(self, button):
672
 
        """ Cancel button clicked handler. """
673
 
        self._do_cancel()
674
 
 
675
 
    @show_bzr_error
676
 
    def _on_delete_window(self, source, event):
677
 
        """ Delete window handler. """
678
 
        self._do_cancel()
679
 
 
680
 
    def _do_cancel(self):
681
 
        """If requested, saves commit messages when cancelling gcommit; they are re-used by a next gcommit"""
682
 
        mgr = SavedCommitMessagesManager()
683
 
        self._saved_commit_messages_manager = mgr
684
 
        mgr.insert(self._get_global_commit_message(),
685
 
                   self._get_specific_files()[1])
686
 
        if mgr.is_not_empty(): # maybe worth saving
687
 
            response = self._question_dialog(
688
 
                _i18n('Commit cancelled'),
689
 
                _i18n('Do you want to save your commit messages ?'),
690
 
                parent=self)
691
 
            if response == gtk.RESPONSE_NO:
692
 
                 # save nothing and destroy old comments if any
693
 
                mgr = SavedCommitMessagesManager()
694
 
        mgr.save(self._wt, self._wt.branch)
695
 
        self.response(gtk.RESPONSE_CANCEL) # close window
696
 
 
697
 
    @show_bzr_error
698
641
    def _on_commit_clicked(self, button):
699
642
        """ Commit button clicked handler. """
700
643
        self._do_commit()
704
647
 
705
648
        if message == '':
706
649
            response = self._question_dialog(
707
 
                _i18n('Commit with an empty message?'),
708
 
                _i18n('You can describe your commit intent in the message.'),
709
 
                parent=self)
 
650
                            _('Commit with an empty message?'),
 
651
                            _('You can describe your commit intent in the message.'))
710
652
            if response == gtk.RESPONSE_NO:
711
653
                # Kindly give focus to message area
712
654
                self._global_message_text_view.grab_focus()
725
667
        #       files at this point.
726
668
        for path in self._wt.unknowns():
727
669
            response = self._question_dialog(
728
 
                _i18n("Commit with unknowns?"),
729
 
                _i18n("Unknown files exist in the working tree. Commit anyway?"),
730
 
                parent=self)
731
 
                # Doesn't set a parent for the dialog..
 
670
                _("Commit with unknowns?"),
 
671
                _("Unknown files exist in the working tree. Commit anyway?"))
732
672
            if response == gtk.RESPONSE_NO:
733
673
                return
734
674
            break
746
686
                       revprops=revprops)
747
687
        except errors.PointlessCommit:
748
688
            response = self._question_dialog(
749
 
                _i18n('Commit with no changes?'),
750
 
                _i18n('There are no changes in the working tree.'
751
 
                      ' Do you want to commit anyway?'),
752
 
                parent=self)
 
689
                                _('Commit with no changes?'),
 
690
                                _('There are no changes in the working tree.'
 
691
                                  ' Do you want to commit anyway?'))
753
692
            if response == gtk.RESPONSE_YES:
754
693
                rev_id = self._wt.commit(message,
755
694
                               allow_pointless=True,
758
697
                               specific_files=specific_files,
759
698
                               revprops=revprops)
760
699
        self.committed_revision_id = rev_id
761
 
        # destroy old comments if any
762
 
        SavedCommitMessagesManager().save(self._wt, self._wt.branch)
763
700
        self.response(gtk.RESPONSE_OK)
764
701
 
765
702
    def _get_global_commit_message(self):
766
703
        buf = self._global_message_text_view.get_buffer()
767
704
        start, end = buf.get_bounds()
768
 
        text = buf.get_text(start, end)
769
 
        return _sanitize_and_decode_message(text)
 
705
        return buf.get_text(start, end).decode('utf-8')
770
706
 
771
707
    def _set_global_commit_message(self, message):
772
708
        """Just a helper for the test suite."""
793
729
                                       show_offset=False)
794
730
        rev_dict['revision_id'] = rev.revision_id
795
731
        return rev_dict
796
 
 
797
 
 
798
 
class SavedCommitMessagesManager:
799
 
    """Save glogal and per-file commit messages.
800
 
 
801
 
    Saves global commit message and utf-8 file_id->message dictionary
802
 
    of per-file commit messages on disk. Re-reads them later for re-using.
803
 
    """
804
 
 
805
 
    def __init__(self, tree=None, branch=None):
806
 
        """If branch is None, builds empty messages, otherwise reads them
807
 
        from branch's disk storage. 'tree' argument is for the future."""
808
 
        if branch is None:
809
 
            self.global_message = u''
810
 
            self.file_messages = {}
811
 
        else:
812
 
            config = branch.get_config()._get_branch_data_config()
813
 
            self.global_message = config.get_user_option(
814
 
                'gtk_global_commit_message')
815
 
            if self.global_message is None:
816
 
                self.global_message = u''
817
 
            file_messages = config.get_user_option('gtk_file_commit_messages')
818
 
            if file_messages: # unicode and B-encoded:
819
 
                self.file_messages = bencode.bdecode(
820
 
                    file_messages.encode('UTF-8'))
821
 
            else:
822
 
                self.file_messages = {}
823
 
 
824
 
    def get(self):
825
 
        return self.global_message, self.file_messages
826
 
 
827
 
    def is_not_empty(self):
828
 
        return bool(self.global_message or self.file_messages)
829
 
 
830
 
    def insert(self, global_message, file_info):
831
 
        """Formats per-file commit messages (list of dictionaries, one per file)
832
 
        into one utf-8 file_id->message dictionary and merges this with
833
 
        previously existing dictionary. Merges global commit message too."""
834
 
        file_messages = {}
835
 
        for fi in file_info:
836
 
            file_message = fi['message']
837
 
            if file_message:
838
 
                file_messages[fi['file_id']] = file_message # utf-8 strings
839
 
        for k,v in file_messages.iteritems():
840
 
            try:
841
 
                self.file_messages[k] = v + '\n******\n' + self.file_messages[k]
842
 
            except KeyError:
843
 
                self.file_messages[k] = v
844
 
        if self.global_message:
845
 
            self.global_message = global_message + '\n******\n' \
846
 
                + self.global_message
847
 
        else:
848
 
            self.global_message = global_message
849
 
 
850
 
    def save(self, tree, branch):
851
 
        # We store in branch's config, which can be a problem if two gcommit
852
 
        # are done in two checkouts of one single branch (comments overwrite
853
 
        # each other). Ideally should be in working tree. But uncommit does
854
 
        # not always have a working tree, though it always has a branch.
855
 
        # 'tree' argument is for the future
856
 
        config = branch.get_config()
857
 
        # should it be named "gtk_" or some more neutral name ("gui_" ?) to
858
 
        # be compatible with qbzr in the future?
859
 
        config.set_user_option('gtk_global_commit_message', self.global_message)
860
 
        # bencode() does not know unicode objects but set_user_option()
861
 
        # requires one:
862
 
        config.set_user_option(
863
 
            'gtk_file_commit_messages',
864
 
            bencode.bencode(self.file_messages).decode('UTF-8'))
865
 
 
866
 
 
867
 
def save_commit_messages(local, master, old_revno, old_revid,
868
 
                         new_revno, new_revid):
869
 
    b = local
870
 
    if b is None:
871
 
        b = master
872
 
    mgr = SavedCommitMessagesManager(None, b)
873
 
    revid_iterator = b.repository.iter_reverse_revision_history(old_revid)
874
 
    cur_revno = old_revno
875
 
    new_revision_id = old_revid
876
 
    graph = b.repository.get_graph()
877
 
    for rev_id in revid_iterator:
878
 
        if cur_revno == new_revno:
879
 
            break
880
 
        cur_revno -= 1
881
 
        rev = b.repository.get_revision(rev_id)
882
 
        file_info = rev.properties.get('file-info', None)
883
 
        if file_info is None:
884
 
            file_info = {}
885
 
        else:
886
 
            file_info = bencode.bdecode(file_info.encode('UTF-8'))
887
 
        global_message = osutils.safe_unicode(rev.message)
888
 
        # Concatenate comment of the uncommitted revision
889
 
        mgr.insert(global_message, file_info)
890
 
 
891
 
        parents = graph.get_parent_map([rev_id]).get(rev_id, None)
892
 
        if not parents:
893
 
            continue
894
 
    mgr.save(None, b)