Rev 1797: Use vcs mapping member names consistent with bzr-foreign. in file:///data/jelmer/bzr-svn/trunk/
Jelmer Vernooij
jelmer at samba.org
Thu Sep 4 08:58:38 BST 2008
At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1797
revision-id: jelmer at samba.org-20080904075837-djng68pxhr1zd163
parent: jelmer at samba.org-20080904074754-q8wtl5hfkpfp8cwe
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2008-09-04 09:58:37 +0200
message:
Use vcs mapping member names consistent with bzr-foreign.
modified:
log.py log.py-20080707143400-mxzjdllay5jhvnq1-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
mapping2.py mapping.py-20080904055555-lw057kjuadn0r2ma-2
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
mapping4.py mapping4.py-20080827182338-y4xzpsf43vyiwcir-1
revmeta.py revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
tests/mapping3/__init__.py __init__.py-20080831152358-oy04n53cpnh64aj6-1
tests/mapping_implementations/test_base.py test_base.py-20080904055908-3t0g1y0qnmr6aeiq-1
tests/mapping_implementations/test_repository.py test_repository.py-20080902013845-ity7d1ymye69sobm-2
=== modified file 'log.py'
--- a/log.py 2008-08-29 16:19:47 +0000
+++ b/log.py 2008-09-04 07:58:37 +0000
@@ -18,6 +18,10 @@
from bzrlib.plugins.svn import mapping
def show_subversion_properties(rev):
+ """Custom log displayer for Subversion revisions.
+
+ :param rev: Revision object.
+ """
data = None
ret = {}
if getattr(rev, "svn_meta", None) is not None:
=== modified file 'mapping.py'
--- a/mapping.py 2008-09-04 07:01:24 +0000
+++ b/mapping.py 2008-09-04 07:58:37 +0000
@@ -282,6 +282,7 @@
"""Class that maps between Subversion and Bazaar semantics."""
experimental = False
_warned_experimental = False
+ roundtripping = False
def __init__(self):
if (version_info[3] == 'exp' or self.experimental) and not BzrSvnMapping._warned_experimental:
@@ -298,12 +299,6 @@
raise NotImplementedError
@classmethod
- def supports_roundtripping(cls):
- """Whether this mapping supports roundtripping.
- """
- return False
-
- @classmethod
def supports_custom_revprops(cls):
"""Whether this mapping will primarily use custom revision properties."""
return False
=== modified file 'mapping2.py'
--- a/mapping2.py 2008-09-04 07:01:24 +0000
+++ b/mapping2.py 2008-09-04 07:58:37 +0000
@@ -28,6 +28,7 @@
as part of a merge.
"""
name = "v1"
+ roundtripping = False
def __init__(self, layout=None):
super(BzrSvnMappingv1, self).__init__()
@@ -104,6 +105,7 @@
as part of a merge.
"""
name = "v2"
+ roundtripping = False
@classmethod
def revision_id_bzr_to_foreign(cls, revid):
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py 2008-09-04 06:14:53 +0000
+++ b/mapping3/__init__.py 2008-09-04 07:58:37 +0000
@@ -159,6 +159,7 @@
experimental = False
upgrade_suffix = "-svn3"
revid_prefix = "svn-v3-"
+ roundtripping = True
def __init__(self, scheme, guessed_scheme=None):
mapping.BzrSvnMapping.__init__(self)
@@ -215,10 +216,6 @@
assert isinstance(ret, str)
return osutils.safe_file_id(ret)
- @staticmethod
- def supports_roundtripping():
- return True
-
@classmethod
def _parse_revision_id(cls, revid):
assert isinstance(revid, str)
=== modified file 'mapping4.py'
--- a/mapping4.py 2008-08-31 14:14:47 +0000
+++ b/mapping4.py 2008-09-04 07:58:37 +0000
@@ -30,6 +30,7 @@
revid_prefix = "svn-v4"
upgrade_suffix = "-svn4"
experimental = True
+ roundtripping = True
def __init__(self, layout=None):
self.name = "v4"
@@ -44,10 +45,6 @@
else:
return cls(layout.TrunkLayout(repository))
- @staticmethod
- def supports_roundtripping():
- return True
-
@classmethod
def from_revprops(cls, revprops):
return cls()
=== modified file 'revmeta.py'
--- a/revmeta.py 2008-09-04 05:49:51 +0000
+++ b/revmeta.py 2008-09-04 07:58:37 +0000
@@ -63,7 +63,7 @@
return self._paths
def get_revision_id(self, mapping):
- if mapping.supports_roundtripping():
+ if mapping.roundtripping:
# See if there is a bzr:revision-id revprop set
try:
(bzr_revno, revid) = mapping.get_revision_id(self.branch_path, self.get_revprops(), self.get_changed_fileprops())
=== modified file 'tests/mapping3/__init__.py'
--- a/tests/mapping3/__init__.py 2008-09-04 07:47:54 +0000
+++ b/tests/mapping3/__init__.py 2008-09-04 07:58:37 +0000
@@ -110,7 +110,7 @@
repos = Repository.open(repos_url)
mapping = repos.get_mapping()
- if not mapping.supports_roundtripping():
+ if not mapping.roundtripping:
raise TestNotApplicable()
revid = repos.generate_revision_id(1, "", mapping)
self.assertEquals("someid", revid)
@@ -124,7 +124,7 @@
repos = Repository.open(repos_url)
mapping = repos.get_mapping()
- if not mapping.supports_roundtripping():
+ if not mapping.roundtripping:
raise TestNotApplicable()
revid = repos.generate_revision_id(1, "", mapping)
self.assertEquals(
@@ -170,7 +170,7 @@
(num, date, author) = self.client_commit("dc", "Second Message")
repository = Repository.open(repos_url)
mapping = repository.get_mapping()
- if not mapping.supports_roundtripping():
+ if not mapping.roundtripping:
raise TestNotApplicable
revid = mapping.revision_id_foreign_to_bzr((repository.uuid, 2, ""))
rev = repository.get_revision("myrevid")
=== modified file 'tests/mapping_implementations/test_base.py'
--- a/tests/mapping_implementations/test_base.py 2008-09-04 06:14:53 +0000
+++ b/tests/mapping_implementations/test_base.py 2008-09-04 07:58:37 +0000
@@ -34,7 +34,7 @@
self.assertEquals(mapping, self.mapping)
def test_fileid_map(self):
- if not self.mapping.supports_roundtripping():
+ if not self.mapping.roundtripping:
raise TestNotApplicable
fileids = {"": "some-id", "bla/blie": "other-id"}
revprops = {}
@@ -46,7 +46,7 @@
self.mapping.import_fileid_map(revprops, fileprops))
def test_text_parents(self):
- if not self.mapping.supports_roundtripping():
+ if not self.mapping.roundtripping:
raise TestNotApplicable
revprops = {}
fileprops = {}
@@ -56,7 +56,7 @@
self.mapping.import_text_parents(revprops, fileprops))
def test_message(self):
- if not self.mapping.supports_roundtripping():
+ if not self.mapping.roundtripping:
raise TestNotApplicable
revprops = {}
fileprops = {}
@@ -72,7 +72,7 @@
self.assertEquals("My Commit message", targetrev.message)
def test_revision(self):
- if not self.mapping.supports_roundtripping():
+ if not self.mapping.roundtripping:
raise TestNotApplicable
revprops = {}
fileprops = {}
@@ -87,7 +87,7 @@
self.assertEquals(targetrev.timezone, 0)
def test_revision_id(self):
- if not self.mapping.supports_roundtripping():
+ if not self.mapping.roundtripping:
raise TestNotApplicable
revprops = {}
fileprops = {}
@@ -95,7 +95,7 @@
self.assertEquals((4, "arevid"), self.mapping.get_revision_id("branchp", revprops, fileprops))
def test_revision_id_none(self):
- if not self.mapping.supports_roundtripping():
+ if not self.mapping.roundtripping:
raise TestNotApplicable
self.assertEquals((None, None), self.mapping.get_revision_id("bp", {}, dict()))
=== modified file 'tests/mapping_implementations/test_repository.py'
--- a/tests/mapping_implementations/test_repository.py 2008-09-04 07:47:54 +0000
+++ b/tests/mapping_implementations/test_repository.py 2008-09-04 07:58:37 +0000
@@ -84,8 +84,6 @@
repos_url = self.make_repository("a")
repos = Repository.open(repos_url)
mapping = repos.get_mapping()
- if not mapping.supports_roundtripping():
- raise TestNotApplicable()
self.assertEqual({u"": (mapping.generate_file_id(repos.uuid, 0, "", u""), mapping.revision_id_foreign_to_bzr((repos.uuid, 0, "")))}, repos.get_fileid_map(0, "", mapping))
def test_add_revision(self):
More information about the bazaar-commits
mailing list