Rev 2207: Split export_text_parents. in file:///data/jelmer/bzr-svn/mappings/
Jelmer Vernooij
jelmer at samba.org
Sat Dec 6 23:27:31 GMT 2008
At file:///data/jelmer/bzr-svn/mappings/
------------------------------------------------------------
revno: 2207
revision-id: jelmer at samba.org-20081206232728-42l98grypfo6og7s
parent: jelmer at samba.org-20081206232138-n7rfmoy4pnftyq15
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mappings
timestamp: Sun 2008-12-07 00:27:28 +0100
message:
Split export_text_parents.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
mapping4.py mapping4.py-20080827182338-y4xzpsf43vyiwcir-1
tests/mapping_implementations/test_base.py test_base.py-20080904055908-3t0g1y0qnmr6aeiq-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
=== modified file 'commit.py'
--- a/commit.py 2008-12-06 23:21:38 +0000
+++ b/commit.py 2008-12-06 23:27:28 +0000
@@ -543,7 +543,8 @@
self.mapping.export_text_revisions_revprops(text_revisions, self._svn_revprops)
self.mapping.export_text_revisions_fileprops(text_revisions, self._svnprops)
- self.mapping.export_text_parents(text_parents, self._svn_revprops, self._svnprops)
+ self.mapping.export_text_parents_revprops(text_parents, self._svn_revprops)
+ self.mapping.export_text_parents_fileprops(text_parents, self._svnprops)
self.mapping.export_fileid_map_revprops(fileids, self._svn_revprops)
self.mapping.export_fileid_map_fileprops(fileids, self._svnprops)
if self._config.get_log_strip_trailing_newline():
=== modified file 'mapping.py'
--- a/mapping.py 2008-12-06 23:21:38 +0000
+++ b/mapping.py 2008-12-06 23:27:28 +0000
@@ -470,14 +470,21 @@
"""
raise NotImplementedError(self.import_text_parents_fileprops)
- def export_text_parents(self, text_parents, revprops, fileprops):
+ def export_text_parents_revprops(self, text_parents, revprops):
"""Store a text parent map.
:param text_parents: Text parent map
:param revprops: Revision properties
+ """
+ raise NotImplementedError(self.export_text_parents_revprops)
+
+ def export_text_parents_fileprops(self, text_parents, fileprops):
+ """Store a text parent map.
+
+ :param text_parents: Text parent map
:param fileprops: File properties
"""
- raise NotImplementedError(self.export_text_parents)
+ raise NotImplementedError(self.export_text_parents_fileprops)
def export_text_revisions_revprops(self, text_revisions, revprops):
"""Store a text revisions map.
@@ -615,7 +622,10 @@
def import_text_revisions_revprops(self, svn_revprops):
return {}
- def export_text_parents(self, text_parents, svn_revprops, fileprops):
+ def export_text_parents_revprops(self, text_parents, revprops):
+ pass
+
+ def export_text_parents_fileprops(self, text_parents, fileprops):
if text_parents != {}:
fileprops[SVN_PROP_BZR_TEXT_PARENTS] = generate_text_parents_property(text_parents)
elif SVN_PROP_BZR_TEXT_PARENTS in fileprops:
@@ -747,7 +757,10 @@
return {}
return parse_text_parents_property(svn_revprops[SVN_REVPROP_BZR_TEXT_PARENTS])
- def export_text_parents(self, text_parents, svn_revprops, fileprops):
+ def export_text_parents_fileprops(self, text_parents, fileprops):
+ pass
+
+ def export_text_parents_revprops(self, text_parents, svn_revprops):
if text_parents != {}:
svn_revprops[SVN_REVPROP_BZR_TEXT_PARENTS] = generate_text_parents_property(text_parents)
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py 2008-12-06 23:21:38 +0000
+++ b/mapping3/__init__.py 2008-12-06 23:27:28 +0000
@@ -310,10 +310,11 @@
BzrSvnMappingv3.__init__(self, scheme, guessed_scheme)
self.revprop_map = mapping.BzrSvnMappingRevProps()
- def export_text_parents(self, text_parents, svn_revprops, fileprops):
- mapping.BzrSvnMappingFileProps.export_text_parents(self, text_parents, svn_revprops, fileprops)
- if svn_revprops is not None:
- self.revprop_map.export_text_parents(text_parents, svn_revprops, fileprops)
+ def export_text_parents_revprops(self, text_parents, svn_revprops):
+ self.revprop_map.export_text_parents_revprops(text_parents, svn_revprops)
+
+ def export_text_parents_fileprops(self, text_parents, fileprops):
+ mapping.BzrSvnMappingFileProps.export_text_parents_fileprops(self, text_parents, fileprops)
def export_text_revisions_revprops(self, text_revisions, svn_revprops):
self.revprop_map.export_text_revisions_revprops(text_revisions, svn_revprops)
=== modified file 'mapping4.py'
--- a/mapping4.py 2008-12-06 23:21:38 +0000
+++ b/mapping4.py 2008-12-06 23:27:28 +0000
@@ -144,11 +144,11 @@
def export_fileid_map_fileprops(self, fileids, fileprops):
self.fileprops.export_fileid_map_fileprops(fileids, fileprops)
- def export_text_parents(self, text_parents, revprops, fileprops):
- if revprops is not None:
- self.revprops.export_text_parents(text_parents, revprops, fileprops)
- else:
- self.fileprops.export_text_parents(text_parents, revprops, fileprops)
+ def export_text_parents_revprops(self, text_parents, revprops):
+ self.revprops.export_text_parents_revprops(text_parents, revprops)
+
+ def export_text_parents_fileprops(self, text_parents, fileprops):
+ self.fileprops.export_text_parents_fileprops(text_parents, fileprops)
def export_text_revisions(self, text_revisions, revprops):
self.revprops.export_text_revisions(text_revisions, revprops)
=== modified file 'tests/mapping_implementations/test_base.py'
--- a/tests/mapping_implementations/test_base.py 2008-12-06 23:21:38 +0000
+++ b/tests/mapping_implementations/test_base.py 2008-12-06 23:27:28 +0000
@@ -55,19 +55,27 @@
self.mapping.import_fileid_map_fileprops(changed_props(fileprops)))
- def test_text_parents(self):
- if not self.mapping.roundtripping:
+ def test_text_parents_fileprops(self):
+ if not self.mapping.roundtripping:
+ raise TestNotApplicable
+ if not self.mapping.can_use_fileprops:
+ raise TestNotApplicable
+ fileprops = {}
+ text_parents = {"bla": ["bloe"], "ll": ["12", "bli"]}
+ self.mapping.export_text_parents_fileprops(text_parents, fileprops)
+ self.assertEquals(text_parents,
+ self.mapping.import_text_parents_fileprops(changed_props(fileprops)))
+
+ def test_text_parents_revprops(self):
+ if not self.mapping.roundtripping:
+ raise TestNotApplicable
+ if not self.mapping.can_use_revprops:
raise TestNotApplicable
revprops = {}
- fileprops = {}
text_parents = {"bla": ["bloe"], "ll": ["12", "bli"]}
- self.mapping.export_text_parents(text_parents, revprops, fileprops)
- if self.mapping.can_use_revprops:
- self.assertEquals(text_parents,
- self.mapping.import_text_parents_revprops(revprops))
- if self.mapping.can_use_fileprops:
- self.assertEquals(text_parents,
- self.mapping.import_text_parents_fileprops(changed_props(fileprops)))
+ self.mapping.export_text_parents_revprops(text_parents, revprops)
+ self.assertEquals(text_parents,
+ self.mapping.import_text_parents_revprops(revprops))
def test_text_revisions_fileprops(self):
if not self.mapping.roundtripping:
=== modified file 'upgrade.py'
--- a/upgrade.py 2008-12-06 23:21:38 +0000
+++ b/upgrade.py 2008-12-06 23:27:28 +0000
@@ -75,7 +75,7 @@
assert bp is not None
new_mapping.export_revision(bp, rev.timestamp, rev.timezone, rev.committer, rev.properties, rev.revision_id, revno, rev.parent_ids, new_revprops, None)
new_mapping.export_fileid_map_revprops(revmeta.get_fileid_map(old_mapping), new_revprops)
- new_mapping.export_text_parents(revmeta.get_text_parents(old_mapping), new_revprops, None)
+ new_mapping.export_text_parents_revprops(revmeta.get_text_parents(old_mapping), new_revprops)
new_mapping.export_text_revisions_revprops(revmeta.get_text_revisions(old_mapping), new_revprops)
if rev.message != mapping.parse_svn_log(revprops.get(properties.PROP_REVISION_LOG)):
new_mapping.export_message(rev.message, new_revprops, None)
More information about the bazaar-commits
mailing list