Move properties code into subvertpy.

diff --git a/branchprops.py b/branchprops.py
index b1029796150e8f7eaa36bf8f38ed8e6a79cee4ed..7ce69daba1b509b625f53adfe609d456177a872c 100644 (file)
--- a/branchprops.py
+++ b/branchprops.py
@@ -18,8 +18,8 @@
 
 from bzrlib.errors import NoSuchRevision
 
-from bzrlib.plugins.svn import logwalker, properties
-from bzrlib.plugins.svn.subvertpy import SubversionException
+from bzrlib.plugins.svn import logwalker
+from bzrlib.plugins.svn.subvertpy import SubversionException, properties
 from bzrlib.plugins.svn.errors import ERR_FS_NO_SUCH_REVISION
 
 

diff --git a/commit.py b/commit.py
index 56935a031a87f0298e8c630d0ab10b3dd76e9d43..db625df20478d3b9c46a731765e61b6bb2553917 100644 (file)
--- a/commit.py
+++ b/commit.py
@@ -27,8 +27,8 @@ from bzrlib.trace import mutter, warning
 
 from cStringIO import StringIO
 
-from bzrlib.plugins.svn import mapping, properties
-from bzrlib.plugins.svn.subvertpy import SubversionException, delta, NODE_DIR
+from bzrlib.plugins.svn import mapping
+from bzrlib.plugins.svn.subvertpy import SubversionException, delta, NODE_DIR, properties
 from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed, ERR_FS_TXN_OUT_OF_DATE, convert_svn_error
 from bzrlib.plugins.svn.svk import (
     generate_svk_feature, serialize_svk_features, 

diff --git a/config.py b/config.py
index aebf54b0f888b220219675772a1a9c9165f3b5b3..b7c920c0b1c08125d735d52d0cda76476a414490 100644 (file)
--- a/config.py
+++ b/config.py
@@ -20,8 +20,7 @@ from bzrlib.config import IniBasedConfig, config_dir, ensure_config_dir_exists,
 
 import os
 
-from bzrlib.plugins.svn import properties
-from bzrlib.plugins.svn.subvertpy import SubversionException
+from bzrlib.plugins.svn.subvertpy import SubversionException, properties
 
 # Settings are stored by UUID. 
 # Data stored includes default branching scheme and locations the repository 

diff --git a/fetch.py b/fetch.py
index 8c75a55d771b0410f577ef7b0ffd19237257c067..87d1938752a99cb1dc3e06bb14aaa777593cbfa3 100644 (file)
--- a/fetch.py
+++ b/fetch.py
@@ -25,8 +25,8 @@ from bzrlib.trace import mutter
 from cStringIO import StringIO
 import md5
 
-from bzrlib.plugins.svn import properties
-from bzrlib.plugins.svn.subvertpy import delta
+from bzrlib.plugins.svn.subvertpy import properties
+from bzrlib.plugins.svn.subvertpy.delta import apply_txdelta_handler
 from bzrlib.plugins.svn.errors import InvalidFileName
 from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_PREFIX)
 from bzrlib.plugins.svn.repository import SvnRepository, SvnRepositoryFormat
@@ -331,7 +331,7 @@ class FileRevisionBuildEditor(FileBuildEditor):
             "base checksum mismatch: %r != %r" % (base_checksum, 
                                                   actual_checksum))
         self.file_stream = StringIO()
-        return delta.apply_txdelta_handler(self.file_data, self.file_stream)
+        return apply_txdelta_handler(self.file_data, self.file_stream)
 
     def _close(self, checksum=None):
         if self.file_stream is not None:

diff --git a/mapping.py b/mapping.py
index c4667a97d767246bd242db23be6fb07338d62a2e..84e3c47f2eb0dcda6839b68eea79652cda615eee 100644 (file)
--- a/mapping.py
+++ b/mapping.py
@@ -20,7 +20,8 @@ from bzrlib.errors import InvalidRevisionId
 from bzrlib.revision import NULL_REVISION
 from bzrlib.trace import mutter
 
-from bzrlib.plugins.svn import errors, foreign, properties, version_info
+from bzrlib.plugins.svn import errors, foreign, version_info
+from bzrlib.plugins.svn.subvertpy import properties
 import calendar
 import time
 import urllib

diff --git a/mapping3/__init__.py b/mapping3/__init__.py
index a37303f8d60701b5ae9b40e2f3c94906db63f39e..b4d86604fc021c2186ab437938671f6ff5d908c2 100644 (file)
--- a/mapping3/__init__.py
+++ b/mapping3/__init__.py
@@ -17,7 +17,8 @@ from bzrlib import osutils, ui
 from bzrlib.errors import InvalidRevisionId
 from bzrlib.trace import mutter
 
