Rev 457: Fix more tests, only two broken ones remaining. in file:///data/jelmer/bzr-svn/nestedtrees/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 457
revision-id: jelmer at samba.org-20080708013122-0xb0kkjpg5jvct8k
parent: jelmer at samba.org-20080708012153-nbytwykxajbl5mxn
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: nestedtrees
timestamp: Tue 2008-07-08 03:31:22 +0200
message:
  Fix more tests, only two broken ones remaining.
modified:
  tests/test_tree.py             test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
=== modified file 'tests/test_tree.py'
--- a/tests/test_tree.py	2008-07-08 00:48:56 +0000
+++ b/tests/test_tree.py	2008-07-08 01:31:22 +0000
@@ -82,7 +82,8 @@
         tree = SvnBasisTree(wt)
         self.assertEqual('tree-reference', 
                          tree.inventory[tree.inventory.path2id("bla")].kind)
-        self.assertEqual(TreeReference(generate_svn_file_id(wt.branch.repository.uuid, 0, "", ""),
+        mapping = wt.branch.repository.get_mapping()
+        self.assertEqual(TreeReference(mapping.generate_file_id(wt.branch.repository.uuid, 0, "", u""),
              'bla', wt.branch.get_root_id(), revision=wt.branch.generate_revision_id(1)),
                          tree.inventory[tree.inventory.path2id("bla")])
 

=== modified file 'tree.py'
--- a/tree.py	2008-07-08 01:21:53 +0000
+++ b/tree.py	2008-07-08 01:31:22 +0000
@@ -310,7 +310,8 @@
             (_, props) = adm.get_prop_diffs(self.workingtree.abspath(relpath).encode("utf-8"))
             if props.has_key(properties.PROP_EXTERNALS):
                 for (name, (rev, url)) in \
-                    properties.parse_externals_description(props[properties.PROP_EXTERNALS]).items():
+                    properties.parse_externals_description(self._repository.base, 
+                                                           props[properties.PROP_EXTERNALS]).items():
                     inventory_add_external(self._inventory, id, name, revid, rev, url)
 
         adm = workingtree._get_wc()