~jteh/bzr-fastimport/plainAuthorsBugs

« back to all changes in this revision

Viewing changes to revision_store.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-10 08:48:02 UTC
  • Revision ID: jelmer@samba.org-20120110084802-0eyw0mdyusss7knm
Fix compatibility with bzr 2.5.

Show diffs side-by-side

added added

removed removed

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