/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-07-31 15:52:43 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110731155243-ln8istmxbryhb4pz
Mechanical changes made by pygi.convert.sh.

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
try:
 
20
    import pygtk
 
21
    pygtk.require("2.0")
 
22
except:
 
23
    pass
 
24
 
20
25
from gi.repository import Gtk
21
26
from gi.repository import GObject
22
27
from gi.repository import Pango
23
28
 
24
29
from bzrlib import (
25
 
    bencode,
26
30
    errors,
27
31
    osutils,
28
 
    revision as _mod_revision,
29
32
    trace,
30
 
    tsort,
31
33
    )
 
34
try:
 
35
    from bzrlib import bencode
 
36
except ImportError:
 
37
    from bzrlib.util import bencode
 
38
 
32
39
from bzrlib.plugins.gtk.dialog import question_dialog
33
 
from bzrlib.plugins.gtk.diff import DiffView
34
40
from bzrlib.plugins.gtk.errors import show_bzr_error
35
41
from bzrlib.plugins.gtk.i18n import _i18n
36
 
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
37
42
 
38
43
try:
39
44
    import dbus
43
48
    have_dbus = False
44
49
 
45
50
 
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
51
def pending_revisions(wt):
73
52
    """Return a list of pending merges or None if there are none of them.
74
53
 
79
58
    """
80
59
    parents = wt.get_parent_ids()
81
60
    if len(parents) < 2:
82
 
        return
 
61
        return None
83
62
 
84
63
    # The basic pending merge algorithm uses the same algorithm as
85
64
    # bzrlib.status.show_pending_merges
87
66
    branch = wt.branch
88
67
    last_revision = parents[0]
89
68
 
90
 
    graph = branch.repository.get_graph()
91
 
    other_revisions = [last_revision]
 
69
    if last_revision is not None:
 
70
        try:
 
71
            ignore = set(branch.repository.get_ancestry(last_revision,
 
72
                                                        topo_sorted=False))
 
73
        except errors.NoSuchRevision:
 
74
            # the last revision is a ghost : assume everything is new
 
75
            # except for it
 
76
            ignore = set([None, last_revision])
 
77
    else:
 
78
        ignore = set([None])
92
79
 
93
80
    pm = []
94
81
    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)
 
82
        ignore.add(merge)
 
83
        try:
 
84
            rev = branch.repository.get_revision(merge)
 
85
            children = []
 
86
            pm.append((rev, children))
 
87
 
 
88
            # This does need to be topo sorted, so we search backwards
 
89
            inner_merges = branch.repository.get_ancestry(merge)
 
90
            assert inner_merges[0] is None
 
91
            inner_merges.pop(0)
 
92
            for mmerge in reversed(inner_merges):
 
93
                if mmerge in ignore:
 
94
                    continue
 
95
                rev = branch.repository.get_revision(mmerge)
 
96
                children.append(rev)
 
97
 
 
98
                ignore.add(mmerge)
 
99
        except errors.NoSuchRevision:
 
100
            print "DEBUG: NoSuchRevision:", merge
 
101
 
 
102
    return pm
140
103
 
141
104
 
142
105
_newline_variants_re = re.compile(r'\r\n?')
143
106
def _sanitize_and_decode_message(utf8_message):
144
107
    """Turn a utf-8 message into a sanitized Unicode message."""
145
108
    fixed_newline = _newline_variants_re.sub('\n', utf8_message)
146
 
    return osutils.safe_unicode(fixed_newline)
 
109
    return fixed_newline.decode('utf-8')
147
110
 
148
111
 
149
112
class CommitDialog(Gtk.Dialog):
150
113
    """Implementation of Commit."""
151
114
 
152
115
    def __init__(self, wt, selected=None, parent=None):
153
 
        super(CommitDialog, self).__init__(
154
 
            title="Commit to %s" % wt.basedir, parent=parent, flags=0)
 
116
        GObject.GObject.__init__(self, title="Commit to %s" % wt.basedir,
 
117
                            parent=parent, flags=0,)
