/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: Daniel Schierbeck
  • Date: 2008-01-13 14:12:49 UTC
  • mto: (423.1.2 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080113141249-gd0i2lknr3yik55r
Moved branch view to its own package.

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