Merge lp:~jelmer/brz/host-os-dereferences-symlinks into lp:brz/3.2

[Jelmer Vernooij]

Remove host_os_deferences_symlinks.

Remove host_os_deferences_symlinks.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/diff.py'
--- breezy/diff.py	2020-06-01 19:35:12 +0000
+++ breezy/diff.py	2022-01-12 23:44:34 +0000
@@ -825,7 +825,7 @@
 
     def _try_symlink_root(self, tree, prefix):
         if (getattr(tree, 'abspath', None) is None or
-                not osutils.host_os_dereferences_symlinks()):
+                not osutils.supports_symlinks(self._root)):
             return False
         try:
             os.symlink(tree.abspath(''), osutils.pathjoin(self._root, prefix))

=== modified file 'breezy/osutils.py'
--- breezy/osutils.py	2021-12-24 17:11:16 +0000
+++ breezy/osutils.py	2022-01-12 23:44:34 +0000
@@ -1166,11 +1166,6 @@
         return True
 
 
-def host_os_dereferences_symlinks():
-    return (getattr(os, 'symlink', None) is not None
-            and sys.platform not in ('cygwin', 'win32'))
-
-
 def readlink(abspath):
     """Return a string representing the path to which the symbolic link points.
 

=== modified file 'breezy/tests/test_diff.py'
--- breezy/tests/test_diff.py	2021-12-08 18:46:11 +0000
+++ breezy/tests/test_diff.py	2022-01-12 23:44:34 +0000
@@ -981,7 +981,7 @@
         self.assertContainsRe(new_path, 'tree/newname$')
         self.assertFileEqual(b'oldcontent', old_path)
         self.assertFileEqual(b'newcontent', new_path)
-        if osutils.host_os_dereferences_symlinks():
+        if osutils.supports_symlinks(self.test_dir):
             self.assertTrue(os.path.samefile('tree/newname', new_path))
         # make sure we can create files with the same parent directories
         diff_obj._prepare_files('oldname2', 'newname2')

=== modified file 'breezy/tests/test_osutils.py'
--- breezy/tests/test_osutils.py	2021-12-24 15:16:39 +0000
+++ breezy/tests/test_osutils.py	2022-01-12 23:44:34 +0000
@@ -525,9 +525,6 @@
             osutils.make_readonly('dangling')
             osutils.make_writable('dangling')
 
-    def test_host_os_dereferences_symlinks(self):
-        osutils.host_os_dereferences_symlinks()
-
 
 class TestCanonicalRelPath(tests.TestCaseInTempDir):
 

=== modified file 'breezy/transport/local.py'
--- breezy/transport/local.py	2021-12-24 14:58:11 +0000
+++ breezy/transport/local.py	2022-01-12 23:44:34 +0000
@@ -514,13 +514,23 @@
         except (IOError, OSError) as e:
             self._translate_error(e, path)
 
-    if osutils.host_os_dereferences_symlinks():
-        def readlink(self, relpath):
-            """See Transport.readlink."""
-            try:
-                return osutils.readlink(self._abspath(relpath))
-            except (IOError, OSError) as e:
-                self._translate_error(e, relpath)
+    def symlink(self, source, link_name):
+        """See Transport.symlink."""
+        abs_link_dirpath = urlutils.dirname(self.abspath(link_name))
+        source_rel = urlutils.file_relpath(
+            abs_link_dirpath, self.abspath(source))
+
+        try:
+            os.symlink(source_rel, self._abspath(link_name))
+        except (IOError, OSError) as e:
+            self._translate_error(e, source_rel)
+
+    def readlink(self, relpath):
+        """See Transport.readlink."""
+        try:
+            return osutils.readlink(self._abspath(relpath))
+        except (IOError, OSError) as e:
+            self._translate_error(e, relpath)
 
     if osutils.hardlinks_good():
         def hardlink(self, source, link_name):
@@ -530,18 +540,6 @@
             except (IOError, OSError) as e:
                 self._translate_error(e, source)
 
-    if getattr(os, 'symlink', None) is not None:
-        def symlink(self, source, link_name):
-            """See Transport.symlink."""
-            abs_link_dirpath = urlutils.dirname(self.abspath(link_name))
-            source_rel = urlutils.file_relpath(
-                abs_link_dirpath, self.abspath(source))
-
-            try:
-                os.symlink(source_rel, self._abspath(link_name))
-            except (IOError, OSError) as e:
-                self._translate_error(e, source_rel)
-
     def _can_roundtrip_unix_modebits(self):
         if sys.platform == 'win32':
             # anyone else?