Rev 1740: Fix more tests. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1740
revision-id: jelmer at samba.org-20081108205443-bljnvkxv54uoin8z
parent: jelmer at samba.org-20081108200202-kplsv702oazebfu9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-11-08 21:54:43 +0100
message:
  Fix more tests.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  tests/test_mapping.py          test_mapping.py-20080201131338-0zd86eznn4bojtee-1
  tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
=== modified file 'fetch.py'
--- a/fetch.py	2008-11-08 20:02:02 +0000
+++ b/fetch.py	2008-11-08 20:54:43 +0000
@@ -506,7 +506,9 @@
         if self._text_parents is None:
             self._text_parents = self.mapping.import_text_parents(self.revmeta.revprops,
                                                                   self.revmeta.fileprops)
-        return self._text_parents.get(path)
+        ret = self._text_parents.get(path)
+        assert ret is None or isinstance(ret, list)
+        return ret
 
 
 class FileTreeDeltaBuildEditor(FileBuildEditor):

=== modified file 'mapping.py'
--- a/mapping.py	2008-11-08 20:02:02 +0000
+++ b/mapping.py	2008-11-08 20:54:43 +0000
@@ -478,8 +478,9 @@
 def parse_text_parents_property(text):
     ret = {}
     for line in text.splitlines():
-        (entry, parent_revid) = line.split("\t", 1)
-        ret[urllib.unquote(entry)] = osutils.safe_revision_id(parent_revid)
+        parts = line.split("\t")
+        entry = parts[0]
+        ret[urllib.unquote(entry)] = filter(lambda x: x != "", [osutils.safe_revision_id(parent_revid) for parent_revid in parts[1:]])
     return ret
 
 
@@ -492,7 +493,7 @@
 
 
 def generate_text_parents_property(text_parents):
-    return "".join(["%s\t%s\n" % (urllib.quote(path.encode("utf-8")), text_parents[path]) for path in sorted(text_parents.keys())])
+    return "".join(["%s\t%s\n" % (urllib.quote(path.encode("utf-8")), "\t".join(text_parents[path])) for path in sorted(text_parents.keys())])
 
 
 def generate_text_revisions_property(text_revisions):

=== modified file 'tests/test_mapping.py'
--- a/tests/test_mapping.py	2008-11-03 02:12:28 +0000
+++ b/tests/test_mapping.py	2008-11-08 20:54:43 +0000
@@ -23,8 +23,8 @@
 
 from bzrlib.plugins.svn.errors import InvalidPropertyValue
 from bzrlib.plugins.svn.mapping import (generate_revision_metadata, parse_revision_metadata, 
-                     parse_revid_property, parse_merge_property, parse_text_parents_property,
-                     generate_text_parents_property, BzrSvnMappingv1, BzrSvnMappingv2, 
+                     parse_revid_property, parse_merge_property, parse_text_revisions_property,
+                     generate_text_revisions_property, BzrSvnMappingv1, BzrSvnMappingv2, 
                      BzrSvnMappingv4, parse_revision_id)
 from bzrlib.plugins.svn.mapping3 import (BzrSvnMappingv3FileProps, BzrSvnMappingv3RevProps, 
                       BzrSvnMappingv3Hybrid)
@@ -113,20 +113,20 @@
                 lambda: parse_revid_property("foo\nbar"))
 
 
-class ParseTextParentsTestCase(TestCase):
-    def test_text_parents(self):
-        self.assertEquals({"bla": "bloe"}, parse_text_parents_property("bla\tbloe\n"))
-
-    def test_text_parents_empty(self):
-        self.assertEquals({}, parse_text_parents_property(""))
-
-
-class GenerateTextParentsTestCase(TestCase):
+class ParseTextRevisionsTestCase(TestCase):
+    def test_text_revisions(self):
+        self.assertEquals({"bla": "bloe"}, parse_text_revisions_property("bla\tbloe\n"))
+
+    def test_text_revisions_empty(self):
+        self.assertEquals({}, parse_text_revisions_property(""))
+
+
+class GenerateTextRevisionsTestCase(TestCase):
     def test_generate_empty(self):
-        self.assertEquals("", generate_text_parents_property({}))
+        self.assertEquals("", generate_text_revisions_property({}))
 
     def test_generate_simple(self):
-        self.assertEquals("bla\tbloe\n", generate_text_parents_property({"bla": "bloe"}))
+        self.assertEquals("bla\tbloe\n", generate_text_revisions_property({"bla": "bloe"}))
 
 
 class ParseMergePropertyTestCase(TestCase):
@@ -160,15 +160,15 @@
         self.assertEquals(fileids, 
                 self.mapping.import_fileid_map(revprops, fileprops))
 
-    def test_text_parents(self):
+    def test_text_revisions(self):
         if not self.mapping.supports_roundtripping():
             raise TestNotApplicable
         revprops = {}
         fileprops = {}
-        text_parents = {"bla": "bloe", "ll": "12"}
-        self.mapping.export_text_parents(True, text_parents, revprops, fileprops)
-        self.assertEquals(text_parents,
-            self.mapping.import_text_parents(revprops, fileprops))
+        text_revisions = {"bla": "bloe", "ll": "12"}
+        self.mapping.export_text_revisions(True, text_revisions, revprops, fileprops)
+        self.assertEquals(text_revisions,
+            self.mapping.import_text_revisions(revprops, fileprops))
 
     def test_message(self):
         if not self.mapping.supports_roundtripping():

=== modified file 'tests/test_push.py'
--- a/tests/test_push.py	2008-10-10 17:09:00 +0000
+++ b/tests/test_push.py	2008-11-08 20:54:43 +0000
@@ -617,7 +617,7 @@
         wt1.branch.push(Branch.open(repos_url+"/trunk"))
         r = Repository.open(repos_url)
         props = r.branchprop_list.get_changed_properties("trunk", 3)
-        self.assertEquals(props['bzr:text-parents'], 'bar2.txt\tside1\n')
+        self.assertEquals(props['bzr:text-revisions'], 'bar2.txt\tside1\n')
 
         os.mkdir("cpy")
         cpy = BzrDir.create("cpy", format.get_rich_root_format())