Rev 1074: Fix imports. in file:///data/jelmer/bzr-svn/cext/

Jelmer Vernooij jelmer at samba.org
Wed Jun 4 20:46:39 BST 2008


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

------------------------------------------------------------
revno: 1074
revision-id: jelmer at samba.org-20080604194638-00j62ks3frpi8tjz
parent: jelmer at samba.org-20080604185653-ips3nsvlqibaa6xk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Wed 2008-06-04 21:46:38 +0200
message:
  Fix imports.
modified:
  tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
  tests/test_client.py           test_client.py-20080603021344-lmgexez0yoyp9b1s-1
  tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
  tests/test_convert.py          test_convert.py-20060705203611-b1l0bapeku6foco0-1
  tests/test_core.py             test_core.py-20080603032119-q91zmret1lv84ay9-1
  tests/test_ra.py               test_ra.py-20080313141743-uzsm7ejitrlqone5-1
  tests/test_repos.py            test_repos.py-20080603030558-86ewiakm2z5y9x29-1
  tests/test_wc.py               test_wc.py-20080313142315-woibd1cdv4s2lr7o-1
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'tests/__init__.py'
--- a/tests/__init__.py	2008-06-04 15:55:45 +0000
+++ b/tests/__init__.py	2008-06-04 19:46:38 +0000
@@ -25,8 +25,7 @@
 from bzrlib.trace import mutter
 from bzrlib.workingtree import WorkingTree
 
-import constants
-import repos, wc, client, ra
+from bzrlib.plugins.svn import constants, repos, wc, client, ra
 
 class TestCaseWithSubversionRepository(TestCaseInTempDir):
     """A test case that provides the ability to build Subversion 

=== modified file 'tests/test_client.py'
--- a/tests/test_client.py	2008-06-03 03:08:32 +0000
+++ b/tests/test_client.py	2008-06-04 19:46:38 +0000
@@ -16,8 +16,8 @@
 """Subversion client library tests."""
 
 from bzrlib.tests import TestCase
-import client
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn import client
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 class TestClient(TestCaseWithSubversionRepository):
     def setUp(self):

=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py	2008-06-04 18:56:53 +0000
+++ b/tests/test_commit.py	2008-06-04 19:46:38 +0000
@@ -32,7 +32,7 @@
 from bzrlib.plugins.svn.transport import SvnRaTransport
 from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
-from core import time_to_cstring
+from bzrlib.plugins.svn.core import time_to_cstring
 
 class TestNativeCommit(TestCaseWithSubversionRepository):
     def test_simple_commit(self):

=== modified file 'tests/test_convert.py'
--- a/tests/test_convert.py	2008-06-04 18:56:53 +0000
+++ b/tests/test_convert.py	2008-06-04 19:46:38 +0000
@@ -31,7 +31,7 @@
 from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
 from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
-import repos
+from bzrlib.plugins.svn import repos
 
 class TestLoadDumpfile(TestCaseInTempDir):
     def test_loaddumpfile(self):

=== modified file 'tests/test_core.py'
--- a/tests/test_core.py	2008-06-03 03:21:20 +0000
+++ b/tests/test_core.py	2008-06-04 19:46:38 +0000
@@ -16,7 +16,7 @@
 """Subversion core library tests."""
 
 from bzrlib.tests import TestCase
-import core
+from bzrlib.plugins.svn import core
 
 class TestCore(TestCase):
     def setUp(self):

=== modified file 'tests/test_ra.py'
--- a/tests/test_ra.py	2008-06-03 05:32:05 +0000
+++ b/tests/test_ra.py	2008-06-04 19:46:38 +0000
@@ -16,8 +16,8 @@
 """Subversion ra library tests."""
 
 from bzrlib.tests import TestCase
-import ra
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn import ra
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
 
 class VersionTest(TestCase):
     def test_version_length(self):

=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py	2008-06-03 03:08:32 +0000
+++ b/tests/test_repos.py	2008-06-04 19:46:38 +0000
@@ -16,7 +16,7 @@
 """Subversion rpeository library tests."""
 
 import os
-import repos
+from bzrlib.plugins.svn import repos
 from bzrlib.tests import TestCaseInTempDir
 
 class TestClient(TestCaseInTempDir):

=== modified file 'tests/test_wc.py'
--- a/tests/test_wc.py	2008-06-02 20:23:55 +0000
+++ b/tests/test_wc.py	2008-06-04 19:46:38 +0000
@@ -16,7 +16,7 @@
 """Subversion ra library tests."""
 
 from bzrlib.tests import TestCase
-import wc
+from bzrlib.plugins.svn import wc
 
 class VersionTest(TestCase):
     def test_version_length(self):

=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py	2008-06-04 18:56:53 +0000
+++ b/tests/test_workingtree.py	2008-06-04 19:46:38 +0000
@@ -25,7 +25,7 @@
 from bzrlib.trace import mutter
 from bzrlib.workingtree import WorkingTree
 
-import core, wc
+from bzrlib.plugins.svn import core, wc
 
 import os, sys
 

=== modified file 'workingtree.py'
--- a/workingtree.py	2008-06-04 18:56:53 +0000
+++ b/workingtree.py	2008-06-04 19:46:38 +0000
@@ -35,7 +35,7 @@
 from bzrlib.plugins.svn.branch import SvnBranch
 from bzrlib.plugins.svn.commit import _revision_id_to_svk_feature
 from bzrlib.plugins.svn.convert import SvnConverter
-from bzrlib.plugins.svn.errors import LocalCommitsUnsupported, NoSvnRepositoryPresent
+from bzrlib.plugins.svn.errors import NoSvnRepositoryPresent
 from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_ANCESTRY, SVN_PROP_BZR_FILEIDS, 
                      SVN_PROP_BZR_REVISION_ID, SVN_PROP_BZR_REVISION_INFO,
                      generate_revision_metadata)




More information about the bazaar-commits mailing list