155
118
        self.connect('delete-event', self._on_delete_window)
156
119
        self._question_dialog = question_dialog
157
120
 
164
127
        self._enable_per_file_commits = True
165
128
        self._commit_all_changes = True
166
129
        self.committed_revision_id = None # Nothing has been committed yet
167
 
        self._last_selected_file = None
168
 
        self._saved_commit_messages_manager = SavedCommitMessagesManager(
169
 
            self._wt, self._wt.branch)
 
130
        self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)
170
131
 
171
132
        self.setup_params()
172
133
        self.construct()
176
137
        """Setup the member variables for state."""
177
138
        self._basis_tree = self._wt.basis_tree()
178
139
        self._delta = None
179
 
        self._wt.lock_read()
180
 
        try:
181
 
            self._pending = list(pending_revisions(self._wt))
182
 
        finally:
183
 
            self._wt.unlock()
 
140
        self._pending = pending_revisions(self._wt)
184
141
 
185
142
        self._is_checkout = (self._wt.branch.get_bound_location() is not None)
186
143
 
238
195
 
239
196
        all_enabled = (self._selected is None)
240
197
        # The first entry is always the 'whole tree'
241
 
        all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])
 
198
        all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
242
199
        initial_cursor = store.get_path(all_iter)
243
200
        # should we pass specific_files?
244
201
        self._wt.lock_read()
275
232
        # This sets the cursor, which causes the expander to close, which
276
233
        # causes the _file_message_text_view to never get realized. So we have
277
234
        # 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)
 
235
        self._treeview_files.set_cursor(initial_cursor)
279
236
 
280
237
        def _realize_file_message_tree_view(*args):
281
238
            self._file_message_text_view.realize()
289
246
            self._check_local.hide()
290
247
            return
291
248
        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
 
249
            bus = dbus.SystemBus()
298
250
            try:
299
251
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
300
252
                                           '/org/freedesktop/NetworkManager')
302
254
                trace.mutter("networkmanager not available.")
303
255
                self._check_local.show()
304
256
                return
305
 
 
 
257
            
306
258
            dbus_iface = dbus.Interface(proxy_obj,
307
259
                                        'org.freedesktop.NetworkManager')
308
260
            try:
334
286
        """Build up the dialog widgets."""
335
287
        # The primary pane which splits it into left and right (adjustable)
336
288
        # sections.
337
 
        self._hpane = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
 
289
        self._hpane = Gtk.HPaned()
338
290
 
339
291
        self._construct_left_pane()
340
292
        self._construct_right_pane()
341
293
        self._construct_action_pane()
342
294
 
343
 
        self.get_content_area().pack_start(self._hpane, True, True, 0)
 
295
        self.vbox.pack_start(self._hpane, True, True, 0)
344
296
        self._hpane.show()
345
297
        self.set_focus(self._global_message_text_view)
346
298
 
366
318
 
367
319
    def _construct_accelerators(self):
368
320
        group = Gtk.AccelGroup()
369
 
        group.connect(Gdk.keyval_from_name('N'),
370
 
                      Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
 
321
        group.connect_group(Gdk.keyval_from_name('N'),
 
322
                            Gdk.EventMask.CONTROL_MASK, 0, self._on_accel_next)
371
323
        self.add_accel_group(group)
372
324
 
373
325
        # ignore the escape key (avoid closing the window)
380
332
 
381
333
        self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
382
334
                                            use_underline=True)
383
 
        self._left_pane_box.pack_end(self._check_local, False, False, 0)
 
335
        self._left_pane_box.pack_end(self._check_local, False, False)
384
336
        self._check_local.set_active(False)
385
337
 
386
338
        self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
408
360
        self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
409
361
        self._button_cancel.connect('clicked', self._on_cancel_clicked)
410
362
        self._button_cancel.show()
411
 
        self.get_action_area().pack_end(
412
 
            self._button_cancel, True, True, 0)
 
363
        self.action_area.pack_end(self._button_cancel)
413
364
        self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
