/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: Szilveszter Farkas
  • Date: 2009-05-29 09:08:19 UTC
  • mfrom: (635.2.13 gtk)
  • Revision ID: szilveszter.farkas@gmail.com-20090529090819-lsg09k7mmdt6yjft
Merge commit message saving feature by Vincent.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
27
27
import gobject
28
28
import pango
29
29
 
30
 
from bzrlib import errors, osutils
31
 
from bzrlib.trace import mutter
 
30
from bzrlib import (
 
31
    branch,
 
32
    errors,
 
33
    osutils,
 
34
    trace,
 
35
    )
32
36
from bzrlib.util import bencode
33
37
 
34
38
from bzrlib.plugins.gtk import _i18n
109
113
 
110
114
    def __init__(self, wt, selected=None, parent=None):
111
115
        gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
112
 
                                  parent=parent,
113
 
                                  flags=0,
114
 
                                  buttons=(gtk.STOCK_CANCEL,
115
 
                                           gtk.RESPONSE_CANCEL))
 
116
                            parent=parent, flags=0,)
 
117
        self.connect('delete-event', self._on_delete_window)
116
118
        self._question_dialog = question_dialog
117
 
        
 
119
 
118
120
        self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
119
121
 
120
122
        self._wt = wt
124
126
        self._enable_per_file_commits = True
125
127
        self._commit_all_changes = True
126
128
        self.committed_revision_id = None # Nothing has been committed yet
 
129
        self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)
127
130
 
128
131
        self.setup_params()
129
132
        self.construct()
198
201
        self._basis_tree.lock_read()
199
202
        try:
200
203
            from diff import iter_changes_to_status
 
204
            saved_file_messages = self._saved_commit_messages_manager.get()[1]
201
205
            for (file_id, real_path, change_type, display_path
202
206
                ) in iter_changes_to_status(self._basis_tree, self._wt):
203
207
                if self._selected and real_path != self._selected:
204
208
                    enabled = False
205
209
                else:
206
210
                    enabled = True
 
211
                try:
 
212
                    default_message = saved_file_messages[file_id]
 
213
                except KeyError:
 
214
                    default_message = ''
207
215
                item_iter = store.append([
208
216
                    file_id,
209
217
                    real_path.encode('UTF-8'),
210
218
                    enabled,
211
219
                    display_path.encode('UTF-8'),
212
220
                    change_type,
213
 
                    '', # Initial comment
 
221
                    default_message, # Initial comment
214
222
                    ])
215
223
                if self._selected and enabled:
216
224
                    initial_cursor = store.get_path(item_iter)
242
250
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
243
251
                                           '/org/freedesktop/NetworkManager')
244
252
            except dbus.DBusException:
245
 
                mutter("networkmanager not available.")
 
253
                trace.mutter("networkmanager not available.")
246
254
                self._check_local.show()
247
255
                return
248
256
            
254
262
            except dbus.DBusException, e:
255
263
                # Silently drop errors. While DBus may be
256
264
                # available, NetworkManager doesn't necessarily have to be
257
 
                mutter("unable to get networkmanager state: %r" % e)
 
265
                trace.mutter("unable to get networkmanager state: %r" % e)
258
266
        self._check_local.show()
259
267
 
260
268
    def _fill_in_per_file_info(self):
348
356
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
349
357
 
350
358
    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)
351
363
        self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
352
364
        self._button_commit.connect('clicked', self._on_commit_clicked)
353
365
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
549
561
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
550
562
 
551
563
        self._global_message_text_view = gtk.TextView()
 
564
        self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
552
565
        self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
553
566
        scroller.add(self._global_message_text_view)
554
567
        scroller.set_shadow_type(gtk.SHADOW_IN)
655
668
            return files, []
656
669
 
657
670
    @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
658
698
    def _on_commit_clicked(self, button):
659
699
        """ Commit button clicked handler. """
660
700
        self._do_commit()
718
758
                               specific_files=specific_files,
719
759
                               revprops=revprops)
720
760
        self.committed_revision_id = rev_id
 
761
        # destroy old comments if any
 
762
        SavedCommitMessagesManager().save(self._wt, self._wt.branch)
721
763
        self.response(gtk.RESPONSE_OK)
722
764
 
723
765
    def _get_global_commit_message(self):
751
793
                                       show_offset=False)
752
794
        rev_dict['revision_id'] = rev.revision_id
753
795
        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)