/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-12-01 10:46:10 UTC
  • mfrom: (750.1.4 bzr-gtk)
  • Revision ID: jelmer@samba.org-20111201104610-28d43twnvlmosnt8
Use translations in nautilus-bzr.

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
19
20
from gi.repository import Gtk
20
21
from gi.repository import GObject
21
22
from gi.repository import Pango
22
23
 
 
24
try:
 
25
    from bzrlib import bencode
 
26
except ImportError:
 
27
    from bzrlib.util import bencode
 
28
 
23
29
from bzrlib import (
24
30
    errors,
25
 
    osutils,
26
31
    trace,
27
32
    )
28
 
try:
29
 
    from bzrlib import bencode
30
 
except ImportError:
31
 
    from bzrlib.util import bencode
32
 
 
33
33
from bzrlib.plugins.gtk.dialog import question_dialog
34
34
from bzrlib.plugins.gtk.errors import show_bzr_error
35
35
from bzrlib.plugins.gtk.i18n import _i18n
 
36
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
36
37
 
37
38
try:
38
39
    import dbus
107
108
    """Implementation of Commit."""
108
109
 
109
110
    def __init__(self, wt, selected=None, parent=None):
110
 
        GObject.GObject.__init__(self, title="Commit to %s" % wt.basedir,
111
 
                            parent=parent, flags=0,)
 
111
        super(CommitDialog, self).__init__(
 
112
            title="Commit to %s" % wt.basedir, parent=parent, flags=0)
112
113
        self.connect('delete-event', self._on_delete_window)
113
114
        self._question_dialog = question_dialog
114
115
 
121
122
        self._enable_per_file_commits = True
122
123
        self._commit_all_changes = True
123
124
        self.committed_revision_id = None # Nothing has been committed yet
124
 
        self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)
 
125
        self._saved_commit_messages_manager = SavedCommitMessagesManager(
 
126
            self._wt, self._wt.branch)
125
127
 
126
128
        self.setup_params()
127
129
        self.construct()
226
228
        # This sets the cursor, which causes the expander to close, which
227
229
        # causes the _file_message_text_view to never get realized. So we have
228
230
        # to give it a little kick, or it warns when we try to grab the focus
229
 
        self._treeview_files.set_cursor(initial_cursor)
 
231
        self._treeview_files.set_cursor(initial_cursor, None, False)
230
232
 
231
233
        def _realize_file_message_tree_view(*args):
232
234
            self._file_message_text_view.realize()
286
288
        self._construct_right_pane()
287
289
        self._construct_action_pane()
288
290
 
289
 
        self.vbox.pack_start(self._hpane, True, True, 0)
 
291
        self.get_content_area().pack_start(self._hpane, True, True, 0)
290
292
        self._hpane.show()
291
293
        self.set_focus(self._global_message_text_view)
292
294
 
312
314
 
313
315
    def _construct_accelerators(self):
314
316
        group = Gtk.AccelGroup()
315
 
        group.connect_group(Gdk.keyval_from_name('N'),
316
 
                            Gdk.EventMask.CONTROL_MASK, 0, self._on_accel_next)
 
317
        group.connect(Gdk.keyval_from_name('N'),
 
318
                      Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
317
319
        self.add_accel_group(group)
318
320
 
319
321
        # ignore the escape key (avoid closing the window)
326
328
 
327
329
        self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
328
330
                                            use_underline=True)
329
 
        self._left_pane_box.pack_end(self._check_local, False, False)
 
331
        self._left_pane_box.pack_end(self._check_local, False, False, 0)
330
332
        self._check_local.set_active(False)
331
333
 
332
334
        self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
354
356
        self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
355
357
        self._button_cancel.connect('clicked', self._on_cancel_clicked)
356
358
        self._button_cancel.show()
357
 
        self.action_area.pack_end(self._button_cancel)
 
359
        self.get_action_area().pack_end(
 
360
            self._button_cancel, True, True, 0)
358
361
        self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
359
362
        self._button_commit.connect('clicked', self._on_commit_clicked)
360
363
        self._button_commit.set_can_default(True)
361
364
        self._button_commit.show()
362
 
        self.action_area.pack_end(self._button_commit)
 
365
        self.get_action_area().pack_end(
 
366
            self._button_commit, True, True, 0)
363
367
        self._button_commit.grab_default()
364
368
 
365
369
    def _add_to_right_table(self, widget, weight, expanding=False):
385
389
        # file_label.show()
386
390
        self._files_box.pack_start(file_label, False, True, 0)
387
391
 
388
 
        self._commit_all_files_radio = Gtk.RadioButton(
 
392
        self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
389
393
            None, _i18n("Commit all changes"))
390
394
        self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
391
395
        self._commit_all_files_radio.show()
392
396
        self._commit_all_files_radio.connect('toggled',
393
397
            self._toggle_commit_selection)
394
 
        self._commit_selected_radio = Gtk.RadioButton(
 
398
        self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
395
399
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
396
400
        self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
397
401
        self._commit_selected_radio.show()
409
413
        scroller.add(self._treeview_files)
410
414
        scroller.set_shadow_type(Gtk.ShadowType.IN)
411
415
        scroller.show()
412
 
        self._files_box.pack_start(scroller,
413
 
                                   expand=True, fill=True)
 
416
        self._files_box.pack_start(scroller, True, True, 0)
414
417
        self._files_box.show()
415
418
        self._left_pane_box.pack_start(self._files_box, True, True, 0)
416
419
 
461
464
                checked_col.set_visible(False)
462
465
            else:
463
466
                checked_col.set_visible(True)
464
 
            renderer = checked_col.get_cell_renderers()[0]
 
467
            renderer = checked_col.get_cells()[0]
465
468
            renderer.set_property('activatable', not all_files)
466
469
 
467
470
    def _construct_pending_list(self):
473
476
        pending_message = Gtk.Label()
474
477
        pending_message.set_markup(
475
478
            _i18n('<i>* Cannot select specific files when merging</i>'))
476
 
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
 
479
        self._pending_box.pack_start(pending_message, False, True, 5)
477
480
        pending_message.show()
478
481
 
479
482
        pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
480
 
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
 
483
        self._pending_box.pack_start(pending_label, False, True, 0)
481
484
        pending_label.show()
482
485
 
483
486
        scroller = Gtk.ScrolledWindow()
486
489
        scroller.add(self._treeview_pending)
487
490
        scroller.set_shadow_type(Gtk.ShadowType.IN)
488
491
        scroller.show()
489
 
        self._pending_box.pack_start(scroller,
490
 
                                     expand=True, fill=True, padding=5)
 
492
        self._pending_box.pack_start(scroller, True, True, 5)
491
493
        self._treeview_pending.show()
492
494
        self._left_pane_box.pack_start(self._pending_box, True, True, 0)
493
495
 
536
538
        self._file_message_text_view.set_accepts_tab(False)
537
539
        self._file_message_text_view.show()
538
540
 
539
 
        self._file_message_expander = Gtk.Expander(_i18n('File commit message'))
 
541
        self._file_message_expander = Gtk.Expander(
 
542
            label=_i18n('File commit message'))
540
543
        self._file_message_expander.set_expanded(True)
541
544
        self._file_message_expander.add(scroller)
542
545
        self._add_to_right_table(self._file_message_expander, 1, False)
593
596
            # We have either made it to the end of the list, or nothing was
594
597
            # selected. Either way, select All Files, and jump to the global
595
598
            # commit message.
596
 
            self._treeview_files.set_cursor((0,))
 
599
            self._treeview_files.set_cursor(
 
600
                Gtk.TreePath(path=0), None, False)
597
601
            self._global_message_text_view.grab_focus()
598
602
        else:
599
603
            # Set the cursor to this entry, and jump to the per-file commit
600
604
            # message
601
 
            self._treeview_files.set_cursor(model.get_path(next))
 
605
            self._treeview_files.set_cursor(model.get_path(next), None, False)
602
606
            self._file_message_text_view.grab_focus()
603
607
 
604
608
    def _save_current_file_message(self):
606
610
            return # Nothing to save
607
611
        text_buffer = self._file_message_text_view.get_buffer()
608
612
        cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
609
 
                                        text_buffer.get_end_iter())
 
613
                                        text_buffer.get_end_iter(), True)
610
614
        last_selected = self._files_store.get_iter(self._last_selected_file)
611
615
        self._files_store.set_value(last_selected, 5, cur_text)
612
616
 
760
764
    def _get_global_commit_message(self):
761
765
        buf = self._global_message_text_view.get_buffer()
762
766
        start, end = buf.get_bounds()
763
 
        text = buf.get_text(start, end)
 
767
        text = buf.get_text(start, end, True)
764
768
        return _sanitize_and_decode_message(text)
765
769
 
766
770
    def _set_global_commit_message(self, message):
789
793
        rev_dict['revision_id'] = rev.revision_id
