/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: Curtis Hovey
  • Date: 2011-08-12 22:58:29 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110812225829-qbyn8z2z04rc8jw4
Fixed row/path issues in gannoate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
22
22
from gi.repository import Pango
23
23
 
24
24
from bzrlib import (
25
 
    bencode,
26
25
    errors,
27
26
    osutils,
28
 
    revision as _mod_revision,
29
27
    trace,
30
 
    tsort,
31
28
    )
 
29
try:
 
30
    from bzrlib import bencode
 
31
except ImportError:
 
32
    from bzrlib.util import bencode
 
33
 
32
34
from bzrlib.plugins.gtk.dialog import question_dialog
33
 
from bzrlib.plugins.gtk.diff import DiffView
34
35
from bzrlib.plugins.gtk.errors import show_bzr_error
35
36
from bzrlib.plugins.gtk.i18n import _i18n
36
 
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
37
37
 
38
38
try:
39
39
    import dbus
43
43
    have_dbus = False
44
44
 
45
45
 
46
 
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
47
 
    """Get an iterator which will return the revisions in merge sorted order.
48
 
 
49
 
    This will build up a list of all nodes, such that only nodes in the list
50
 
    are referenced. It then uses MergeSorter to return them in 'merge-sorted'
51
 
    order.
52
 
 
53
 
    :param revision_ids: A set of revision_ids
54
 
    :param parent_map: The parent information for each node. Revisions which
55
 
        are considered ghosts should not be present in the map.
56
 
    :return: iterator from MergeSorter.iter_topo_order()
57
 
    """
58
 
    # MergeSorter requires that all nodes be present in the graph, so get rid
59
 
    # of any references pointing outside of this graph.
60
 
    parent_graph = {}
61
 
    for revision_id in revision_ids:
62
 
        if revision_id not in parent_map: # ghost
63
 
            parent_graph[revision_id] = []
64
 
        else:
65
 
            # Only include parents which are in this sub-graph
66
 
            parent_graph[revision_id] = [p for p in parent_map[revision_id]
67
 
                                            if p in revision_ids]
68
 
    sorter = tsort.MergeSorter(parent_graph, tip_revision)
69
 
    return sorter.iter_topo_order()
70
 
 
71
 
 
72
46
def pending_revisions(wt):
73
47
    """Return a list of pending merges or None if there are none of them.
74
48
 
79
53
    """
80
54
    parents = wt.get_parent_ids()
81
55
    if len(parents) < 2:
82
 
        return
 
56
        return None
83
57
 
84
58
    # The basic pending merge algorithm uses the same algorithm as
85
59
    # bzrlib.status.show_pending_merges
87
61
    branch = wt.branch
88
62
    last_revision = parents[0]
89
63
 
90
 
    graph = branch.repository.get_graph()
91
 
    other_revisions = [last_revision]
 
64
    if last_revision is not None:
 
65
        try:
 
66
            ignore = set(branch.repository.get_ancestry(last_revision,
 
67
                                                        topo_sorted=False))
 
68
        except errors.NoSuchRevision:
 
69
            # the last revision is a ghost : assume everything is new
 
70
            # except for it
 
71
            ignore = set([None, last_revision])
 
72
    else:
 
73
        ignore = set([None])
92
74
 
93
75
    pm = []
94
76
    for merge in pending:
95
 
        try:
96
 
            merge_rev = branch.repository.get_revision(merge)
97
 
        except errors.NoSuchRevision:
98
 
            # If we are missing a revision, just print out the revision id
99
 
            trace.mutter("ghost: %r", merge)
100
 
            other_revisions.append(merge)
101
 
            continue
102
 
 
103
 
        # Find all of the revisions in the merge source, which are not in the
104
 
        # last committed revision.
105
 
        merge_extra = graph.find_unique_ancestors(merge, other_revisions)
106
 
        other_revisions.append(merge)
107
 
        merge_extra.discard(_mod_revision.NULL_REVISION)
108
 
 
109
 
        # Get a handle to all of the revisions we will need
