Rev 305: Make imports absolute to avoid conflicts. in file:///data/jelmer/bzr-svn/0.4.10-fixed/
Jelmer Vernooij
jelmer at samba.org
Fri Jul 4 15:49:10 BST 2008
At file:///data/jelmer/bzr-svn/0.4.10-fixed/
------------------------------------------------------------
revno: 305
revision-id: jelmer at samba.org-20080704144907-mutus804mvouwl7y
parent: jelmer at samba.org-20080511234946-0i5r5r4uv84q1zyr
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.10-fixed
timestamp: Fri 2008-07-04 16:49:07 +0200
message:
Make imports absolute to avoid conflicts.
modified:
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
format.py format.py-20070917005147-94kb7zysotf82kqw-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
mapping3/scheme.py scheme.py-20060516195850-95181aae6b272f9e
parents.py parents.py-20080505192113-5rcif033d6wcam9w-1
remote.py format.py-20060406233823-b6fa009fe35dfde7
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
svk.py svk.py-20080201171509-m2eg9m6jrmlbwxg5-1
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_branchprops.py test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
tests/test_checkout.py test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_config.py test_config.py-20070624193244-itvnst60evjidr4z-1
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
tests/test_errors.py test_errors.py-20070129114605-ban03f32t6ja14ez-1
tests/test_fetch.py test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
tests/test_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_revids.py test_revids.py-20070516230044-d7x872cqi7xb4eow-1
tests/test_revspec.py test_revspec.py-20071111183646-0wohlrzaevdsr9ia-1
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
tests/test_svk.py test_svk.py-20080201164711-h6p64zcglxpvygu2-1
tests/test_transport.py test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
tests/test_tree.py test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
tests/test_upgrade.py test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'Makefile'
--- a/Makefile 2008-03-29 04:10:39 +0000
+++ b/Makefile 2008-07-04 14:49:07 +0000
@@ -26,6 +26,7 @@
$(TMP_PLUGINS_DIR):
mkdir -p $@
+ touch $@/dbus.py $@/gtk.py
$(TMP_PLUGINS_DIR)/svn: $(TMP_PLUGINS_DIR)
ln -sf .. $@
=== modified file '__init__.py'
--- a/__init__.py 2008-05-11 23:49:46 +0000
+++ b/__init__.py 2008-07-04 14:49:07 +0000
@@ -25,8 +25,8 @@
from bzrlib.trace import warning, mutter
from bzrlib.transport import register_lazy_transport, register_transport_proto
-import format
-import revspec
+from bzrlib.plugins.svn import format
+from bzrlib.plugins.svn import revspec
# versions ending in 'exp' mean experimental mappings
# versions ending in 'dev' mean development version
@@ -133,8 +133,8 @@
if optimizers_registered:
return
from bzrlib.repository import InterRepository
- import commit
- import fetch
+ from bzrlib.plugins.svn import commit
+ from bzrlib.plugins.svn import fetch
optimizers_registered = True
InterRepository.register_optimiser(fetch.InterFromSvnRepository)
InterRepository.register_optimiser(commit.InterToSvnRepository)
@@ -147,7 +147,7 @@
"""
if isinstance(schemename, unicode):
schemename = schemename.encode("ascii")
- from mapping3.scheme import BranchingScheme
+ from bzrlib.plugins.svn.mapping3.scheme import BranchingScheme
from bzrlib.errors import BzrCommandError
ret = BranchingScheme.find_scheme(schemename)
@@ -181,8 +181,8 @@
from bzrlib.bzrdir import BzrDir
from bzrlib.errors import BzrCommandError, NoRepositoryPresent, NotBranchError
from bzrlib import urlutils
- from convert import convert_repository
- from repository import SvnRepository
+ from bzrlib.plugins.svn.convert import convert_repository
+ from bzrlib.plugins.svn.repository import SvnRepository
import os
if to_location is None:
@@ -194,7 +194,7 @@
standalone = False
if os.path.isfile(from_location):
- from convert import load_dumpfile
+ from bzrlib.plugins.svn.convert import load_dumpfile
import tempfile
tmp_repos = tempfile.mkdtemp(prefix='bzr-svn-dump-')
load_dumpfile(from_location, tmp_repos)
@@ -251,7 +251,7 @@
@display_command
def run(self, from_repository=None, verbose=False):
- from upgrade import upgrade_branch, upgrade_workingtree
+ from bzrlib.plugins.svn.upgrade import upgrade_branch, upgrade_workingtree
from bzrlib.branch import Branch
from bzrlib.errors import NoWorkingTree, BzrCommandError
from bzrlib.repository import Repository
@@ -373,8 +373,8 @@
from bzrlib.msgeditor import edit_commit_message
from bzrlib.repository import Repository
from bzrlib.trace import info
- from repository import SvnRepository
- from mapping3.scheme import scheme_from_branch_list
+ from bzrlib.plugins.svn.repository import SvnRepository
+ from bzrlib.plugins.svn.mapping3.scheme import scheme_from_branch_list
def scheme_str(scheme):
if scheme is None:
return ""
@@ -436,6 +436,3 @@
elif __name__ != 'bzrlib.plugins.svn':
raise ImportError('The Subversion plugin must be installed as'
' bzrlib.plugins.svn not %s' % __name__)
-else:
- import os, sys
- sys.path.append(os.path.dirname(os.path.abspath(__file__)))
=== modified file 'branch.py'
--- a/branch.py 2008-05-11 19:29:26 +0000
+++ b/branch.py 2008-07-04 14:49:07 +0000
@@ -27,12 +27,12 @@
import svn.client, svn.core
from svn.core import SubversionException
-from commit import push
-from config import BranchConfig
-from errors import NotSvnBranchPath
-from format import get_rich_root_format
-from repository import SvnRepository
-from transport import bzr_to_svn_url, create_svn_client
+from bzrlib.plugins.svn.commit import push
+from bzrlib.plugins.svn.config import BranchConfig
+from bzrlib.plugins.svn.errors import NotSvnBranchPath
+from bzrlib.plugins.svn.format import get_rich_root_format
+from bzrlib.plugins.svn.repository import SvnRepository
+from bzrlib.plugins.svn.transport import bzr_to_svn_url, create_svn_client
class FakeControlFiles(object):
=== modified file 'commit.py'
--- a/commit.py 2008-05-11 19:29:26 +0000
+++ b/commit.py 2008-07-04 14:49:07 +0000
@@ -31,12 +31,12 @@
from bzrlib.plugins.svn import util
from cStringIO import StringIO
-from errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed
-from svk import (generate_svk_feature, serialize_svk_features,
+from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed
+from bzrlib.plugins.svn.svk import (generate_svk_feature, serialize_svk_features,
parse_svk_features, SVN_PROP_SVK_MERGE)
-from logwalker import lazy_dict
+from bzrlib.plugins.svn.logwalker import lazy_dict
from bzrlib.plugins.svn.mapping import parse_revision_id
-from repository import SvnRepositoryFormat, SvnRepository
+from bzrlib.plugins.svn.repository import SvnRepositoryFormat, SvnRepository
import urllib
=== modified file 'convert.py'
--- a/convert.py 2008-05-11 19:29:26 +0000
+++ b/convert.py 2008-07-04 14:49:07 +0000
@@ -23,7 +23,7 @@
from bzrlib.revision import ensure_null
from bzrlib.transport import get_transport
-from format import get_rich_root_format
+from bzrlib.plugins.svn.format import get_rich_root_format
import svn.core, svn.repos
=== modified file 'fetch.py'
--- a/fetch.py 2008-05-11 19:29:26 +0000
+++ b/fetch.py 2008-07-04 14:49:07 +0000
@@ -29,16 +29,16 @@
import svn.core
from bzrlib.plugins.svn.errors import InvalidFileName
-from logwalker import lazy_dict
+from bzrlib.plugins.svn.logwalker import lazy_dict
from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_MERGE,
SVN_PROP_BZR_PREFIX, SVN_PROP_BZR_REVISION_INFO,
SVN_PROP_BZR_REVISION_ID,
SVN_PROP_BZR_FILEIDS, SVN_REVPROP_BZR_SIGNATURE,
parse_merge_property,
parse_revision_metadata)
-from repository import SvnRepository, SvnRepositoryFormat
-from svk import SVN_PROP_SVK_MERGE
-from tree import (apply_txdelta_handler, parse_externals_description,
+from bzrlib.plugins.svn.repository import SvnRepository, SvnRepositoryFormat
+from bzrlib.plugins.svn.svk import SVN_PROP_SVK_MERGE
+from bzrlib.plugins.svn.tree import (apply_txdelta_handler, parse_externals_description,
inventory_add_external)
=== modified file 'fileids.py'
--- a/fileids.py 2008-05-11 23:49:46 +0000
+++ b/fileids.py 2008-07-04 14:49:07 +0000
@@ -23,7 +23,7 @@
import urllib
-import changes
+from bzrlib.plugins.svn import changes
from bzrlib.plugins.svn.mapping import escape_svn_path
def get_local_changes(paths, branch, mapping, generate_revid,
=== modified file 'format.py'
--- a/format.py 2008-05-11 19:29:26 +0000
+++ b/format.py 2008-07-04 14:49:07 +0000
@@ -23,8 +23,7 @@
import os
lazy_import(globals(), """
-import errors
-import remote
+from bzrlib.plugins.svn import errors, remote
from bzrlib import errors as bzr_errors
""")
@@ -46,12 +45,12 @@
def __init__(self):
super(SvnRemoteFormat, self).__init__()
- from repository import SvnRepositoryFormat
+ from bzrlib.plugins.svn.repository import SvnRepositoryFormat
self.repository_format = SvnRepositoryFormat()
@classmethod
def probe_transport(klass, transport):
- from transport import get_svn_ra_transport
+ from bzrlib.plugins.svn.transport import get_svn_ra_transport
import svn.core
format = klass()
@@ -82,7 +81,7 @@
def initialize_on_transport(self, transport):
"""See BzrDir.initialize_on_transport()."""
- from transport import get_svn_ra_transport
+ from bzrlib.plugins.svn.transport import get_svn_ra_transport
from bzrlib.transport.local import LocalTransport
import svn.repos
@@ -110,7 +109,7 @@
def __init__(self):
super(SvnWorkingTreeDirFormat, self).__init__()
- from repository import SvnRepositoryFormat
+ from bzrlib.plugins.svn.repository import SvnRepositoryFormat
self.repository_format = SvnRepositoryFormat()
@classmethod
@@ -127,7 +126,7 @@
def _open(self, transport):
import svn.core
- from workingtree import SvnCheckout
+ from bzrlib.plugins.svn.workingtree import SvnCheckout
subr_version = svn.core.svn_subr_version()
if subr_version.major == 1 and subr_version.minor < 4:
raise errors.NoCheckoutSupport()
=== modified file 'logwalker.py'
--- a/logwalker.py 2008-05-11 23:49:46 +0000
+++ b/logwalker.py 2008-07-04 14:49:07 +0000
@@ -21,11 +21,11 @@
import bzrlib.ui as ui
from svn.core import SubversionException, Pool
-from transport import SvnRaTransport
+from bzrlib.plugins.svn.transport import SvnRaTransport
import svn.core
from cache import CacheTable
-import changes
+from bzrlib.plugins.svn import changes
LOG_CHUNK_LIMIT = 0
=== modified file 'mapping.py'
--- a/mapping.py 2008-05-11 19:29:26 +0000
+++ b/mapping.py 2008-07-04 14:49:07 +0000
@@ -21,7 +21,7 @@
from bzrlib.plugins.svn import version_info
import calendar
-import errors
+from bzrlib.plugins.svn import errors
import svn
import time
import urllib
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py 2008-05-05 18:23:23 +0000
+++ b/mapping3/__init__.py 2008-07-04 14:49:07 +0000
@@ -17,8 +17,8 @@
from bzrlib.errors import InvalidRevisionId
from bzrlib.trace import mutter
from bzrlib.plugins.svn import mapping
-from layout import RepositoryLayout
-from mapping3.scheme import (BranchingScheme, guess_scheme_from_branch_path,
+from bzrlib.plugins.svn.layout import RepositoryLayout
+from bzrlib.plugins.svn.mapping3.scheme import (BranchingScheme, guess_scheme_from_branch_path,
guess_scheme_from_history, ListBranchingScheme,
parse_list_scheme_text, NoBranchingScheme,
TrunkBranchingScheme, ListBranchingScheme)
=== modified file 'mapping3/scheme.py'
--- a/mapping3/scheme.py 2008-05-11 19:29:26 +0000
+++ b/mapping3/scheme.py 2008-07-04 14:49:07 +0000
@@ -22,8 +22,8 @@
from bzrlib.errors import NotBranchError
from base64 import urlsafe_b64decode, urlsafe_b64encode
-from errors import InvalidSvnBranchPath
-import util
+from bzrlib.plugins.svn.errors import InvalidSvnBranchPath
+from bzrlib.plugins.svn import util
import bz2
import urllib
=== modified file 'parents.py'
--- a/parents.py 2008-05-05 20:11:23 +0000
+++ b/parents.py 2008-07-04 14:49:07 +0000
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from cache import CacheTable
+from bzrlib.plugins.svn.cache import CacheTable
class SqliteCachingParentsProvider(object):
def __init__(self, actual, cachedb=None):
=== modified file 'remote.py'
--- a/remote.py 2008-05-11 23:49:46 +0000
+++ b/remote.py 2008-07-04 14:49:07 +0000
@@ -24,10 +24,10 @@
from svn.core import SubversionException
import svn.core, svn.repos
-from errors import NoSvnRepositoryPresent
-from format import get_rich_root_format, SvnRemoteFormat
-from repository import SvnRepository
-from transport import bzr_to_svn_url, get_svn_ra_transport
+from bzrlib.plugins.svn.errors import NoSvnRepositoryPresent
+from bzrlib.plugins.svn.format import get_rich_root_format, SvnRemoteFormat
+from bzrlib.plugins.svn.repository import SvnRepository
+from bzrlib.plugins.svn.transport import bzr_to_svn_url, get_svn_ra_transport
class SvnRemoteAccess(BzrDir):
=== modified file 'repository.py'
--- a/repository.py 2008-05-11 19:29:26 +0000
+++ b/repository.py 2008-07-04 14:49:07 +0000
@@ -34,23 +34,23 @@
import os
-from branchprops import PathPropertyProvider
-from cache import create_cache_dir, sqlite3
-import changes
-from changes import changes_path, find_prev_location
-from config import SvnRepositoryConfig
-from parents import SqliteCachingParentsProvider
-import errors
-import logwalker
+from bzrlib.plugins.svn.branchprops import PathPropertyProvider
+from bzrlib.plugins.svn.cache import create_cache_dir, sqlite3
+from bzrlib.plugins.svn import changes
+from bzrlib.plugins.svn.changes import changes_path, find_prev_location
+from bzrlib.plugins.svn.config import SvnRepositoryConfig
+from bzrlib.plugins.svn.parents import SqliteCachingParentsProvider
+from bzrlib.plugins.svn import errors
+from bzrlib.plugins.svn import logwalker
from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_REVISION_ID, SVN_REVPROP_BZR_SIGNATURE,
parse_revision_metadata, parse_revid_property,
parse_merge_property, BzrSvnMapping,
get_default_mapping, parse_revision_id)
from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
-from revids import CachingRevidMap, RevidMap
-from svk import (SVN_PROP_SVK_MERGE, svk_features_merged_since,
+from bzrlib.plugins.svn.revids import CachingRevidMap, RevidMap
+from bzrlib.plugins.svn.svk import (SVN_PROP_SVK_MERGE, svk_features_merged_since,
parse_svk_feature)
-from tree import SvnRevisionTree
+from bzrlib.plugins.svn.tree import SvnRevisionTree
import urllib
def full_paths(find_children, paths, bp, from_bp, from_rev):
@@ -121,7 +121,7 @@
rich_root_data = True
def __get_matchingbzrdir(self):
- from remote import SvnRemoteFormat
+ from bzrlib.plugins.svn.remote import SvnRemoteFormat
return SvnRemoteFormat()
_matchingbzrdir = property(__get_matchingbzrdir)
@@ -151,7 +151,7 @@
def __init__(self, bzrdir, transport, branch_path=None):
from bzrlib.plugins.svn import lazy_register_optimizers
lazy_register_optimizers()
- from fileids import CachingFileIdMap, simple_apply_changes, FileIdMap
+ from bzrlib.plugins.svn.fileids import CachingFileIdMap, simple_apply_changes, FileIdMap
_revision_store = None
assert isinstance(transport, Transport)
@@ -791,7 +791,7 @@
def get_commit_builder(self, branch, parents, config, timestamp=None,
timezone=None, committer=None, revprops=None,
revision_id=None):
- from commit import SvnCommitBuilder
+ from bzrlib.plugins.svn.commit import SvnCommitBuilder
return SvnCommitBuilder(self, branch, parents, config, timestamp,
timezone, committer, revprops, revision_id)
=== modified file 'revids.py'
--- a/revids.py 2008-05-11 19:28:20 +0000
+++ b/revids.py 2008-07-04 14:49:07 +0000
@@ -22,12 +22,12 @@
import svn.core
-from cache import CacheTable
-from errors import InvalidPropertyValue
+from bzrlib.plugins.svn.cache import CacheTable
+from bzrlib.plugins.svn.errors import InvalidPropertyValue
from bzrlib.plugins.svn.mapping import (parse_revision_id, BzrSvnMapping,
SVN_PROP_BZR_REVISION_ID, parse_revid_property)
from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
-from mapping3.scheme import BranchingScheme
+from bzrlib.plugins.svn.mapping3.scheme import BranchingScheme
class RevidMap(object):
def __init__(self, repos):
@@ -148,7 +148,7 @@
pass
def get_scheme(name):
- from mapping3.scheme import BranchingScheme
+ from bzrlib.plugins.svn.mapping3.scheme import BranchingScheme
assert isinstance(name, str)
return BranchingScheme.find_scheme(name)
=== modified file 'svk.py'
--- a/svk.py 2008-04-07 14:43:52 +0000
+++ b/svk.py 2008-07-04 14:49:07 +0000
@@ -15,7 +15,7 @@
"""Utility functions for dealing with SVK properties."""
-import errors
+from bzrlib.plugins.svn import errors
SVN_PROP_SVK_MERGE = 'svk:merge'
=== modified file 'tests/test_blackbox.py'
--- a/tests/test_blackbox.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_blackbox.py 2008-07-04 14:49:07 +0000
@@ -19,9 +19,9 @@
from bzrlib.tests.blackbox import ExternalBase
from bzrlib.trace import mutter
-from mapping3 import BzrSvnMappingv3FileProps
-from mapping3.scheme import NoBranchingScheme
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
+from bzrlib.plugins.svn.mapping3.scheme import NoBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
import os
=== modified file 'tests/test_branch.py'
--- a/tests/test_branch.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_branch.py 2008-07-04 14:49:07 +0000
@@ -26,12 +26,12 @@
import os
from unittest import TestCase
-from branch import FakeControlFiles, SvnBranchFormat
-from convert import load_dumpfile
-from mapping import SVN_PROP_BZR_REVISION_ID
-from mapping3 import BzrSvnMappingv3FileProps
-from mapping3.scheme import TrunkBranchingScheme
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.branch import FakeControlFiles, SvnBranchFormat
+from bzrlib.plugins.svn.convert import load_dumpfile
+from bzrlib.plugins.svn.mapping import SVN_PROP_BZR_REVISION_ID
+from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
class WorkingSubversionBranch(TestCaseWithSubversionRepository):
def test_last_rev_rev_hist(self):
=== modified file 'tests/test_branchprops.py'
--- a/tests/test_branchprops.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_branchprops.py 2008-07-04 14:49:07 +0000
@@ -18,10 +18,10 @@
from bzrlib.errors import NoSuchRevision
-from tests import TestCaseWithSubversionRepository
-from branchprops import PathPropertyProvider
-from logwalker import LogWalker, CachingLogWalker
-from transport import SvnRaTransport
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.branchprops import PathPropertyProvider
+from bzrlib.plugins.svn.logwalker import LogWalker, CachingLogWalker
+from bzrlib.plugins.svn.transport import SvnRaTransport
class TestBranchProps(TestCaseWithSubversionRepository):
def setUp(self):
=== modified file 'tests/test_checkout.py'
--- a/tests/test_checkout.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_checkout.py 2008-07-04 14:49:07 +0000
@@ -21,10 +21,10 @@
from bzrlib.errors import NoRepositoryPresent, UninitializableFormat
from bzrlib.tests import TestCase
-from convert import SvnConverter
+from bzrlib.plugins.svn.convert import SvnConverter
from bzrlib.plugins.svn.workingtree import SvnWorkingTreeFormat
from bzrlib.plugins.svn.format import SvnWorkingTreeDirFormat
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
class TestWorkingTreeFormat(TestCase):
def setUp(self):
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py 2008-05-11 23:49:46 +0000
+++ b/tests/test_commit.py 2008-07-04 14:49:07 +0000
@@ -25,12 +25,12 @@
from bzrlib.trace import mutter
from bzrlib.workingtree import WorkingTree
-from commit import set_svn_revprops, _revision_id_to_svk_feature
+from bzrlib.plugins.svn.commit import set_svn_revprops, _revision_id_to_svk_feature
from copy import copy
-from errors import RevpropChangeFailed
+from bzrlib.plugins.svn.errors import RevpropChangeFailed
import os
-from transport import SvnRaTransport
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.transport import SvnRaTransport
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
from svn.core import svn_time_to_cstring
=== modified file 'tests/test_config.py'
--- a/tests/test_config.py 2008-05-11 20:03:21 +0000
+++ b/tests/test_config.py 2008-07-04 14:49:07 +0000
@@ -17,9 +17,9 @@
"""Config tests."""
from bzrlib.branch import Branch
-from config import SvnRepositoryConfig, BranchConfig
-from mapping3.scheme import TrunkBranchingScheme
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.config import SvnRepositoryConfig, BranchConfig
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
from bzrlib.tests import TestCaseInTempDir
=== modified file 'tests/test_convert.py'
--- a/tests/test_convert.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_convert.py 2008-07-04 14:49:07 +0000
@@ -25,11 +25,11 @@
from bzrlib.trace import mutter
import os, sys
-from convert import convert_repository, NotDumpFile, load_dumpfile
-from format import get_rich_root_format
-from mapping3 import set_branching_scheme
-from mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.convert import convert_repository, NotDumpFile, load_dumpfile
+from bzrlib.plugins.svn.format import get_rich_root_format
+from bzrlib.plugins.svn.mapping3 import set_branching_scheme
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
import svn.repos
=== modified file 'tests/test_errors.py'
--- a/tests/test_errors.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_errors.py 2008-07-04 14:49:07 +0000
@@ -19,7 +19,7 @@
UnexpectedEndOfContainerError)
from bzrlib.tests import TestCase
-from errors import (convert_svn_error, convert_error, InvalidPropertyValue,
+from bzrlib.plugins.svn.errors import (convert_svn_error, convert_error, InvalidPropertyValue,
NotSvnBranchPath, InvalidSvnBranchPath,
SVN_ERR_UNKNOWN_HOSTNAME)
=== modified file 'tests/test_fetch.py'
--- a/tests/test_fetch.py 2008-05-03 03:01:28 +0000
+++ b/tests/test_fetch.py 2008-07-04 14:49:07 +0000
@@ -26,14 +26,14 @@
from bzrlib.tests import TestSkipped, KnownFailure
from bzrlib.trace import mutter
-from convert import load_dumpfile
+from bzrlib.plugins.svn.convert import load_dumpfile
from bzrlib.plugins.svn.errors import InvalidFileName
-import format
-import remote
-from mapping3 import set_branching_scheme
-from mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
-from tests import TestCaseWithSubversionRepository
-from transport import SvnRaTransport
+from bzrlib.plugins.svn import format
+from bzrlib.plugins.svn import remote
+from bzrlib.plugins.svn.mapping3 import set_branching_scheme
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.transport import SvnRaTransport
import os, sys
=== modified file 'tests/test_fileids.py'
--- a/tests/test_fileids.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_fileids.py 2008-07-04 14:49:07 +0000
@@ -21,10 +21,10 @@
from bzrlib.trace import mutter
from bzrlib.tests import TestCase
-from fileids import simple_apply_changes
-from mapping3 import BzrSvnMappingv3FileProps, set_branching_scheme
-from mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.fileids import simple_apply_changes
+from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps, set_branching_scheme
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
class MockRepo(object):
def __init__(self, mapping, uuid="uuid"):
=== modified file 'tests/test_logwalker.py'
--- a/tests/test_logwalker.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_logwalker.py 2008-07-04 14:49:07 +0000
@@ -19,10 +19,10 @@
from bzrlib.errors import NoSuchRevision
import os
-import logwalker
+from bzrlib.plugins.svn import logwalker
from bzrlib import debug
-from tests import TestCaseWithSubversionRepository
-from transport import SvnRaTransport
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.transport import SvnRaTransport
class TestLogWalker(TestCaseWithSubversionRepository):
def setUp(self):
=== modified file 'tests/test_mapping.py'
--- a/tests/test_mapping.py 2008-05-02 18:37:05 +0000
+++ b/tests/test_mapping.py 2008-07-04 14:49:07 +0000
@@ -17,14 +17,14 @@
import sha
-from errors import InvalidPropertyValue
-from mapping import (generate_revision_metadata, parse_revision_metadata,
+from bzrlib.plugins.svn.errors import InvalidPropertyValue
+from bzrlib.plugins.svn.mapping import (generate_revision_metadata, parse_revision_metadata,
parse_revid_property, parse_merge_property,
BzrSvnMappingv1, BzrSvnMappingv2,
BzrSvnMappingv4, parse_revision_id)
-from mapping3 import (BzrSvnMappingv3FileProps, BzrSvnMappingv3RevProps,
+from bzrlib.plugins.svn.mapping3 import (BzrSvnMappingv3FileProps, BzrSvnMappingv3RevProps,
BzrSvnMappingv3Hybrid)
-from mapping3.scheme import NoBranchingScheme
+from bzrlib.plugins.svn.mapping3.scheme import NoBranchingScheme
from bzrlib.errors import InvalidRevisionId
from bzrlib.tests import (TestCase, adapt_tests, TestNotApplicable)
=== modified file 'tests/test_push.py'
--- a/tests/test_push.py 2008-03-24 04:52:30 +0000
+++ b/tests/test_push.py 2008-07-04 14:49:07 +0000
@@ -29,13 +29,13 @@
from bzrlib.workingtree import WorkingTree
import os
-import format
+from bzrlib.plugins.svn import format
import svn.core
from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix
from time import sleep
-from commit import push
-from mapping import SVN_PROP_BZR_REVISION_ID
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.commit import push
+from bzrlib.plugins.svn.mapping import SVN_PROP_BZR_REVISION_ID
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
class TestPush(TestCaseWithSubversionRepository):
def setUp(self):
=== modified file 'tests/test_radir.py'
--- a/tests/test_radir.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_radir.py 2008-07-04 14:49:07 +0000
@@ -24,9 +24,9 @@
import svn
-from format import SvnRemoteFormat
-from tests import TestCaseWithSubversionRepository
-from transport import SvnRaTransport
+from bzrlib.plugins.svn.format import SvnRemoteFormat
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.transport import SvnRaTransport
class TestRemoteAccess(TestCaseWithSubversionRepository):
def test_clone(self):
=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_repos.py 2008-07-04 14:49:07 +0000
@@ -33,16 +33,16 @@
import svn.fs, svn
-import format
-from mapping import (escape_svn_path, unescape_svn_path,
+from bzrlib.plugins.svn import format
+from bzrlib.plugins.svn.mapping import (escape_svn_path, unescape_svn_path,
SVN_PROP_BZR_REVISION_ID)
-from mapping3 import (SVN_PROP_BZR_BRANCHING_SCHEME, set_branching_scheme,
+from bzrlib.plugins.svn.mapping3 import (SVN_PROP_BZR_BRANCHING_SCHEME, set_branching_scheme,
set_property_scheme)
-from mapping3.scheme import (TrunkBranchingScheme, NoBranchingScheme,
+from bzrlib.plugins.svn.mapping3.scheme import (TrunkBranchingScheme, NoBranchingScheme,
ListBranchingScheme, SingleBranchingScheme)
-from transport import SvnRaTransport
-from tests import TestCaseWithSubversionRepository
-from repository import SvnRepositoryFormat
+from bzrlib.plugins.svn.transport import SvnRaTransport
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.repository import SvnRepositoryFormat
class TestSubversionRepositoryWorks(TestCaseWithSubversionRepository):
=== modified file 'tests/test_revids.py'
--- a/tests/test_revids.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_revids.py 2008-07-04 14:49:07 +0000
@@ -18,8 +18,8 @@
from bzrlib.repository import Repository
from bzrlib.tests import TestCase
-from revids import RevisionIdMapCache
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.revids import RevisionIdMapCache
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
class TestRevidMapCache(TestCase):
def test_create(self):
=== modified file 'tests/test_revspec.py'
--- a/tests/test_revspec.py 2007-11-15 22:33:53 +0000
+++ b/tests/test_revspec.py 2008-07-04 14:49:07 +0000
@@ -23,7 +23,7 @@
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
from bzrlib.tests import TestCase
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
class TestRevSpec(TestCase):
=== modified file 'tests/test_scheme.py'
--- a/tests/test_scheme.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_scheme.py 2008-07-04 14:49:07 +0000
@@ -19,7 +19,7 @@
from bzrlib.errors import NotBranchError, BzrError
from bzrlib.tests import TestCase
-from mapping3.scheme import (ListBranchingScheme, NoBranchingScheme,
+from bzrlib.plugins.svn.mapping3.scheme import (ListBranchingScheme, NoBranchingScheme,
BranchingScheme, TrunkBranchingScheme,
SingleBranchingSchemev0,
SingleBranchingScheme,
=== modified file 'tests/test_svk.py'
--- a/tests/test_svk.py 2008-04-07 16:17:40 +0000
+++ b/tests/test_svk.py 2008-07-04 14:49:07 +0000
@@ -14,8 +14,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from bzrlib.tests import TestCase
-from svk import parse_svk_feature
-from svk import parse_svk_features
+from bzrlib.plugins.svn.svk import parse_svk_feature
+from bzrlib.plugins.svn.svk import parse_svk_features
class SvkTests(TestCase):
def test_parse_svk_feature_root(self):
=== modified file 'tests/test_transport.py'
--- a/tests/test_transport.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_transport.py 2008-07-04 14:49:07 +0000
@@ -16,10 +16,10 @@
"""Subversion transport tests."""
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
from bzrlib.errors import NotBranchError, NoSuchFile, FileExists, InvalidURL
from bzrlib import urlutils
-from transport import SvnRaTransport, bzr_to_svn_url, _url_unescape_uri
+from bzrlib.plugins.svn.transport import SvnRaTransport, bzr_to_svn_url, _url_unescape_uri
from unittest import TestCase
import os
=== modified file 'tests/test_tree.py'
--- a/tests/test_tree.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_tree.py 2008-07-04 14:49:07 +0000
@@ -22,12 +22,12 @@
from bzrlib.tests import TestCase
from bzrlib.workingtree import WorkingTree
-import errors
+from bzrlib.plugins.svn import errors
import os
-from tree import (SvnBasisTree, parse_externals_description,
+from bzrlib.plugins.svn.tree import (SvnBasisTree, parse_externals_description,
inventory_add_external)
import sys
-from tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
class TestBasisTree(TestCaseWithSubversionRepository):
def test_executable(self):
=== modified file 'tests/test_upgrade.py'
--- a/tests/test_upgrade.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_upgrade.py 2008-07-04 14:49:07 +0000
@@ -21,13 +21,13 @@
from bzrlib.repository import Repository
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
-from errors import RebaseNotPresent
-from format import get_rich_root_format
-from mapping import (BzrSvnMappingv2, BzrSvnMappingv1)
-from mapping3 import BzrSvnMappingv3FileProps
-from mapping3.scheme import TrunkBranchingScheme
-from tests import TestCaseWithSubversionRepository
-from upgrade import (upgrade_repository, upgrade_branch,
+from bzrlib.plugins.svn.errors import RebaseNotPresent
+from bzrlib.plugins.svn.format import get_rich_root_format
+from bzrlib.plugins.svn.mapping import (BzrSvnMappingv2, BzrSvnMappingv1)
+from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
+from bzrlib.plugins.svn.mapping3.scheme import TrunkBranchingScheme
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.upgrade import (upgrade_repository, upgrade_branch,
upgrade_workingtree, UpgradeChangesContent,
create_upgraded_revid, generate_upgrade_map)
=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_workingtree.py 2008-07-04 14:49:07 +0000
@@ -30,9 +30,9 @@
import os, sys
-from transport import svn_config
-from tests import TestCaseWithSubversionRepository
-from workingtree import generate_ignore_list
+from bzrlib.plugins.svn.transport import svn_config
+from bzrlib.plugins.svn.tests import TestCaseWithSubversionRepository
+from bzrlib.plugins.svn.workingtree import generate_ignore_list
class TestWorkingTree(TestCaseWithSubversionRepository):
def test_add_duplicate(self):
=== modified file 'transport.py'
--- a/transport.py 2008-05-11 23:49:46 +0000
+++ b/transport.py 2008-07-04 14:49:07 +0000
@@ -26,7 +26,7 @@
import svn.core
import svn.client
-from errors import convert_svn_error, NoSvnRepositoryPresent
+from bzrlib.plugins.svn.errors import convert_svn_error, NoSvnRepositoryPresent
import urlparse
import urllib
=== modified file 'tree.py'
--- a/tree.py 2008-05-11 19:29:26 +0000
+++ b/tree.py 2008-07-04 14:49:07 +0000
@@ -31,7 +31,7 @@
import svn.core, svn.wc, svn.delta
from svn.core import Pool
-import errors
+from bzrlib.plugins.svn import errors
def parse_externals_description(base_url, val):
"""Parse an svn:externals property value.
=== modified file 'upgrade.py'
--- a/upgrade.py 2008-05-11 19:29:26 +0000
+++ b/upgrade.py 2008-07-04 14:49:07 +0000
@@ -19,7 +19,7 @@
from bzrlib.trace import info, mutter
import bzrlib.ui as ui
-from errors import RebaseNotPresent
+from bzrlib.plugins.svn.errors import RebaseNotPresent
import itertools
from bzrlib.plugins.svn.mapping import parse_revision_id
=== modified file 'workingtree.py'
--- a/workingtree.py 2008-05-11 19:29:26 +0000
+++ b/workingtree.py 2008-07-04 14:49:07 +0000
@@ -32,20 +32,20 @@
from bzrlib.transport.local import LocalTransport
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat
-from branch import SvnBranch
-from commit import _revision_id_to_svk_feature
-from convert import SvnConverter
-from errors import LocalCommitsUnsupported, NoSvnRepositoryPresent
+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.mapping import (SVN_PROP_BZR_ANCESTRY, SVN_PROP_BZR_FILEIDS,
SVN_PROP_BZR_REVISION_ID, SVN_PROP_BZR_REVISION_INFO,
generate_revision_metadata)
-from remote import SvnRemoteAccess
-from repository import SvnRepository
-from svk import SVN_PROP_SVK_MERGE, parse_svk_features, serialize_svk_features
+from bzrlib.plugins.svn.remote import SvnRemoteAccess
+from bzrlib.plugins.svn.repository import SvnRepository
+from bzrlib.plugins.svn.svk import SVN_PROP_SVK_MERGE, parse_svk_features, serialize_svk_features
from bzrlib.plugins.svn.mapping import escape_svn_path
-from transport import (SvnRaTransport, bzr_to_svn_url, create_svn_client,
+from bzrlib.plugins.svn.transport import (SvnRaTransport, bzr_to_svn_url, create_svn_client,
svn_config)
-from tree import SvnBasisTree
+from bzrlib.plugins.svn.tree import SvnBasisTree
import os
import urllib
@@ -53,8 +53,8 @@
import svn.core, svn.wc
from svn.core import SubversionException
-from errors import NoCheckoutSupport
-from format import get_rich_root_format
+from bzrlib.plugins.svn.errors import NoCheckoutSupport
+from bzrlib.plugins.svn.format import get_rich_root_format
def generate_ignore_list(ignore_map):
"""Create a list of ignores, ordered by directory.
More information about the bazaar-commits
mailing list