790
794
        return rev_dict
791
795
 
792
 
 
793
 
class SavedCommitMessagesManager:
794
 
    """Save glogal and per-file commit messages.
795
 
 
796
 
    Saves global commit message and utf-8 file_id->message dictionary
797
 
    of per-file commit messages on disk. Re-reads them later for re-using.
798
 
    """
799
 
 
800
 
    def __init__(self, tree=None, branch=None):
801
 
        """If branch is None, builds empty messages, otherwise reads them
802
 
        from branch's disk storage. 'tree' argument is for the future."""
803
 
        if branch is None:
804
 
            self.global_message = u''
805
 
            self.file_messages = {}
806
 
        else:
807
 
            config = branch.get_config()
808
 
            self.global_message = config.get_user_option(
809
 
                'gtk_global_commit_message')
810
 
            if self.global_message is None:
811
 
                self.global_message = u''
812
 
            file_messages = config.get_user_option('gtk_file_commit_messages')
813
 
            if file_messages: # unicode and B-encoded:
814
 
                self.file_messages = bencode.bdecode(
815
 
                    file_messages.encode('UTF-8'))
816
 
            else:
817
 
                self.file_messages = {}
818
 
 
819
 
    def get(self):
820
 
        return self.global_message, self.file_messages
821
 
 
822
 
    def is_not_empty(self):
823
 
        return bool(self.global_message or self.file_messages)
824
 
 
825
 
    def insert(self, global_message, file_info):
826
 
        """Formats per-file commit messages (list of dictionaries, one per file)
827
 
        into one utf-8 file_id->message dictionary and merges this with
828
 
        previously existing dictionary. Merges global commit message too."""
829
 
        file_messages = {}
830
 
        for fi in file_info:
831
 
            file_message = fi['message']
832
 
            if file_message:
833
 
                file_messages[fi['file_id']] = file_message # utf-8 strings
834
 
        for k,v in file_messages.iteritems():
835
 
            try:
836
 
                self.file_messages[k] = v + '\n******\n' + self.file_messages[k]
837
 
            except KeyError:
838
 
                self.file_messages[k] = v
839
 
        if self.global_message:
840
 
            self.global_message = global_message + '\n******\n' \
841
 
                + self.global_message
842
 
        else:
843
 
            self.global_message = global_message
844
 
 
845
 
    def save(self, tree, branch):
846
 
        # We store in branch's config, which can be a problem if two gcommit
847
 
        # are done in two checkouts of one single branch (comments overwrite
848
 
        # each other). Ideally should be in working tree. But uncommit does
849
 
        # not always have a working tree, though it always has a branch.
850
 
        # 'tree' argument is for the future
851
 
        config = branch.get_config()
852
 
        # should it be named "gtk_" or some more neutral name ("gui_" ?) to
853
 
        # be compatible with qbzr in the future?
854
 
        config.set_user_option('gtk_global_commit_message', self.global_message)
855
 
        # bencode() does not know unicode objects but set_user_option()
856
 
        # requires one:
857
 
        config.set_user_option(
858
 
            'gtk_file_commit_messages',
859
 
            bencode.bencode(self.file_messages).decode('UTF-8'))
860
 
 
861
 
 
862
 
def save_commit_messages(local, master, old_revno, old_revid,
863
 
                         new_revno, new_revid):
864
 
    b = local
865
 
    if b is None:
866
 
        b = master
867
 
    mgr = SavedCommitMessagesManager(None, b)
868
 
    revid_iterator = b.repository.iter_reverse_revision_history(old_revid)
869
 
    cur_revno = old_revno
870
 
    new_revision_id = old_revid
871
 
    graph = b.repository.get_graph()
872
 
    for rev_id in revid_iterator:
873
 
        if cur_revno == new_revno:
874
 
            break
875
 
        cur_revno -= 1
876
 
        rev = b.repository.get_revision(rev_id)
877
 
        file_info = rev.properties.get('file-info', None)
878
 
        if file_info is None:
879
 
            file_info = {}
880
 
        else:
881
 
            file_info = bencode.bdecode(file_info.encode('UTF-8'))
882
 
        global_message = osutils.safe_unicode(rev.message)
883
 
        # Concatenate comment of the uncommitted revision
884
 
        mgr.insert(global_message, file_info)
885
 
 
886
 
        parents = graph.get_parent_map([rev_id]).get(rev_id, None)
887
 
        if not parents:
888
 
            continue
889
 
    mgr.save(None, b)