Merge lp:~jelmer/brz/fastimport-symlinks into lp:brz/3.0

[Jelmer Vernooij]

Fix symlink fastexporting on Python 3.

Fix symlink fastexporting on Python 3.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz-3.0/job/brz-3.0-land/78/

=== modified file 'breezy/plugins/fastimport/exporter.py'
--- breezy/plugins/fastimport/exporter.py	2019-02-04 18:52:53 +0000
+++ breezy/plugins/fastimport/exporter.py	2019-12-23 00:25:36 +0000
@@ -513,7 +513,7 @@
                 yield commands.FileModifyCommand(
                     path.encode("utf-8"),
                     helpers.kind_to_mode('symlink', False),
-                    None, tree_new.get_symlink_target(path))
+                    None, tree_new.get_symlink_target(path).encode('utf-8'))
             elif kind == 'directory':
                 if not self.plain_format:
                     yield commands.FileModifyCommand(

=== modified file 'breezy/plugins/fastimport/tests/test_commands.py'
--- breezy/plugins/fastimport/tests/test_commands.py	2018-12-16 12:49:30 +0000
+++ breezy/plugins/fastimport/tests/test_commands.py	2019-12-23 00:25:36 +0000
@@ -23,6 +23,7 @@
 import gzip
 
 from .... import tests
+from ....tests import features
 from ....tests.blackbox import ExternalBase
 
 from ..cmds import (
@@ -155,6 +156,16 @@
         self.assertEquals("", data)
         self.assertPathExists("br.fi")
 
+    def test_symlink(self):
+        tree = self.make_branch_and_tree("br")
+        self.requireFeature(features.SymlinkFeature)
+        os.symlink('symlink-target', 'br/symlink')
+        tree.add('symlink')
+        tree.commit("add a symlink")
+        data = self.run_bzr("fast-export br br.fi")[0]
+        self.assertEquals("", data)
+        self.assertPathExists("br.fi")
+
     def test_tag_rewriting(self):
         tree = self.make_branch_and_tree("br")
         tree.commit("pointless")

=== modified file 'breezy/plugins/fastimport/tests/test_generic_processor.py'
--- breezy/plugins/fastimport/tests/test_generic_processor.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/fastimport/tests/test_generic_processor.py	2019-12-23 00:25:36 +0000
@@ -39,11 +39,8 @@
         ('pack-0.92', {'branch_format': 'pack-0.92'}),
         ('1.9-rich-root', {'branch_format': '1.9-rich-root'}),
     ]
-    try:
-        from ....bzr.groupcompress_repo import RepositoryFormat2a
-        scenarios.append(('2a', {'branch_format': '2a'}))
-    except ImportError:
-        pass
+    from ....bzr.groupcompress_repo import RepositoryFormat2a
+    scenarios.append(('2a', {'branch_format': '2a'}))
     suite = loader.suiteClass()
     result = tests.multiply_tests(standard_tests, scenarios, suite)
     return result

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2019-12-01 16:47:59 +0000
+++ doc/en/release-notes/brz-3.0.txt	2019-12-23 00:25:36 +0000
@@ -32,6 +32,8 @@
 .. Fixes for situations where brz would previously crash or give incorrect
    or undesirable results.
 
+ * Fix fast-exporting of symlinks on Python 3. (Jelmer Vernooij, #1851478)
+
  * Don't rely on private transport attribute in fast-import.
    (Jelmer Vernooij, #1854607)