110
 
        try:
111
 
            revisions = dict((rev.revision_id, rev) for rev in
112
 
                             branch.repository.get_revisions(merge_extra))
113
 
        except errors.NoSuchRevision:
114
 
            # One of the sub nodes is a ghost, check each one
115
 
            revisions = {}
116
 
            for revision_id in merge_extra:
117
 
                try:
118
 
                    rev = branch.repository.get_revisions([revision_id])[0]
119
 
                except errors.NoSuchRevision:
120
 
                    revisions[revision_id] = None
121
 
                else:
122
 
                    revisions[revision_id] = rev
123
 
 
124
 
         # Display the revisions brought in by this merge.
125
 
        rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
126
 
                            branch.repository.get_parent_map(merge_extra))
127
 
        # Skip the first node
128
 
        num, first, depth, eom = rev_id_iterator.next()
129
 
        if first != merge:
130
 
            raise AssertionError('Somehow we misunderstood how'
131
 
                ' iter_topo_order works %s != %s' % (first, merge))
132
 
        children = []
133
 
        for num, sub_merge, depth, eom in rev_id_iterator:
134
 
            rev = revisions[sub_merge]
135
 
            if rev is None:
136
 
                trace.warning("ghost: %r", sub_merge)
137
 
                continue
138
 
            children.append(rev)
139
 
        yield (merge_rev, children)
 
77
        ignore.add(merge)
 
78
        try:
 
79
            rev = branch.repository.get_revision(merge)
 
80
            children = []
 
81
            pm.append((rev, children))
 
82
 
 
83
            # This does need to be topo sorted, so we search backwards
 
84
            inner_merges = branch.repository.get_ancestry(merge)
 
85
            assert inner_merges[0] is None
 
86
            inner_merges.pop(0)
 
87
            for mmerge in reversed(inner_merges):
 
88
                if mmerge in ignore:
 
89
                    continue
 
90
                rev = branch.repository.get_revision(mmerge)
 
91
                children.append(rev)
 
92
 
 
93
                ignore.add(mmerge)
 
94
        except errors.NoSuchRevision:
 
95
            print "DEBUG: NoSuchRevision:", merge
 
96
 
 
97
    return pm
140
98
 
141
99
 
142
100
_newline_variants_re = re.compile(r'\r\n?')
143
101
def _sanitize_and_decode_message(utf8_message):
144
102
    """Turn a utf-8 message into a sanitized Unicode message."""
145
103
    fixed_newline = _newline_variants_re.sub('\n', utf8_message)
146
 
    return osutils.safe_unicode(fixed_newline)
 
104
    return fixed_newline.decode('utf-8')
147
105
 
148
106
 
149
107
class CommitDialog(Gtk.Dialog):
150
108
    """Implementation of Commit."""
151
109
 
152
110
    def __init__(self, wt, selected=None, parent=None):
153
 
        super(CommitDialog, self).__init__(
154
 
            title="Commit to %s" % wt.basedir, parent=parent, flags=0)
 
111
        Gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
 
112
                            parent=parent, flags=0,)
155
113
        self.connect('delete-event', self._on_delete_window)
156
114
        self._question_dialog = question_dialog
157
115
 
164
122
        self._enable_per_file_commits = True
165
123
        self._commit_all_changes = True
166
124
        self.committed_revision_id = None # Nothing has been committed yet
167
 
        self._last_selected_file = None
168
125
        self._saved_commit_messages_manager = SavedCommitMessagesManager(
169
126
            self._wt, self._wt.branch)
170
127
 
176
133
        """Setup the member variables for state."""
177
134
        self._basis_tree = self._wt.basis_tree()
178
135
        self._delta = None
179
 
        self._wt.lock_read()
180
 
        try:
181
 
            self._pending = list(pending_revisions(self._wt))
182
 
        finally:
183
 
            self._wt.unlock()
 
136
        self._pending = pending_revisions(self._wt)
184
137
 
185
138
        self._is_checkout = (self._wt.branch.get_bound_location() is not None)
