Rev 989: Fix imports. in file:///data/jelmer/bzr-svn/layout/
Jelmer Vernooij
jelmer at samba.org
Fri May 2 19:48:11 BST 2008
At file:///data/jelmer/bzr-svn/layout/
------------------------------------------------------------
revno: 989
revision-id: jelmer at samba.org-20080502184810-1xkpqfeja1f8fheu
parent: jelmer at samba.org-20080502183705-l36wz3j1zraop5ei
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: layout
timestamp: Fri 2008-05-02 20:48:10 +0200
message:
Fix imports.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'commit.py'
--- a/commit.py 2008-05-02 17:05:05 +0000
+++ b/commit.py 2008-05-02 18:48:10 +0000
@@ -35,7 +35,7 @@
from svk import (generate_svk_feature, serialize_svk_features,
parse_svk_features, SVN_PROP_SVK_MERGE)
from logwalker import lazy_dict
-from mapping import parse_revision_id
+from bzrlib.plugins.svn.mapping import parse_revision_id
from repository import SvnRepositoryFormat, SvnRepository
import urllib
=== modified file 'fetch.py'
--- a/fetch.py 2008-05-02 13:42:15 +0000
+++ b/fetch.py 2008-05-02 18:48:10 +0000
@@ -30,7 +30,7 @@
from bzrlib.plugins.svn.errors import InvalidFileName
from logwalker import lazy_dict
-from mapping import (SVN_PROP_BZR_ANCESTRY, SVN_PROP_BZR_MERGE,
+from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_ANCESTRY, SVN_PROP_BZR_MERGE,
SVN_PROP_BZR_PREFIX, SVN_PROP_BZR_REVISION_INFO,
SVN_PROP_BZR_BRANCHING_SCHEME, SVN_PROP_BZR_REVISION_ID,
SVN_PROP_BZR_FILEIDS, SVN_REVPROP_BZR_SIGNATURE,
=== modified file 'fileids.py'
--- a/fileids.py 2008-04-12 15:18:12 +0000
+++ b/fileids.py 2008-05-02 18:48:10 +0000
@@ -24,7 +24,7 @@
import urllib
import changes
-from mapping import escape_svn_path
+from bzrlib.plugins.svn.mapping import escape_svn_path
def get_local_changes(paths, branch, mapping, generate_revid,
get_children=None):
=== modified file 'mapping.py'
--- a/mapping.py 2008-05-02 18:37:05 +0000
+++ b/mapping.py 2008-05-02 18:48:10 +0000
@@ -637,8 +637,11 @@
This method must be called once and only once.
"""
- registry.Registry.register(self, 'default', self.get(key),
- self.get_help(key))
+ self._set_default_key(key)
+
+ def get_default(self):
+ """Convenience function for obtaining the default mapping to use."""
+ return self.get(self._get_default_key())
mapping_registry = BzrSvnMappingRegistry()
mapping_registry.register('v1', BzrSvnMappingv1,
@@ -672,7 +675,5 @@
mapping = mapping_registry.get(mapping_version)
return mapping.parse_revision_id(revid)
-
def get_default_mapping():
- """Convenience function for obtaining the default mapping to use."""
- return mapping_registry.get("default")
+ return mapping_registry.get_default()
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py 2008-05-02 18:37:05 +0000
+++ b/mapping3/__init__.py 2008-05-02 18:48:10 +0000
@@ -13,7 +13,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import mapping
+from bzrlib import osutils
+from bzrlib.plugins.svn import mapping
from mapping3.scheme import BranchingScheme, guess_scheme_from_branch_path
class BzrSvnMappingv3(mapping.BzrSvnMapping):
@@ -38,10 +39,11 @@
assert isinstance(branch, str)
assert isinstance(inv_path, unicode)
inv_path = inv_path.encode("utf-8")
- ret = "%d@%s:%s:%s" % (revnum, uuid, escape_svn_path(branch), escape_svn_path(inv_path))
+ ret = "%d@%s:%s:%s" % (revnum, uuid, mapping.escape_svn_path(branch),
+ mapping.escape_svn_path(inv_path))
if len(ret) > 150:
ret = "%d@%s:%s;%s" % (revnum, uuid,
- escape_svn_path(branch),
+ mapping.escape_svn_path(branch),
sha.new(inv_path).hexdigest())
assert isinstance(ret, str)
return osutils.safe_file_id(ret)
@@ -64,7 +66,7 @@
scheme = version[len(cls.revid_prefix):]
- branch_path = unescape_svn_path(branch_path)
+ branch_path = mapping.unescape_svn_path(branch_path)
return (uuid, branch_path, int(srevnum), scheme)
@@ -95,7 +97,7 @@
assert revnum > 0 or path == "", \
"Trying to generate revid for (%r,%r)" % (path, revnum)
return "%s%s:%s:%s:%d" % (cls.revid_prefix, scheme, uuid, \
- escape_svn_path(path.strip("/")), revnum)
+ mapping.escape_svn_path(path.strip("/")), revnum)
def generate_revision_id(self, uuid, revnum, path):
return self._generate_revision_id(uuid, revnum, path, self.scheme)
=== modified file 'repository.py'
--- a/repository.py 2008-05-02 18:37:05 +0000
+++ b/repository.py 2008-05-02 18:48:10 +0000
@@ -41,12 +41,12 @@
from config import SvnRepositoryConfig
import errors
import logwalker
-from mapping import (SVN_PROP_BZR_REVISION_ID, SVN_REVPROP_BZR_SIGNATURE,
+from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_REVISION_ID, SVN_REVPROP_BZR_SIGNATURE,
SVN_PROP_BZR_BRANCHING_SCHEME,
parse_revision_metadata, parse_revid_property,
parse_merge_property, BzrSvnMapping,
get_default_mapping, parse_revision_id)
-from mapping3 import BzrSvnMappingv3FileProps
+from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
from revids import CachingRevidMap, RevidMap
from mapping3.scheme import (ListBranchingScheme,
parse_list_scheme_text, guess_scheme_from_history)
=== modified file 'revids.py'
--- a/revids.py 2008-05-02 18:37:05 +0000
+++ b/revids.py 2008-05-02 18:48:10 +0000
@@ -24,9 +24,9 @@
from cache import CacheTable
from errors import InvalidPropertyValue
-from mapping import (parse_revision_id, BzrSvnMapping,
+from bzrlib.plugins.svn.mapping import (parse_revision_id, BzrSvnMapping,
SVN_PROP_BZR_REVISION_ID, parse_revid_property)
-from mapping3 import BzrSvnMappingv3FileProps
+from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
from mapping3.scheme import BranchingScheme
class RevidMap(object):
=== modified file 'upgrade.py'
--- a/upgrade.py 2008-04-12 20:06:05 +0000
+++ b/upgrade.py 2008-05-02 18:48:10 +0000
@@ -21,7 +21,7 @@
from errors import RebaseNotPresent
import itertools
-from mapping import parse_revision_id
+from bzrlib.plugins.svn.mapping import parse_revision_id
class UpgradeChangesContent(BzrError):
"""Inconsistency was found upgrading the mapping of a revision."""
=== modified file 'workingtree.py'
--- a/workingtree.py 2008-05-02 18:37:05 +0000
+++ b/workingtree.py 2008-05-02 18:48:10 +0000
@@ -36,13 +36,13 @@
from commit import _revision_id_to_svk_feature
from convert import SvnConverter
from errors import LocalCommitsUnsupported, NoSvnRepositoryPresent
-from mapping import (SVN_PROP_BZR_ANCESTRY, SVN_PROP_BZR_FILEIDS,
+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 mapping import escape_svn_path
+from bzrlib.plugins.svn.mapping import escape_svn_path
from transport import (SvnRaTransport, bzr_to_svn_url, create_svn_client,
svn_config)
from tree import SvnBasisTree
More information about the bazaar-commits
mailing list