summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-01-10 09:48:02 +0100
committerJelmer Vernooij <jelmer@samba.org>2012-01-10 09:48:02 +0100
commit6384545adc6b1c4ddb5e24a8f4773244ba3a3068 (patch)
tree05f3e38eba32e2e24e3edbb2006229ad7a31ad49
parent2e9d77707b68e21bb80781324a9878321bf56214 (diff)
downloadbzr-fastimport-6384545adc6b1c4ddb5e24a8f4773244ba3a3068.tar.gz
Fix compatibility with bzr 2.5.
-rw-r--r--revision_store.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/revision_store.py b/revision_store.py
index 6b92f15..33b89de 100644
--- a/revision_store.py
+++ b/revision_store.py
@@ -411,8 +411,12 @@ class AbstractRevisionStore(object):
# This is a duplicate of Builder.commit() since we already have the
# Revision object, and we *don't* want to call commit_write_group()
rev.inv_sha1 = builder.inv_sha1
+ try:
+ config = builder._config_stack
+ except AttributeError: # bzr < 2.5
+ config = builder._config
builder.repository.add_revision(builder._new_revision_id, rev,
- builder.new_inventory, builder._config)
+ builder.new_inventory)
if self._graph is not None:
# TODO: Use StaticTuple and .intern() for these things
self._graph.add_node(builder._new_revision_id, rev.parent_ids)