186
139
 
238
191
 
239
192
        all_enabled = (self._selected is None)
240
193
        # The first entry is always the 'whole tree'
241
 
        all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])
 
194
        all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
242
195
        initial_cursor = store.get_path(all_iter)
243
196
        # should we pass specific_files?
244
197
        self._wt.lock_read()
275
228
        # This sets the cursor, which causes the expander to close, which
276
229
        # causes the _file_message_text_view to never get realized. So we have
277
230
        # to give it a little kick, or it warns when we try to grab the focus
278
 
        self._treeview_files.set_cursor(initial_cursor, None, False)
 
231
        self._treeview_files.set_cursor(initial_cursor, None, None)
279
232
 
280
233
        def _realize_file_message_tree_view(*args):
281
234
            self._file_message_text_view.realize()
289
242
            self._check_local.hide()
290
243
            return
291
244
        if have_dbus:
292
 
            try:
293
 
                bus = dbus.SystemBus()
294
 
            except dbus.DBusException:
295
 
                trace.mutter("DBus system bus not available")
296
 
                self._check_local.show()
297
 
                return
 
245
            bus = dbus.SystemBus()
298
246
            try:
299
247
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
300
248
                                           '/org/freedesktop/NetworkManager')
302
250
                trace.mutter("networkmanager not available.")
303
251
                self._check_local.show()
304
252
                return
305
 
 
 
253
            
306
254
            dbus_iface = dbus.Interface(proxy_obj,
307
255
                                        'org.freedesktop.NetworkManager')
308
256
            try:
334
282
        """Build up the dialog widgets."""
335
283
        # The primary pane which splits it into left and right (adjustable)
336
284
        # sections.
337
 
        self._hpane = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
 
285
        self._hpane = Gtk.HPaned()
338
286
 
339
287
        self._construct_left_pane()
340
288
        self._construct_right_pane()
441
389
        # file_label.show()
442
390
        self._files_box.pack_start(file_label, False, True, 0)
443
391
 
444
 
        self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
 
392
        self._commit_all_files_radio = Gtk.RadioButton(
445
393
            None, _i18n("Commit all changes"))
446
394
        self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
447
395
        self._commit_all_files_radio.show()
448
396
        self._commit_all_files_radio.connect('toggled',
449
397
            self._toggle_commit_selection)
450
 
        self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
 
398
        self._commit_selected_radio = Gtk.RadioButton(
451
399
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
452
400
        self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
453
401
        self._commit_selected_radio.show()
500
448
                                     self._on_treeview_files_cursor_changed)
501
449
 
502
450
    def _toggle_commit(self, cell, path, model):
503
 
        if model[path][0] == "": # No file_id means 'All Files'
 
451
        if model[path][0] is None: # No file_id means 'All Files'
504
452
            new_val = not model[path][2]
505
453
            for node in model:
506
454
                node[2] = new_val
516
464
                checked_col.set_visible(False)
517
465
            else:
518
466
                checked_col.set_visible(True)
519
 
            renderer = checked_col.get_cells()[0]
 
467
            renderer = checked_col.get_cell_renderers()[0]
520
468
            renderer.set_property('activatable', not all_files)
521
469
 
522
470
    def _construct_pending_list(self):
560
508
                                             Gtk.CellRendererText(), text=3))
561
509
 
562
510
    def _construct_diff_view(self):
 
511
        from bzrlib.plugins.gtk.diff import DiffView
 
512
 
563
513
        # TODO: jam 2007-10-30 The diff label is currently disabled. If we
564
514
        #       decide that we really don't ever want to display it, we should
565
515
        #       actually remove it, and other references to it, along with the
574
524
        self._add_to_right_table(self._diff_view, 4, True)
575
525
        self._diff_view.show()
576
526
 
577
 
    @staticmethod
578
 
    def get_line_height(widget):
579
 
        pango_layout = widget.create_pango_layout("X");
580
 
        ink_rectangle, logical_rectangle = pango_layout.get_pixel_extents()
