Rev 997: Fix tree snapshot creation. in file:///data/jelmer/bzr-svn/pyrex/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/pyrex/

------------------------------------------------------------
revno: 997
revision-id:jelmer at samba.org-20080316153905-sd6tt8i5o6y3sysa
parent: jelmer at samba.org-20080316152339-569rf1pa147n17ub
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Sun 2008-03-16 16:39:05 +0100
message:
  Fix tree snapshot creation.
modified:
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
=== modified file 'tree.py'
--- a/tree.py	2008-03-16 15:23:39 +0000
+++ b/tree.py	2008-03-16 15:39:05 +0000
@@ -28,6 +28,7 @@
 
 import constants
 import core, wc
+from delta import apply_txdelta_handler
 
 class SvnRevisionTree(RevisionTree):
     """A tree that existed in a historical Subversion revision."""
@@ -166,9 +167,9 @@
     def close(self, checksum=None):
         file_id, revision_id = self.tree.id_map[self.path]
         if self.is_symlink:
-            ie = self.tree._inventory.add_path(path, 'symlink', file_id)
+            ie = self.tree._inventory.add_path(self.path, 'symlink', file_id)
         else:
-            ie = self.tree._inventory.add_path(path, 'file', file_id)
+            ie = self.tree._inventory.add_path(self.path, 'file', file_id)
         ie.revision = revision_id
 
         if self.file_stream:
@@ -195,7 +196,7 @@
 
         self.file_stream = None
 
-    def apply_textdelta(self, file_id, base_checksum):
+    def apply_textdelta(self, base_checksum=None):
         self.file_stream = StringIO()
         return apply_txdelta_handler(StringIO(""), self.file_stream)