Merge lp:~maxb/bzr-svn/638697 into lp:bzr-svn/1.0

[Max Bowsher]

[Max Bowsher (maxb)]

This is the essence of the fix - I have one uncertainty, which is whether I need to add .encode("utf-8") to ie.symlink_target here.

[lp:~maxb/bzr-svn/638697]

3469. By Max Bowsher on 2010-09-15

ie.symlink_target is unicode, file data should be a bytestring.

[Max Bowsher (maxb)]

> This is the essence of the fix - I have one uncertainty, which is whether I
> need to add .encode("utf-8") to ie.symlink_target here.

I do need to. Done.

[lp:~maxb/bzr-svn/638697]

3470. By Max Bowsher on 2010-09-15

Add a test.

=== modified file 'fetch.py'
--- fetch.py	2010-09-01 00:35:18 +0000
+++ fetch.py	2010-09-15 21:50:56 +0000
@@ -793,6 +793,8 @@
         return inv[file_id]
 
     def _get_chunked(self, ie):
+        if ie.kind == 'symlink':
+            return ("link ", ie.symlink_target.encode("utf-8"))
         key = (ie.file_id, ie.revision)
         file_data = self._text_cache.get(key)
         if file_data is not None:

=== modified file 'tests/test_fetch.py'
--- tests/test_fetch.py	2010-08-29 18:17:01 +0000
+++ tests/test_fetch.py	2010-09-15 21:50:56 +0000
@@ -1827,6 +1827,20 @@
                 oldrepos.generate_revision_id(2, "", mapping))
         self.assertEqual('file', inv1[inv1.path2id("mylink")].kind)
 
+        # Now test the same thing again as two separate copy_content calls, to
+        # check it also works if the symlink's "text" is not in the fetch
+        # text_cache.
+        dir2 = BzrDir.create("f2")
+        newrepos2 = dir2.create_repository()
+        self.copy_content(oldrepos, newrepos2,
+              oldrepos.generate_revision_id(1, "", mapping))
+        self.copy_content(oldrepos, newrepos2)
+        self.assertTrue(newrepos2.has_revision(
+            oldrepos.generate_revision_id(2, "", mapping)))
+        inv2 = newrepos2.get_inventory(
+                oldrepos.generate_revision_id(2, "", mapping))
+        self.assertEqual('file', inv2[inv2.path2id("mylink")].kind)
+
     def test_fetch_special_becomes_symlink(self):
         repos_url = self.make_repository('d')