Rev 1138: Fixes. in http://people.samba.org/bzr/jelmer/bzr-svn/cext

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/cext

------------------------------------------------------------
revno: 1138
revision-id: jelmer at samba.org-20080830034420-b37nfwsh29d2y33l
parent: jelmer at samba.org-20080830030849-lx6irfcwd92xp086
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Sat 2008-08-30 05:44:20 +0200
message:
  Fixes.
modified:
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py	2008-08-30 03:08:49 +0000
+++ b/tests/test_workingtree.py	2008-08-30 03:44:20 +0000
@@ -521,7 +521,7 @@
         self.assertEqual(
                 tree.branch.generate_revision_id(1),
                 tree.basis_tree().get_revision_id())
-        delta = tree.basis_tree().changes_from(orig_tree)
+        delta = tree.basis_tree().changes_from(tree.branch.repository.revision_tree(tree.branch.generate_revision_id(1)))
         self.assertTrue(delta.has_changed())
         tree = WorkingTree.open("dc")
         delta = tree.basis_tree().changes_from(tree)
@@ -581,6 +581,8 @@
         tree.add(["file"], ["fooid"])
         tree.commit("msg")
         tree.rename_one("file", "file2")
+        delta = tree.branch.repository.get_revision_delta(tree.branch.repository.get_revision(tree.last_revision()))
+        self.assertEquals([("file", "fooid", "file")], delta.added)
         self.assertEqual(None, tree.inventory.path2id("file"))
         self.assertEqual("fooid", tree.inventory.path2id("file2"))
         tree = WorkingTree.open("dc")

=== modified file 'tree.py'
--- a/tree.py	2008-08-25 01:58:11 +0000
+++ b/tree.py	2008-08-30 03:44:20 +0000
@@ -222,9 +222,9 @@
 class SvnBasisTree(RevisionTree):
     """Optimized version of SvnRevisionTree."""
     def __init__(self, workingtree):
+        mutter("opening basistree for %r at %d; %s" % (workingtree, workingtree.base_revnum, workingtree.base_revid))
         self.workingtree = workingtree
-        self._revision_id = workingtree.branch.generate_revision_id(
-                                      workingtree.base_revnum)
+        self._revision_id = workingtree.base_revid
         self.id_map = workingtree.branch.repository.get_fileid_map(
                 workingtree.base_revnum, 
                 workingtree.branch.get_branch_path(workingtree.base_revnum), 

=== modified file 'workingtree.py'
--- a/workingtree.py	2008-08-30 03:08:49 +0000
+++ b/workingtree.py	2008-08-30 03:44:20 +0000
@@ -93,8 +93,8 @@
         self._get_wc()
         max_rev = revision_status(self.basedir, None, True)[1]
         self.base_revnum = max_rev
+        self.base_revid = branch.generate_revision_id(self.base_revnum)
         self.base_tree = SvnBasisTree(self)
-        self.base_revid = branch.generate_revision_id(self.base_revnum)
 
         self.read_working_inventory()