414
365
        self._button_commit.connect('clicked', self._on_commit_clicked)
415
366
        self._button_commit.set_can_default(True)
416
367
        self._button_commit.show()
417
 
        self.get_action_area().pack_end(
418
 
            self._button_commit, True, True, 0)
 
368
        self.action_area.pack_end(self._button_commit)
419
369
        self._button_commit.grab_default()
420
370
 
421
371
    def _add_to_right_table(self, widget, weight, expanding=False):
441
391
        # file_label.show()
442
392
        self._files_box.pack_start(file_label, False, True, 0)
443
393
 
444
 
        self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
 
394
        self._commit_all_files_radio = Gtk.RadioButton(
445
395
            None, _i18n("Commit all changes"))
446
396
        self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
447
397
        self._commit_all_files_radio.show()
448
398
        self._commit_all_files_radio.connect('toggled',
449
399
            self._toggle_commit_selection)
450
 
        self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
 
400
        self._commit_selected_radio = Gtk.RadioButton(
451
401
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
452
402
        self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
453
403
        self._commit_selected_radio.show()
465
415
        scroller.add(self._treeview_files)
466
416
        scroller.set_shadow_type(Gtk.ShadowType.IN)
467
417
        scroller.show()
468
 
        self._files_box.pack_start(scroller, True, True, 0)
 
418
        self._files_box.pack_start(scroller,
 
419
                                   expand=True, fill=True)
469
420
        self._files_box.show()
470
421
        self._left_pane_box.pack_start(self._files_box, True, True, 0)
471
422
 
500
451
                                     self._on_treeview_files_cursor_changed)
501
452
 
502
453
    def _toggle_commit(self, cell, path, model):
503
 
        if model[path][0] == "": # No file_id means 'All Files'
 
454
        if model[path][0] is None: # No file_id means 'All Files'
504
455
            new_val = not model[path][2]
505
456
            for node in model:
506
457
                node[2] = new_val
516
467
                checked_col.set_visible(False)
517
468
            else:
518
469
                checked_col.set_visible(True)
519
 
            renderer = checked_col.get_cells()[0]
 
470
            renderer = checked_col.get_cell_renderers()[0]
520
471
            renderer.set_property('activatable', not all_files)
521
472
 
522
473
    def _construct_pending_list(self):
528
479
        pending_message = Gtk.Label()
529
480
        pending_message.set_markup(
530
481
            _i18n('<i>* Cannot select specific files when merging</i>'))
531
 
        self._pending_box.pack_start(pending_message, False, True, 5)
 
482
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
532
483
        pending_message.show()
533
484
 
534
485
        pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
535
 
        self._pending_box.pack_start(pending_label, False, True, 0)
 
486
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
536
487
        pending_label.show()
537
488
 
538
489
        scroller = Gtk.ScrolledWindow()
541
492
        scroller.add(self._treeview_pending)
542
493
        scroller.set_shadow_type(Gtk.ShadowType.IN)
543
494
        scroller.show()
544
 
        self._pending_box.pack_start(scroller, True, True, 5)
 
495
        self._pending_box.pack_start(scroller,
 
496
                                     expand=True, fill=True, padding=5)
545
497
        self._treeview_pending.show()
546
498
        self._left_pane_box.pack_start(self._pending_box, True, True, 0)
547
499
 
560
512
                                             Gtk.CellRendererText(), text=3))
561
513
 
562
514
    def _construct_diff_view(self):
 
515
        from bzrlib.plugins.gtk.diff import DiffView
 
516
 
563
517
        # TODO: jam 2007-10-30 The diff label is currently disabled. If we
564
518
        #       decide that we really don't ever want to display it, we should
565
519
        #       actually remove it, and other references to it, along with the
574
528
        self._add_to_right_table(self._diff_view, 4, True)
575
529
        self._diff_view.show()
576
530
 
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
531
    def _construct_file_message(self):
584
532
        scroller = Gtk.ScrolledWindow()
585
533
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
592
540
        self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
593
541
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
594
542
        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
