Rev 2209: Fix tests. in file:///data/jelmer/bzr-svn/mappings/
Jelmer Vernooij
jelmer at samba.org
Sun Dec 7 00:32:41 GMT 2008
At file:///data/jelmer/bzr-svn/mappings/
------------------------------------------------------------
revno: 2209
revision-id: jelmer at samba.org-20081207003228-riotuhhh9jxf600f
parent: jelmer at samba.org-20081206235023-baytz92dlhl0yxxa
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mappings
timestamp: Sun 2008-12-07 01:32:28 +0100
message:
Fix tests.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
mapping4.py mapping4.py-20080827182338-y4xzpsf43vyiwcir-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
=== modified file 'commit.py'
--- a/commit.py 2008-12-06 23:50:23 +0000
+++ b/commit.py 2008-12-07 00:32:28 +0000
@@ -551,7 +551,8 @@
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)
+ self.mapping.export_message_revprops(message, self._svn_revprops)
+ self.mapping.export_message_fileprops(message, self._svnprops)
message = message.rstrip("\n")
if not self.supports_custom_revprops:
self._svn_revprops = {}
=== modified file 'mapping.py'
--- a/mapping.py 2008-12-06 23:50:23 +0000
+++ b/mapping.py 2008-12-07 00:32:28 +0000
@@ -518,8 +518,11 @@
"""
raise NotImplementedError(self.export_revision_fileprops)
- def export_message(self, log, revprops, fileprops):
- raise NotImplementedError(self.export_message)
+ def export_message_revprops(self, log, revprops):
+ raise NotImplementedError(self.export_message_revprops)
+
+ def export_message_fileprops(self, log, fileprops):
+ raise NotImplementedError(self.export_message_fileprops)
def get_revision_id_revprops(self, revprops):
raise NotImplementedError(self.get_revision_id_revprops)
@@ -700,7 +703,7 @@
old = svn_fileprops.get(SVN_PROP_BZR_REVISION_ID+self.name, "")
svn_fileprops[SVN_PROP_BZR_REVISION_ID+self.name] = old + "%d %s\n" % (revno, revision_id)
- def export_message(self, message, revprops, fileprops):
+ def export_message_fileprops(self, message, fileprops):
fileprops[SVN_PROP_BZR_LOG] = message.encode("utf-8")
def get_revision_id_revprops(self, revprops):
@@ -809,7 +812,7 @@
revno = int(revprops[SVN_REVPROP_BZR_REVNO])
return (revno, revid)
- def export_message(self, message, revprops, fileprops):
+ def export_message_revprops(self, message, revprops):
revprops[SVN_REVPROP_BZR_LOG] = message.encode("utf-8")
def export_revision_revprops(self, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, parent_ids, svn_revprops):
=== modified file 'mapping4.py'
--- a/mapping4.py 2008-12-06 23:50:23 +0000
+++ b/mapping4.py 2008-12-07 00:32:28 +0000
@@ -104,7 +104,7 @@
def get_rhs_parents_fileprops(self, fileprops):
return self.fileprops.get_rhs_parents_fileprops(fileprops)
- def get_revision_id_fileprops(self, revprops):
+ def get_revision_id_revprops(self, revprops):
return self.revprops.get_revision_id_revprops(revprops)
def get_revision_id_fileprops(self, fileprops):
@@ -128,8 +128,7 @@
def import_fileid_map_revprops(self, revprops):
return self.revprops.import_fileid_map_revprops(revprops)
- def export_revision_revprops(self, branch_root, timestamp, timezone, committer, revprops, revision_id,
- revno, parent_ids, svn_revprops, svn_fileprops):
+ def export_revision_revprops(self, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, parent_ids, svn_revprops):
self.revprops.export_revision_revprops(branch_root, timestamp, timezone, committer,
revprops, revision_id, revno, parent_ids, svn_revprops)
svn_revprops[mapping.SVN_REVPROP_BZR_MAPPING_VERSION] = self.name
@@ -149,19 +148,18 @@
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)
+ def export_text_revisions_revprops(self, text_revisions, revprops):
+ self.revprops.export_text_revisions_revprops(text_revisions, revprops)
def export_text_revisions_fileprops(self, text_revisions, fileprops):
- self.fileprops.export_text_revisions(text_revisions, fileprops)
+ self.fileprops.export_text_revisions_fileprops(text_revisions, fileprops)
def import_revision_revprops(self, svn_revprops, 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_revprops(svn_revprops, foreign_revid, rev)
+ assert svn_revprops.get(mapping.SVN_REVPROP_BZR_MAPPING_VERSION) in (None, self.name), "unknown mapping: %s" % svn_revprops[mapping.SVN_REVPROP_BZR_MAPPING_VERSION]
+ self.revprops.import_revision_revprops(svn_revprops, foreign_revid, rev)
def import_revision_fileprops(self, fileprops, foreign_revid, rev):
if fileprops.has_key(mapping.SVN_PROP_BZR_REQUIRED_FEATURES):
=== modified file 'upgrade.py'
--- a/upgrade.py 2008-12-06 23:50:23 +0000
+++ b/upgrade.py 2008-12-07 00:32:28 +0000
@@ -78,7 +78,7 @@
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)
+ new_mapping.export_message_revprops(rev.message, new_revprops)
changed_revprops = dict(ifilter(lambda (k,v): k not in revprops or revprops[k] != v, new_revprops.iteritems()))
if logcache is not None:
logcache.drop_revprops(revnum)
More information about the bazaar-commits
mailing list