# Bazaar revision bundle v0.7
#
# message:
#   Remove dependency on private method InventoryEntry._add_text_to_weave that was 
#   removed recently.
#   
# committer: Jelmer Vernooij <jelmer@samba.org>
# date: Tue 2006-06-13 16:24:03.470537901 +0200

=== modified file __init__.py
--- __init__.py
+++ __init__.py
@@ -580,14 +580,14 @@
                             target_transaction
                             )
 
+                        weave = target_repo.weave_store.get_weave_or_empty(
+                                    fileid, target_transaction)
+
                         if entry.kind == 'directory':
                             # a bit of an abstraction variation, but we dont have a
                             # real tree for entry to read from, and it would be 
                             # mostly dead weight to have a stub tree here.
-                            entry._add_text_to_weave([],
-                                file_heads,
-                                target_repo.weave_store,
-                                target_transaction)
+                            weave.add_lines(revision_id, file_heads, [])
                         else:
                             # extract text and insert it.
                             path = inventory.id2path(fileid)
@@ -596,12 +596,10 @@
                             # TODO: perhaps we should use readmeta here to figure out renames ?
                             text = revlog.read(filerev)
                             lines = split_lines(text)
-                            entry._add_text_to_weave(
-                                split_lines(text),
-                                file_heads,
-                                target_repo.weave_store,
-                                target_transaction)
-                self.target.add_inventory(revision_id, inventory, revision.parent_ids)
+                            weave.add_lines(revision_id, file_heads, 
+                                            split_lines(text))
+                self.target.add_inventory(revision_id, inventory, 
+                                          revision.parent_ids)
                 self.target.add_revision(revision_id, revision)
         finally:
             pb.finished()

# revision id: jelmer@samba.org-20060613142403-3c01fbe94bf0f475
# sha1: fa9f9c00e6544a60a209dda61af674d15934b527
# inventory sha1: fbd4659f872ad59bae41245d42f674ec7bf15b8c
# parent ids:
#   jelmer@samba.org-20060613115507-ab803db33e62dd5c
# base id: jelmer@samba.org-20060613115507-ab803db33e62dd5c
# properties:
#   branch-nick: hg

