Rev 1724: Avoid whitespace in file ids. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1724
revision-id: jelmer at samba.org-20080830221426-v1enpafcroqjw6mv
parent: jelmer at samba.org-20080830212608-c7x2gdooliklui0g
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-08-31 00:14:26 +0200
message:
  Avoid whitespace in file ids.
modified:
  mapping4.py                    mapping4.py-20080827182338-y4xzpsf43vyiwcir-1
  tests/test_mapping.py          test_mapping.py-20080201131338-0zd86eznn4bojtee-1
=== modified file 'mapping4.py'
--- a/mapping4.py	2008-08-30 01:11:46 +0000
+++ b/mapping4.py	2008-08-30 22:14:26 +0000
@@ -68,7 +68,7 @@
         return "svn-v4:%s:%s:%d" % (uuid, path, revnum)
 
     def generate_file_id(self, uuid, revnum, branch, inv_path):
-        return "%d@%s:%s/%s" % (revnum, uuid, branch, inv_path.encode("utf-8"))
+        return "%d@%s:%s" % (revnum, uuid, mapping.escape_svn_path("%s/%s" % (branch, inv_path.encode("utf-8"))))
 
     def is_branch(self, branch_path):
         return True

=== modified file 'tests/test_mapping.py'
--- a/tests/test_mapping.py	2008-08-30 03:07:21 +0000
+++ b/tests/test_mapping.py	2008-08-30 22:14:26 +0000
@@ -290,6 +290,9 @@
         self.assertEqual("2 at uuid:bp:mypath%2C%C2%8A",
                          self.mapping.generate_file_id("uuid", 2, "bp", u"mypath\x2c\x8a"))
 
+    def test_generate_file_id_spaces(self):
+        self.assertFalse(" " in self.mapping.generate_file_id("uuid", 1, "b p", u"my path"))
+
     def test_generate_svn_file_id(self):
         self.assertEqual("2 at uuid:bp:path", 
                 self.mapping.generate_file_id("uuid", 2, "bp", u"path"))