581
 
        return logical_rectangle.height
582
 
 
583
527
    def _construct_file_message(self):
584
528
        scroller = Gtk.ScrolledWindow()
585
529
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
592
536
        self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
593
537
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
594
538
        self._file_message_text_view.set_accepts_tab(False)
595
 
        line_height = self.get_line_height(self._file_message_text_view)
596
 
        self._file_message_text_view.set_size_request(-1, line_height * 2)
597
539
        self._file_message_text_view.show()
598
540
 
599
541
        self._file_message_expander = Gtk.Expander(
629
571
 
630
572
    def _on_treeview_files_cursor_changed(self, treeview):
631
573
        treeselection = treeview.get_selection()
632
 
        if treeselection is None:
633
 
            # The treeview was probably destroyed as the dialog closes.
634
 
            return
635
574
        (model, selection) = treeselection.get_selected()
636
575
 
637
576
        if selection is not None:
638
577
            path, display_path = model.get(selection, 1, 3)
639
578
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
640
 
            if path == "":
 
579
            if path is None:
641
580
                self._diff_view.show_diff(None)
642
581
            else:
643
 
                self._diff_view.show_diff([osutils.safe_unicode(path)])
 
582
                self._diff_view.show_diff([path.decode('UTF-8')])
644
583
            self._update_per_file_info(selection)
645
584
 
646
585
    def _on_accel_next(self, accel_group, window, keyval, modifier):
657
596
            # We have either made it to the end of the list, or nothing was
658
597
            # selected. Either way, select All Files, and jump to the global
659
598
            # commit message.
660
 
            self._treeview_files.set_cursor(
661
 
                Gtk.TreePath(path=0), "", False)
 
599
            self._treeview_files.set_cursor((0,))
662
600
            self._global_message_text_view.grab_focus()
663
601
        else:
664
602
            # Set the cursor to this entry, and jump to the per-file commit
665
603
            # message
666
 
            self._treeview_files.set_cursor(model.get_path(next), None, False)
 
604
            self._treeview_files.set_cursor(model.get_path(next))
667
605
            self._file_message_text_view.grab_focus()
668
606
 
669
607
    def _save_current_file_message(self):
683
621
        self._save_current_file_message()
684
622
        text_buffer = self._file_message_text_view.get_buffer()
685
623
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
686
 
        if file_id == "": # Whole tree
 
624
        if file_id is None: # Whole tree
687
625
            self._file_message_expander.set_label(_i18n('File commit message'))
688
626
            self._file_message_expander.set_expanded(False)
689
627
            self._file_message_expander.set_sensitive(False)
706
644
        files = []
707
645
        records = iter(self._files_store)
708
646
        rec = records.next() # Skip the All Files record
709
 
        assert rec[0] == "", "Are we skipping the wrong record?"
 
647
        assert rec[0] is None, "Are we skipping the wrong record?"
710
648
 
711
649
        file_info = []
712
650
        for record in records:
713
651
            if self._commit_all_changes or record[2]:# [2] checkbox
714
 
                file_id = osutils.safe_utf8(record[0]) # [0] file_id
715
 
                path = osutils.safe_utf8(record[1])    # [1] real path
 
652
                file_id = record[0] # [0] file_id
 
653
                path = record[1]    # [1] real path
716
654
                # [5] commit message
717
655
                file_message = _sanitize_and_decode_message(record[5])
718
656
                files.append(path.decode('UTF-8'))
854
792
        rev_dict['revision_id'] = rev.revision_id
855
793
        return rev_dict
856
794
 
 
795
 
 
796
class SavedCommitMessagesManager:
 
797
    """Save glogal and per-file commit messages.
 
798
 
 
799
    Saves global commit message and utf-8 file_id->message dictionary
 
800
    of per-file commit messages on disk. Re-reads them later for re-using.
 
801
    """
 
802
 
 
803
    def __init__(self, tree=None, branch=None):
 
804
        """If branch is None, builds empty messages, otherwise reads them
 
805
        from branch's disk storage. 'tree' argument is for the future."""
 
806
        if branch is None:
 
807
            self.global_message = u''
 
808
            self.file_messages = {}
 
809
        else:
 
810
            config = branch.get_config()
 
811
            self.global_message = config.get_user_option(
 
812
                'gtk_global_commit_message')
 
813
            if self.global_message is None:
 
814
                self.global_message = u''
 
815
            file_messages = config.get_user_option('gtk_file_commit_messages')
 
816
            if file_messages: # unicode and B-encoded:
 
817
                self.file_messages = bencode.bdecode(
 
818
                    file_messages.encode('UTF-8'))
 
819
            else:
 
820
                self.file_messages = {}
 
821
 
 
822
    def get(self):
 
823
        return self.global_message, self.file_messages
 
824
 
 
825
    def is_not_empty(self):
 
826
        return bool(self.global_message or self.file_messages)
 
827
 
 
828
    def insert(self, global_message, file_info):
 
829
        """Formats per-file commit messages (list of dictionaries, one per file)
 
830
        into one utf-8 file_id->message dictionary and merges this with
 
831
        previously existing dictionary. Merges global commit message too."""
 
832
        file_messages = {}
 
833
        for fi in file_info:
 
834
            file_message = fi['message']
 
835
            if file_message:
 
836
                file_messages[fi['file_id']] = file_message # utf-8 strings
 
837
        for k,v in file_messages.iteritems():
 
838
            try:
 
839
                self.file_messages[k] = v + '\n******\n' + self.file_messages[k]
 
840
            except KeyError:
 
841
                self.file_messages[k] = v
 
842
        if self.global_message:
 
843
            self.global_message = global_message + '\n******\n' \
 
844
                + self.global_message
 
845
        else:
 
846
            self.global_message = global_message
 
847
 
 
848
    def save(self, tree, branch):
 
849
        # We store in branch's config, which can be a problem if two gcommit
 
850
        # are done in two checkouts of one single branch (comments overwrite
 
851
        # each other). Ideally should be in working tree. But uncommit does
 
852
        # not always have a working tree, though it always has a branch.
 
853
        # 'tree' argument is for the future
 
854
        config = branch.get_config()
 
855
        # should it be named "gtk_" or some more neutral name ("gui_" ?) to
 
856
        # be compatible with qbzr in the future?
 
857
        config.set_user_option('gtk_global_commit_message', self.global_message)
 
858
        # bencode() does not know unicode objects but set_user_option()
 
859
        # requires one:
 
860
        config.set_user_option(
 
861
            'gtk_file_commit_messages',
 
862
            bencode.bencode(self.file_messages).decode('UTF-8'))
 
863
 
 
864
 
 
865
def save_commit_messages(local, master, old_revno, old_revid,
 
866
                         new_revno, new_revid):
 
867
    b = local
 
868
    if b is None:
 
869
        b = master
 
870
    mgr = SavedCommitMessagesManager(None, b)
 
871
    revid_iterator = b.repository.iter_reverse_revision_history(old_revid)
 
872
    cur_revno = old_revno
 
873
    new_revision_id = old_revid
 
874
    graph = b.repository.get_graph()
 
875
    for rev_id in revid_iterator:
 
876
        if cur_revno == new_revno:
 
877
            break
 
878
        cur_revno -= 1
 
879
        rev = b.repository.get_revision(rev_id)
 
880
        file_info = rev.properties.get('file-info', None)
 
881
        if file_info is None:
 
882
            file_info = {}
 
883
        else:
 
884
            file_info = bencode.bdecode(file_info.encode('UTF-8'))
 
885
        global_message = osutils.safe_unicode(rev.message)
 
886
        # Concatenate comment of the uncommitted revision
 
887
        mgr.insert(global_message, file_info)
 
888
 
 
889
        parents = graph.get_parent_map([rev_id]).get(rev_id, None)
 
890
        if not parents:
 
891
            continue
 
892
    mgr.save(None, b)