Rev 456: Fix more tests. in file:///data/jelmer/bzr-svn/nestedtrees/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 456
revision-id: jelmer at samba.org-20080708012153-nbytwykxajbl5mxn
parent: jelmer at samba.org-20080708010904-3y5ndpn9xvz0und6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: nestedtrees
timestamp: Tue 2008-07-08 03:21:53 +0200
message:
  Fix more tests.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  tests/test_fetch.py            test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
=== modified file 'fetch.py'
--- a/fetch.py	2008-07-08 01:09:04 +0000
+++ b/fetch.py	2008-07-08 01:21:53 +0000
@@ -290,7 +290,7 @@
             if value is not None:
                 value = ""
             self.externals = parse_externals_description(
-                urlutils.join(self.source.base, self.inventory.id2path(id)),
+                urlutils.join(self.editor.source.base, self.editor.inventory.id2path(self.new_id)),
                 value)
         elif name in (properties.PROP_ENTRY_COMMITTED_DATE,
                     properties.PROP_ENTRY_COMMITTED_REV,

=== modified file 'tests/test_fetch.py'
--- a/tests/test_fetch.py	2008-07-08 00:48:56 +0000
+++ b/tests/test_fetch.py	2008-07-08 01:21:53 +0000
@@ -1881,20 +1881,21 @@
         self.build_tree({'dc2/somedir': None})
         self.client_add("dc2/somedir")
         self.client_set_prop("dc2/somedir", "svn:externals", 
-                str("bla\t%s/proj1/trunk\n" % self.repos_url1))
+                "bla\t%s/proj1/trunk\n" % self.repos_url1)
         self.client_commit("dc2", "My Message")
 
         oldrepos = Repository.open(self.repos_url2)
         newdir = BzrDir.create("f", format=format.get_rich_root_format())
         newrepos = newdir.create_repository()
         oldrepos.copy_content_into(newrepos)
+        mapping = oldrepos.get_mapping()
         inv = oldrepos.get_inventory(
-                oldrepos.generate_revision_id(1, "", "none"))
+                oldrepos.generate_revision_id(1, "", mapping))
         self.assertTrue(inv.has_filename("somedir/bla"))
         self.assertEqual(inv.path2id("somedir/bla"), 
             Branch.open("%s/proj1/trunk" % self.repos_url1).get_root_id())
         self.assertEqual(None, 
                 inv[inv.path2id("somedir/bla")].reference_revision)
-        self.assertEqual(oldrepos.generate_revision_id(1, "", "none"), 
+        self.assertEqual(oldrepos.generate_revision_id(1, "", mapping), 
                 inv[inv.path2id("somedir/bla")].revision)
 

=== modified file 'tree.py'
--- a/tree.py	2008-07-08 01:09:04 +0000
+++ b/tree.py	2008-07-08 01:21:53 +0000
@@ -75,14 +75,14 @@
         self.id_map = repository.get_fileid_map(self.revnum, self.branch_path, 
                                                 mapping)
         root_repos = repository.transport.get_svn_repos_root()
-        branch_url = urlutils.join(root_repos, self.branch_path)
-        editor = TreeBuildEditor(self, branch_url)
+        self.branch_url = urlutils.join(root_repos, self.branch_path)
+        editor = TreeBuildEditor(self)
         self.file_data = {}
         conn = repository.transport.get_connection()
         try:
             reporter = conn.do_switch(
                 self.revnum, "", True, 
-                branch_url, editor)
+                self.branch_url, editor)
             reporter.set_path("", 0, True, None)
             reporter.finish()
         finally:
@@ -94,10 +94,10 @@
     def get_file_text(self, file_id):
         return self.file_data[file_id]
 
+
 class TreeBuildEditor(object):
     """Builds a tree given Subversion tree transform calls."""
-    def __init__(self, tree, base):
-        self.base = base
+    def __init__(self, tree):
         self.tree = tree
         self.repository = self.tree._repository
         self.externals = None
@@ -134,8 +134,8 @@
 
     def change_prop(self, name, value):
         if name == properties.PROP_EXTERNALS:
-            self.externals = parse_externals_description(
-                urlutils.join(self.editor.base, self.tree._inventory.id2path(self.file_id)),
+            self.externals = properties.parse_externals_description(
+                urlutils.join(self.tree.branch_url, self.tree._inventory.id2path(self.file_id)),
                 value)
         elif name in (properties.PROP_ENTRY_COMMITTED_DATE,
                     properties.PROP_ENTRY_LAST_AUTHOR,
@@ -310,7 +310,7 @@
             (_, props) = adm.get_prop_diffs(self.workingtree.abspath(relpath).encode("utf-8"))
             if props.has_key(properties.PROP_EXTERNALS):
                 for (name, (rev, url)) in \
-                    parse_externals_description(props[properties.PROP_EXTERNALS]).items():
+                    properties.parse_externals_description(props[properties.PROP_EXTERNALS]).items():
                     inventory_add_external(self._inventory, id, name, revid, rev, url)
 
         adm = workingtree._get_wc()