/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

Merged an approved request (single clicking bookmark).

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