Rev 2089: Skip unpacking/repacking of foreign revid tuple in import_revision. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5
Jelmer Vernooij
jelmer at samba.org
Fri Nov 28 22:46:54 GMT 2008
At http://people.samba.org/bzr/jelmer/bzr-svn/0.5
------------------------------------------------------------
revno: 2089
revision-id: jelmer at samba.org-20081128224649-jzs4r4qvotsu1xo5
parent: jelmer at samba.org-20081128221524-5407p5o5iu7m18h5
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Fri 2008-11-28 23:46:49 +0100
message:
Skip unpacking/repacking of foreign revid tuple in import_revision.
modified:
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
mapping2.py mapping.py-20080904055555-lw057kjuadn0r2ma-2
mapping4.py mapping4.py-20080827182338-y4xzpsf43vyiwcir-1
revmeta.py revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
tests/mapping_implementations/test_base.py test_base.py-20080904055908-3t0g1y0qnmr6aeiq-1
=== modified file 'mapping.py'
--- a/mapping.py 2008-11-28 17:22:45 +0000
+++ b/mapping.py 2008-11-28 22:46:49 +0000
@@ -369,7 +369,7 @@
"""
raise NotImplementedError
- def import_revision(self, revprops, fileprops, uuid, branch, revnum, rev):
+ def import_revision(self, revprops, fileprops, foreign_revid, rev):
"""Update a Revision object from Subversion revision and branch
properties.
@@ -526,7 +526,7 @@
def __init__(self, name):
self.name = name
- def import_revision(self, svn_revprops, fileprops, uuid, branch, revnum, rev):
+ def import_revision(self, svn_revprops, fileprops, foreign_revid, rev):
parse_svn_revprops(svn_revprops, rev)
if SVN_PROP_BZR_LOG in fileprops:
rev.message = fileprops[SVN_PROP_BZR_LOG][1]
@@ -645,7 +645,7 @@
class BzrSvnMappingRevProps(object):
- def import_revision(self, svn_revprops, fileprops, uuid, branch, revnum, rev):
+ def import_revision(self, svn_revprops, fileprops, foreign_revid, rev):
parse_svn_revprops(svn_revprops, rev)
parse_bzr_svn_revprops(svn_revprops, rev)
=== modified file 'mapping2.py'
--- a/mapping2.py 2008-11-24 20:30:08 +0000
+++ b/mapping2.py 2008-11-28 22:46:49 +0000
@@ -71,7 +71,7 @@
def is_tag(self, tag_path):
return False
- def import_revision(self, svn_revprops, fileprops, uuid, branch, revnum, rev):
+ def import_revision(self, svn_revprops, fileprops, (uuid, branch, revnum), rev):
parse_svn_revprops(svn_revprops, rev)
def generate_file_id(self, uuid, revnum, branch, inv_path):
=== modified file 'mapping4.py'
--- a/mapping4.py 2008-11-24 20:30:08 +0000
+++ b/mapping4.py 2008-11-28 22:46:49 +0000
@@ -147,18 +147,18 @@
else:
self.fileprops.export_text_revisions(text_revisions, revprops, fileprops)
- def import_revision(self, svn_revprops, fileprops, uuid, branch, revnum, rev):
+ def import_revision(self, svn_revprops, fileprops, foreign_revid, rev):
if svn_revprops.has_key(mapping.SVN_REVPROP_BZR_REQUIRED_FEATURES):
features = mapping.parse_required_features_property(svn_revprops[mapping.SVN_REVPROP_BZR_REQUIRED_FEATURES])
assert features.issubset(supported_features), "missing feature: %r" % features.difference(supported_features)
if svn_revprops.has_key(mapping.SVN_REVPROP_BZR_MAPPING_VERSION):
assert svn_revprops[mapping.SVN_REVPROP_BZR_MAPPING_VERSION] == self.name, "unknown mapping: %s" % svn_revprops[mapping.SVN_REVPROP_BZR_MAPPING_VERSION]
- self.revprops.import_revision(svn_revprops, fileprops, uuid, branch, revnum, rev)
+ self.revprops.import_revision(svn_revprops, fileprops, foreign_revid, rev)
else:
if fileprops.has_key(mapping.SVN_PROP_BZR_REQUIRED_FEATURES):
features = mapping.parse_required_features_property(fileprops[mapping.SVN_PROP_BZR_REQUIRED_FEATURES])
assert features.issubset(supported_features), "missing feature: %r" % features.difference(supported_features)
- self.fileprops.import_revision(svn_revprops, fileprops, uuid, branch, revnum, rev)
+ self.fileprops.import_revision(svn_revprops, fileprops, foreign_revid, rev)
def get_mandated_layout(self, repository):
return None
=== modified file 'revmeta.py'
--- a/revmeta.py 2008-11-28 22:15:24 +0000
+++ b/revmeta.py 2008-11-28 22:46:49 +0000
@@ -302,9 +302,13 @@
return estimate_svk_ancestors(self.get_fileprops())
def is_bzr_revision_revprops(self):
+ """Check if any revision properties indicate this is a bzr revision.
+ """
return is_bzr_revision_revprops(self.get_revprops())
def is_bzr_revision_fileprops(self):
+ """Check if any file properties indicate this is a bzr revision.
+ """
return is_bzr_revision_fileprops(self.get_changed_fileprops())
def is_hidden(self, mapping):
@@ -335,6 +339,7 @@
return None
def get_bzr_merges(self, mapping):
+ """Check what Bazaar revisions were merged in this revision."""
return mapping.get_rhs_parents(self.branch_path, self.get_revprops(), self.get_changed_fileprops())
def get_svk_merges(self, mapping):
@@ -372,6 +377,7 @@
return None
def get_hidden_lhs_ancestors_count(self, mapping):
+ """Get the number of hidden ancestors this revision has."""
if not mapping.supports_hidden:
return 0
count = mapping.get_hidden_lhs_ancestors_count(self.get_fileprops())
@@ -417,12 +423,13 @@
parent_ids = ()
rev = ForeignRevision(foreign_revid=self.get_foreign_revid(),
mapping=mapping,
- revision_id=self.get_revision_id(mapping), parent_ids=parent_ids)
+ revision_id=self.get_revision_id(mapping),
+ parent_ids=parent_ids)
rev.svn_meta = self
- mapping.import_revision(self.get_revprops(), self.get_changed_fileprops(), self.uuid, self.branch_path,
- self.revnum, rev)
+ mapping.import_revision(self.get_revprops(),
+ self.get_changed_fileprops(), self.get_foreign_revid(), rev)
return rev
=== modified file 'tests/mapping_implementations/test_base.py'
--- a/tests/mapping_implementations/test_base.py 2008-11-09 18:17:53 +0000
+++ b/tests/mapping_implementations/test_base.py 2008-11-28 22:46:49 +0000
@@ -82,7 +82,7 @@
except NotImplementedError:
raise TestNotApplicable
targetrev = Revision(None)
- self.mapping.import_revision(revprops, changed_props(fileprops), "someuuid", "somebp", 4, targetrev)
+ self.mapping.import_revision(revprops, changed_props(fileprops), ("someuuid", "somebp", 4), targetrev)
self.assertEquals("My Commit message", targetrev.message)
def test_revision(self):
@@ -94,7 +94,7 @@
{"arevprop": "val" }, "arevid", 4, ["parent", "merge1"], revprops, fileprops)
targetrev = Revision(None)
revprops["svn:date"] = "2008-11-03T09:33:00.716938Z"
- self.mapping.import_revision(revprops, changed_props(fileprops), "someuuid", "somebp", 4, targetrev)
+ self.mapping.import_revision(revprops, changed_props(fileprops), ("someuuid", "somebp", 4), targetrev)
self.assertEquals(targetrev.committer, "somebody")
self.assertEquals(targetrev.properties, {"arevprop": "val"})
self.assertEquals(targetrev.timestamp, 432432432.0)
@@ -127,7 +127,7 @@
rev = Revision(None)
self.mapping.import_revision({"svn:log": "A log msg",
"svn:author": "Somebody",
- "svn:date": "2008-11-03T09:33:00.716938Z"}, {}, "someuuid", "trunk", 23, rev)
+ "svn:date": "2008-11-03T09:33:00.716938Z"}, {}, ("someuuid", "trunk", 23), rev)
self.assertEquals("Somebody", rev.committer)
self.assertEquals("A log msg", rev.message)
self.assertEquals({}, rev.properties)
More information about the bazaar-commits
mailing list