-from bzrlib.plugins.svn import errors, mapping, properties
+from bzrlib.plugins.svn import errors, mapping
+from bzrlib.plugins.svn.subvertpy import properties
 from bzrlib.plugins.svn.layout.guess import GUESS_SAMPLE_SIZE
 from bzrlib.plugins.svn.layout import RepositoryLayout, get_root_paths
 from bzrlib.plugins.svn.mapping3.scheme import (BranchingScheme, guess_scheme_from_branch_path, 

diff --git a/mapping3/scheme.py b/mapping3/scheme.py
index 751f47bcf69a39bd3beb49da62df6e9da54b844b..4205143bd7d12fcd85b6b171c9017fbb5b1ffd7d 100644 (file)
--- a/mapping3/scheme.py
+++ b/mapping3/scheme.py
@@ -23,7 +23,7 @@ from base64 import urlsafe_b64decode, urlsafe_b64encode
 from bzrlib.plugins.svn.layout.guess import find_commit_paths
 from bzrlib.plugins.svn.layout.standard import TrunkLayout, RootLayout, CustomLayout
 from bzrlib.plugins.svn.errors import LayoutUnusable
-from bzrlib.plugins.svn import properties
+from bzrlib.plugins.svn.subvertpy import properties
 import bz2
 
 import urllib

diff --git a/repository.py b/repository.py
index 73ea83a08d2606ffa6b705596609b8a7bc0e5755..7e00724ba329d451499b607a4ab42edb3897bf65 100644 (file)
--- a/repository.py
+++ b/repository.py
@@ -32,10 +32,10 @@ from copy import copy
 from itertools import chain
 import os
 
-from bzrlib.plugins.svn import cache, changes, subvertpy, errors, layout, logwalker, properties, revmeta
+from bzrlib.plugins.svn import cache, changes, subvertpy, errors, layout, logwalker, revmeta
 from bzrlib.plugins.svn.branchprops import PathPropertyProvider
 from bzrlib.plugins.svn.config import SvnRepositoryConfig
-from bzrlib.plugins.svn.subvertpy import SubversionException
+from bzrlib.plugins.svn.subvertpy import SubversionException, properties
 from bzrlib.plugins.svn.layout.standard import WildcardLayout
 from bzrlib.plugins.svn.layout.guess import repository_guess_layout
 from bzrlib.plugins.svn.mapping import (SVN_REVPROP_BZR_SIGNATURE,

diff --git a/revmeta.py b/revmeta.py
index 68441a5c4c50195106e0851dbe6150fe56028b03..9624b2b7934cb3047b4591b78619afa56dd60e84 100644 (file)
--- a/revmeta.py
+++ b/revmeta.py
@@ -16,7 +16,8 @@
 from bzrlib import errors, ui
 from bzrlib.revision import NULL_REVISION, Revision
 
-from bzrlib.plugins.svn import changes, errors as svn_errors, logwalker, properties
+from bzrlib.plugins.svn import changes, errors as svn_errors, logwalker
+from bzrlib.plugins.svn.subvertpy import properties
 from bzrlib.plugins.svn.mapping import is_bzr_revision_fileprops, is_bzr_revision_revprops, estimate_bzr_ancestors, SVN_REVPROP_BZR_SIGNATURE, get_roundtrip_ancestor_revids
 from bzrlib.plugins.svn.svk import (SVN_PROP_SVK_MERGE, svk_features_merged_since, 
                  parse_svk_feature, estimate_svk_ancestors)

diff --git a/properties.py b/subvertpy/properties.py
similarity index 98%
rename from properties.py
rename to subvertpy/properties.py
index 86cafcf69bdf99a4bfcb0705e16a9657f653e474..fcc20caf733cf0bcc59585810d5600350a2f270d 100644 (file)
--- a/properties.py
+++ b/subvertpy/properties.py
@@ -15,10 +15,9 @@
 
 import bisect
 from bzrlib import urlutils
-from bzrlib.errors import BzrError
 
 
-class InvalidExternalsDescription(BzrError):
+class InvalidExternalsDescription(Exception):
     _fmt = """Unable to parse externals description."""
 
 
@@ -30,6 +29,7 @@ def is_valid_property_name(prop):
             return False
     return True
 
+
 def time_to_cstring(timestamp):
     import time
     tm_usec = timestamp % 1000000
@@ -37,6 +37,7 @@ def time_to_cstring(timestamp):
             tm_sec, tm_wday, tm_yday, tm_isdst) = time.gmtime(timestamp / 1000000)
     return "%04d-%02d-%02dT%02d:%02d:%02d.%06dZ" % (tm_year, tm_mon, tm_mday, tm_hour, tm_min, tm_sec, tm_usec)
 
+
 def time_from_cstring(text):
     import time
     (basestr, usecstr) = text.split(".", 1)
@@ -99,7 +100,7 @@ def parse_externals_description(base_url, val):
             raise NotImplementedError("Relative to the scheme externals not yet supported")
         if relurl.startswith("^/"):
             raise NotImplementedError("Relative to the repository root externals not yet supported")
-        ret[path] = (revno, urlutils.join(base_url, relurl))
+        ret[path] = (revno, "%s/%s" % (base_url, relurl))
     return ret
 
 

diff --git a/tags.py b/tags.py
index 7a670f2209fa1f576cb45b10ef15b39aca771813..5ef52225f98900feee12bce629c5a2ec1b852659 100644 (file)
--- a/tags.py
+++ b/tags.py
@@ -18,7 +18,8 @@ from bzrlib.errors import NoSuchRevision, NoSuchTag
 from bzrlib.tag import BasicTags
 from bzrlib.trace import mutter
 
-from bzrlib.plugins.svn import commit, subvertpy, errors as svn_errors, mapping, properties
+from bzrlib.plugins.svn import commit, subvertpy, errors as svn_errors, mapping
+from bzrlib.plugins.svn.subvertpy import properties
 
 class SubversionTags(BasicTags):
     """Subversion tags object."""

diff --git a/tests/__init__.py b/tests/__init__.py
index 543abecd29225718f7f2ccde9fb6bf5a35af70b5..12248927b680440a1cdda6e5e80431f89a2e251e 100644 (file)
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -28,8 +28,8 @@ from bzrlib.tests import TestCaseInTempDir
 from bzrlib.trace import mutter
 from bzrlib.workingtree import WorkingTree
 
-from bzrlib.plugins.svn import cache, properties
-from bzrlib.plugins.svn.subvertpy import delta, ra, repos, delta, client
+from bzrlib.plugins.svn import cache
+from bzrlib.plugins.svn.subvertpy import delta, ra, repos, delta, client, properties
 from bzrlib.plugins.svn.subvertpy.ra import Auth, RemoteAccess
 
 class TestFileEditor(object):

diff --git a/tests/test_commit.py b/tests/test_commit.py
index 34c6cf417d2cfa21dd20f066de887e34db895323..da45477e299ef691ac7e27430ca4271c361fa072 100644 (file)
--- a/tests/test_commit.py
+++ b/tests/test_commit.py
@@ -32,7 +32,7 @@ import os
 from bzrlib.plugins.svn.subvertpy import ra
 from bzrlib.plugins.svn.commit import set_svn_revprops, _revision_id_to_svk_feature
 from bzrlib.plugins.svn.errors import RevpropChangeFailed
-from bzrlib.plugins.svn.properties import time_to_cstring
+from bzrlib.plugins.svn.subvertpy.properties import time_to_cstring
 from bzrlib.plugins.svn.transport import SvnRaTransport
 from bzrlib.plugins.svn.tests import SubversionTestCase
 

diff --git a/tests/test_properties.py b/tests/test_properties.py
index 27530cc789f0ddfc48de6ae7f2707b4db886dbb4..b984582e92227a4ecf34c44f8b6c0c72d1f91404 100644 (file)
--- a/tests/test_properties.py
+++ b/tests/test_properties.py
@@ -16,7 +16,7 @@
 """Subversion core library tests."""
 
 from bzrlib.tests import TestCase
-from bzrlib.plugins.svn import properties
+from bzrlib.plugins.svn.subvertpy import properties
 
 class TestProperties(TestCase):
     def setUp(self):

diff --git a/tree.py b/tree.py
index b3ea8a0bfe4bf8ab25b278cb87cf3701e69ca22b..d6e2ba4c9446e0e1347659e1fb0615f17fd93897 100644 (file)
--- a/tree.py
+++ b/tree.py
@@ -27,8 +27,7 @@ import md5
 from cStringIO import StringIO
 import urllib
 
-from bzrlib.plugins.svn import properties
-from bzrlib.plugins.svn.subvertpy import delta, wc, NODE_DIR
+from bzrlib.plugins.svn.subvertpy import delta, wc, NODE_DIR, properties
 
 
 def inventory_add_external(inv, parent_id, path, revid, ref_revnum, url):

diff --git a/upgrade.py b/upgrade.py
index 9ac353d21a8390334f6994c6d54355b39a31d7b0..1c9444938003c89d6b2f42d687002ce3087d29dd 100644 (file)
--- a/upgrade.py
+++ b/upgrade.py
@@ -30,7 +30,8 @@ def set_revprops(repository, new_mapping, from_revnum=0, to_revnum=None):
     :param repository: Subversion Repository object.
     :param new_mapping: Mapping to upgrade to
     """
-    from bzrlib.plugins.svn import changes, logwalker, mapping, properties
+    from bzrlib.plugins.svn import changes, logwalker, mapping
+    from bzrlib.plugins.svn.subvertpy import properties
     if to_revnum is None:
         to_revnum = repository.get_latest_revnum()
     graph = repository.get_graph()

diff --git a/workingtree.py b/workingtree.py
index e3dde258ffeb63067a61a298b6b80079bf5f7a29..27ed310255311611b4fb778b16104cb36de0b82a 100644 (file)
--- a/workingtree.py
+++ b/workingtree.py
@@ -30,7 +30,8 @@ from bzrlib.trace import mutter
 from bzrlib.transport import get_transport
 from bzrlib.workingtree import WorkingTree, WorkingTreeFormat
 
-from bzrlib.plugins.svn import subvertpy, properties
+from bzrlib.plugins.svn import subvertpy
+from bzrlib.plugins.svn.subvertpy import properties
 from bzrlib.plugins.svn.subvertpy.wc import *
 from bzrlib.plugins.svn.auth import create_auth_baton
 from bzrlib.plugins.svn.branch import SvnBranch