More win32 fixes.

diff --git a/AUTHORS b/AUTHORS
index 22f7e13ad134009eb4ff9c9f3b0f4393150c7a9d..e525d6bf055d1a37afccbae079ce48bbbb674ab4 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1,11 @@
 Jelmer Vernooij <jelmer@samba.org>
 
-Thanks to David Allouche, Erik Bågfors, Andrew Bennetts, Aaron Bentley, 
-Max Bowser, Jerry Carter, Robert Collins, David Foerster, Wouter van Heyst, 
-Michael Hudson, David James, Jan Kneschke, Luká¿ Lalinský, Matthias Klose, 
-Roland Mas, John Arbash Meinel, Stefan Metzmacher, Andrew Mitchell, 
-Gustavo Niemeyer, Martin Pool, Garrett Rooney, Johan Rydberg, Peter Samuelson, 
-Mark Shuttleworth, Adeodato Simó, Mikhail Sobolev and Reinhard Tartler for 
-comments, code reviews, funding, bug reports, testing, committing 
-patches/bundles and generally keeping up while I was asking annoying questions.
+Thanks to David Allouche, Erik Bågfors, Alexander Belchenko, Andrew Bennetts, 
+Aaron Bentley, Max Bowser, Jerry Carter, Robert Collins, David Foerster, 
+Wouter van Heyst, Michael Hudson, David James, Matthias Klose, Jan Kneschke, 
+Lukás Lalinský, Kevin Light, Roland Mas, John Arbash Meinel, Stefan Metzmacher, 
+Andrew Mitchell, Gustavo Niemeyer, Martin Pool, Garrett Rooney, Johan Rydberg, 
+Peter Samuelson, Mark Shuttleworth, Adeodato Simó, Mikhail Sobolev and 
+Reinhard Tartler for comments, code reviews, funding, bug reports, testing, 
+committing patches/bundles and generally keeping up while I was asking 
+annoying questions.

diff --git a/tests/test_repos.py b/tests/test_repos.py
index 5fb86b41c9ca1f1a0ce4ecbf0804398aa4a04e14..00dd927a4b9ff820caaa67f5a36386ada0822848 100644 (file)
--- a/tests/test_repos.py
+++ b/tests/test_repos.py
@@ -152,7 +152,7 @@ class TestSubversionRepositoryWorks(TestCaseWithSubversionRepository):
 
         repos = Repository.open(repos_url)
 
-        self.assertEqual("SvnRepository('file://%s/')" % os.path.join(self.test_dir, "a"), repos.__repr__())
+        self.assertEqual("SvnRepository('file://%s/')" % urlutils.join(self.test_dir, "a"), repos.__repr__())
 
     def test_get_branch_invalid_revision(self):
         repos_url = self.make_client("a", "dc")

diff --git a/tests/test_workingtree.py b/tests/test_workingtree.py
index e784dbf1ef5d28956ef34be85892c3f678a7d68a..991c3e765b8cfa9a688b657fb426559da13e9aaf 100644 (file)
--- a/tests/test_workingtree.py
+++ b/tests/test_workingtree.py
@@ -533,8 +533,8 @@ class TestWorkingTree(TestCaseWithSubversionRepository):
     def test_status(self):
         self.make_client('a', 'dc')
         tree = self.open_checkout("dc")
-        self.assertTrue(os.path.exists("dc/.svn"))
-        self.assertFalse(os.path.exists("dc/.bzr"))
+        self.assertTrue(os.path.exists(os.path.join("dc", ".svn")))
+        self.assertFalse(os.path.exists(os.path.join("dc", ".bzr")))
         tree.read_working_inventory()
 
     def test_update(self):
@@ -545,14 +545,14 @@ class TestWorkingTree(TestCaseWithSubversionRepository):
         self.client_commit("dc", "msg")
         tree = self.open_checkout("de")
         tree.update()
-        self.assertTrue(os.path.exists("de/.svn"))
-        self.assertTrue(os.path.exists("de/bla"))
+        self.assertTrue(os.path.exists(os.path.join("de", ".svn")))
+        self.assertTrue(os.path.exists(os.path.join("de", "bla")))
 
     def test_status_bzrdir(self):
         self.make_client('a', 'dc')
         bzrdir = self.open_checkout_bzrdir("dc")
-        self.assertTrue(os.path.exists("dc/.svn"))
-        self.assertTrue(not os.path.exists("dc/.bzr"))
+        self.assertTrue(os.path.exists(os.path.join("dc", ".svn")))
+        self.assertTrue(not os.path.exists(os.path.join("dc", ".bzr")))
         bzrdir.open_workingtree()
 
     def test_file_id_consistent(self):

diff --git a/workingtree.py b/workingtree.py
index a80a0646cf0e19665768189c384e083ef03ae17a..51ba4b778a8258cd7417b58673c35a03b692e33f 100644 (file)
--- a/workingtree.py
+++ b/workingtree.py
@@ -759,7 +759,8 @@ class SvnCheckout(BzrDir):
         raise NoRepositoryPresent(self)
 
     def find_repository(self):
-        return SvnRepository(self, self.svn_root_transport, self.remote_bzrdir.branch_path)
+        return SvnRepository(self, self.svn_root_transport, 
+                             self.remote_bzrdir.branch_path)
 
     def needs_format_conversion(self, format=None):
         if format is None: