Rev 2205: Split export_fileid_map. in file:///data/jelmer/bzr-svn/mappings/
Jelmer Vernooij
jelmer at samba.org
Sat Dec 6 23:15:53 GMT 2008
At file:///data/jelmer/bzr-svn/mappings/
------------------------------------------------------------
revno: 2205
revision-id: jelmer at samba.org-20081206231550-y7xfzpfxkii31ms3
parent: jelmer at samba.org-20081206230308-89imb04w3gqttyp3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mappings
timestamp: Sun 2008-12-07 00:15:50 +0100
message:
Split export_fileid_map.
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
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'commit.py'
--- a/commit.py 2008-12-06 22:16:14 +0000
+++ b/commit.py 2008-12-06 23:15:50 +0000
@@ -543,7 +543,8 @@
self.mapping.export_text_revisions(text_revisions, self._svn_revprops, self._svnprops)
self.mapping.export_text_parents(text_parents, self._svn_revprops, self._svnprops)
- self.mapping.export_fileid_map(fileids, self._svn_revprops, 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():
self.mapping.export_message(message, self._svn_revprops, self._svnprops)
message = message.rstrip("\n")
=== modified file 'mapping.py'
--- a/mapping.py 2008-12-06 22:16:14 +0000
+++ b/mapping.py 2008-12-06 23:15:50 +0000
@@ -440,14 +440,21 @@
"""
raise NotImplementedError(self.import_fileid_map_revprops)
- def export_fileid_map(self, fileids, revprops, fileprops):
+ def export_fileid_map_revprops(self, fileids, revprops):
"""Adjust the properties for a file id map.
:param fileids: Dictionary
:param revprops: Subversion revision properties
+ """
+ raise NotImplementedError(self.export_fileid_map_revprops)
+
+ def export_fileid_map_fileprops(self, fileids, fileprops):
+ """Adjust the properties for a file id map.
+
+ :param fileids: Dictionary
:param fileprops: File properties
"""
- raise NotImplementedError(self.export_fileid_map)
+ raise NotImplementedError(self.export_fileid_map_fileprops)
def import_text_parents_revprops(self, revprops):
"""Obtain a text parent map from properties.
@@ -697,13 +704,16 @@
mutter(str(e))
return (None, None)
- def export_fileid_map(self, fileids, revprops, fileprops):
+ def export_fileid_map_fileprops(self, fileids, fileprops):
if fileids != {}:
file_id_text = generate_fileid_property(fileids)
fileprops[SVN_PROP_BZR_FILEIDS] = file_id_text
elif SVN_PROP_BZR_FILEIDS in fileprops:
fileprops[SVN_PROP_BZR_FILEIDS] = ""
+ def export_fileid_map_revprops(self, fileids, revprops):
+ pass
+
class BzrSvnMappingRevProps(object):
@@ -799,10 +809,13 @@
svn_revprops[SVN_REVPROP_BZR_REVNO] = str(revno)
svn_revprops[SVN_REVPROP_BZR_USER_AGENT] = get_client_string()
- def export_fileid_map(self, fileids, revprops, fileprops):
+ def export_fileid_map_revprops(self, fileids, revprops):
if fileids != {}:
revprops[SVN_REVPROP_BZR_FILEIDS] = generate_fileid_property(fileids)
+ def export_fileid_map_fileprops(self, fileids, fileprops):
+ pass
+
def get_rhs_ancestors(self, fileprops):
raise NotImplementedError(self.get_rhs_ancestors)
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py 2008-12-05 14:18:09 +0000
+++ b/mapping3/__init__.py 2008-12-06 23:15:50 +0000
@@ -325,10 +325,11 @@
if svn_revprops is not None:
self.revprop_map.export_revision(branch_root, timestamp, timezone, committer, revprops, None, revno, parent_ids, svn_revprops, svn_fileprops)
- def export_fileid_map(self, fileids, revprops, fileprops):
- mapping.BzrSvnMappingFileProps.export_fileid_map(self, fileids, revprops, fileprops)
- if revprops is not None:
- self.revprop_map.export_fileid_map(fileids, revprops, fileprops)
+ def export_fileid_map_fileprops(self, fileids, fileprops):
+ mapping.BzrSvnMappingFileProps.export_fileid_map_fileprops(self, fileids, fileprops)
+
+ def export_fileid_map_revprops(self, fileids, revprops):
+ self.revprop_map.export_fileid_map(fileids, revprops)
def export_message(self, log, revprops, fileprops):
mapping.BzrSvnMappingFileProps.export_message(self, log, revprops, fileprops)
=== modified file 'mapping4.py'
--- a/mapping4.py 2008-12-06 23:03:08 +0000
+++ b/mapping4.py 2008-12-06 23:15:50 +0000
@@ -138,11 +138,11 @@
self.fileprops.export_revision(branch_root, timestamp, timezone, committer,
revprops, revision_id, revno, parent_ids, svn_revprops, svn_fileprops)
- def export_fileid_map(self, fileids, revprops, fileprops):
- if revprops is not None:
- self.revprops.export_fileid_map(fileids, revprops, fileprops)
- else:
- self.fileprops.export_fileid_map(fileids, revprops, fileprops)
+ def export_fileid_map_revprops(self, fileids, revprops):
+ self.revprops.export_fileid_map_revprops(fileids, revprops)
+
+ 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:
=== modified file 'tests/mapping_implementations/test_base.py'
--- a/tests/mapping_implementations/test_base.py 2008-12-06 23:03:08 +0000
+++ b/tests/mapping_implementations/test_base.py 2008-12-06 23:15:50 +0000
@@ -44,7 +44,8 @@
revprops = {}
fileprops = {}
self.mapping.export_revision("branchp", 432432432.0, 0, "somebody", {}, "arevid", 4, ["merge1"], revprops, fileprops)
- self.mapping.export_fileid_map(fileids, revprops, fileprops)
+ self.mapping.export_fileid_map_fileprops(fileids, fileprops)
+ self.mapping.export_fileid_map_revprops(fileids, revprops)
revprops["svn:date"] = "2008-11-03T09:33:00.716938Z"
if self.mapping.can_use_revprops:
self.assertEquals(fileids,
@@ -53,6 +54,7 @@
self.assertEquals(fileids,
self.mapping.import_fileid_map_fileprops(changed_props(fileprops)))
+
def test_text_parents(self):
if not self.mapping.roundtripping:
raise TestNotApplicable
=== modified file 'upgrade.py'
--- a/upgrade.py 2008-12-05 17:33:08 +0000
+++ b/upgrade.py 2008-12-06 23:15:50 +0000
@@ -74,8 +74,7 @@
revno = graph.find_distance_to_null(rev.revision_id, [])
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(revmeta.get_fileid_map(old_mapping),
- 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_revisions(revmeta.get_text_revisions(old_mapping), new_revprops, None)
if rev.message != mapping.parse_svn_log(revprops.get(properties.PROP_REVISION_LOG)):
=== modified file 'workingtree.py'
--- a/workingtree.py 2008-12-06 20:29:09 +0000
+++ b/workingtree.py 2008-12-06 23:15:50 +0000
@@ -570,7 +570,7 @@
assert isinstance(id, str)
new_entries[path] = id
fileprops = self._get_branch_props()
- self.branch.mapping.export_fileid_map(new_entries, None, fileprops)
+ self.branch.mapping.export_fileid_map_fileprops(new_entries, fileprops)
self._set_branch_props(subwc, fileprops)
if wc is None:
subwc.close()
More information about the bazaar-commits
mailing list