/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/plugins/fastimport/revision_store.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
415
415
        # This is a duplicate of Builder.commit() since we already have the
416
416
        # Revision object, and we *don't* want to call commit_write_group()
417
417
        rev.inv_sha1 = builder.inv_sha1
418
 
        try:
419
 
            config = builder._config_stack
420
 
        except AttributeError: # bzr < 2.5
421
 
            config = builder._config
 
418
        config = builder._config_stack
422
419
        builder.repository.add_revision(builder._new_revision_id, rev,
423
 
            builder.new_inventory)
 
420
            builder.revision_tree().root_inventory)
424
421
        if self._graph is not None:
425
422
            # TODO: Use StaticTuple and .intern() for these things
426
423
            self._graph.add_node(builder._new_revision_id, rev.parent_ids)