543
        self._file_message_text_view.show()
598
544
 
599
 
        self._file_message_expander = Gtk.Expander(
600
 
            label=_i18n('File commit message'))
 
545
        self._file_message_expander = Gtk.Expander(_i18n('File commit message'))
601
546
        self._file_message_expander.set_expanded(True)
602
547
        self._file_message_expander.add(scroller)
603
548
        self._add_to_right_table(self._file_message_expander, 1, False)
629
574
 
630
575
    def _on_treeview_files_cursor_changed(self, treeview):
631
576
        treeselection = treeview.get_selection()
632
 
        if treeselection is None:
633
 
            # The treeview was probably destroyed as the dialog closes.
634
 
            return
635
577
        (model, selection) = treeselection.get_selected()
636
578
 
637
579
        if selection is not None:
638
580
            path, display_path = model.get(selection, 1, 3)
639
581
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
640
 
            if path == "":
 
582
            if path is None:
641
583
                self._diff_view.show_diff(None)
642
584
            else:
643
 
                self._diff_view.show_diff([osutils.safe_unicode(path)])
 
585
                self._diff_view.show_diff([path.decode('UTF-8')])
644
586
            self._update_per_file_info(selection)
645
587
 
646
588
    def _on_accel_next(self, accel_group, window, keyval, modifier):
657
599
            # We have either made it to the end of the list, or nothing was
658
600
            # selected. Either way, select All Files, and jump to the global
659
601
            # commit message.
660
 
            self._treeview_files.set_cursor(
661
 
                Gtk.TreePath(path=0), "", False)
 
602
            self._treeview_files.set_cursor((0,))
662
603
            self._global_message_text_view.grab_focus()
663
604
        else:
664
605
            # Set the cursor to this entry, and jump to the per-file commit
665
606
            # message
666
 
            self._treeview_files.set_cursor(model.get_path(next), None, False)
 
607
            self._treeview_files.set_cursor(model.get_path(next))
667
608
            self._file_message_text_view.grab_focus()
668
609
 
669
610
    def _save_current_file_message(self):
671
612
            return # Nothing to save
672
613
        text_buffer = self._file_message_text_view.get_buffer()
673
614
        cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
674
 
                                        text_buffer.get_end_iter(), True)
 
615
                                        text_buffer.get_end_iter())
675
616
        last_selected = self._files_store.get_iter(self._last_selected_file)
676
617
        self._files_store.set_value(last_selected, 5, cur_text)
677
618
 
683
624
        self._save_current_file_message()
684
625
        text_buffer = self._file_message_text_view.get_buffer()
685
626
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
686
 
        if file_id == "": # Whole tree
 
627
        if file_id is None: # Whole tree
687
628
            self._file_message_expander.set_label(_i18n('File commit message'))
688
629
            self._file_message_expander.set_expanded(False)
689
630
            self._file_message_expander.set_sensitive(False)
706
647
        files = []
707
648
        records = iter(self._files_store)
708
649
        rec = records.next() # Skip the All Files record
709
 
        assert rec[0] == "", "Are we skipping the wrong record?"
 
650
        assert rec[0] is None, "Are we skipping the wrong record?"
710
651
 
711
652
        file_info = []
712
653
        for record in records:
713
654
            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
 
655
                file_id = record[0] # [0] file_id
 
656
                path = record[1]    # [1] real path
716
657
                # [5] commit message
717
658
                file_message = _sanitize_and_decode_message(record[5])
718
659
                files.append(path.decode('UTF-8'))
825
766
    def _get_global_commit_message(self):
826
767
        buf = self._global_message_text_view.get_buffer()
827
768
        start, end = buf.get_bounds()
828
 
        text = buf.get_text(start, end, True)
 
769
        text = buf.get_text(start, end)
829
770
        return _sanitize_and_decode_message(text)
830
771
 
831
772
    def _set_global_commit_message(self, message):
854
795
        rev_dict['revision_id'] = rev.revision_id
855
796
        return rev_dict
856
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)