Merge lp:~jelmer/brz/memorytransport-links into lp:brz

[Jelmer Vernooij]

Support symlinks in MemoryTransport, and add tests for Transport.readlink.

Support symlinks in MemoryTransport, and add tests for Transport.readlink.

[Martin Packman (gz)]

All looks sensible to me, see one inline note about assertion.

review: Approve

=== modified file 'breezy/tests/per_transport.py'
--- breezy/tests/per_transport.py	2018-08-04 18:44:34 +0000
+++ breezy/tests/per_transport.py	2018-09-21 22:47:54 +0000
@@ -1021,6 +1021,16 @@
             raise TestSkipped("Transport %s does not support symlinks." %
                               self._server.__class__)
 
+        self.assertEqual(source_name, t.readlink(link_name))
+
+    def test_readlink_nonexistent(self):
+        t = self.get_transport()
+        try:
+            self.assertRaises(NoSuchFile, t.readlink, 'nonexistent')
+        except TransportNotPossible:
+            raise TestSkipped("Transport %s does not support symlinks." %
+                              self._server.__class__)
+
     def test_list_dir(self):
         # TODO: Test list_dir, just try once, and if it throws, stop testing
         t = self.get_transport()
 
=== modified file 'breezy/tests/stub_sftp.py'
--- breezy/tests/stub_sftp.py	2018-08-04 18:44:34 +0000
+++ breezy/tests/stub_sftp.py	2018-09-21 22:47:54 +0000
@@ -224,6 +224,14 @@
             return paramiko.SFTPServer.convert_errno(e.errno)
         return paramiko.SFTP_OK
 
+    def readlink(self, path):
+        path = self._realpath(path)
+        try:
+            target_path = os.readlink(path)
+        except OSError as e:
+            return paramiko.SFTPServer.convert_errno(e.errno)
+        return target_path
+
     def mkdir(self, path, attr):
         path = self._realpath(path)
         try:
@@ -248,7 +256,7 @@
             return paramiko.SFTPServer.convert_errno(e.errno)
         return paramiko.SFTP_OK
 
-    # removed: chattr, symlink, readlink
+    # removed: chattr
     # (nothing in bzr's sftp transport uses those)
 
 
 
=== modified file 'breezy/transport/local.py'
--- breezy/transport/local.py	2017-11-19 18:55:26 +0000
+++ breezy/transport/local.py	2018-09-21 22:47:54 +0000
@@ -519,7 +519,10 @@
     if osutils.host_os_dereferences_symlinks():
         def readlink(self, relpath):
             """See Transport.readlink."""
-            return osutils.readlink(self._abspath(relpath))
+            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):
 
=== modified file 'breezy/transport/memory.py'
--- breezy/transport/memory.py	2018-06-30 17:27:13 +0000
+++ breezy/transport/memory.py	2018-09-21 22:47:54 +0000
@@ -28,7 +28,7 @@
     )
 import os
 import errno
-from stat import S_IFREG, S_IFDIR
+from stat import S_IFREG, S_IFDIR, S_IFLNK
 
 from .. import (
     transport,
@@ -39,6 +39,7 @@
     LockError,
     InProcessTransport,
     NoSuchFile,
+    TransportNotPossible,
     )
 from ..transport import (
     AppendBasedFileStream,
@@ -50,16 +51,20 @@
 
 class MemoryStat(object):
 
-    def __init__(self, size, is_dir, perms):
+    def __init__(self, size, kind, perms):
         self.st_size = size
-        if not is_dir:
+        if kind == 'file':
             if perms is None:
                 perms = 0o644
             self.st_mode = S_IFREG | perms
-        else:
+        elif kind == 'directory':
             if perms is None:
                 perms = 0o755
             self.st_mode = S_IFDIR | perms
+        elif kind == 'symlink':
+            self.st_mode = S_IFLNK | 0o644
+        else:
+            raise AssertionError('unknown kind %r' % kind)
 
 
 class MemoryTransport(transport.Transport):
@@ -77,6 +82,7 @@
         self._cwd = url[split:]
         # dictionaries from absolute path to file mode
         self._dirs = {'/':None}
+        self._symlinks = {}
         self._files = {}
         self._locks = {}
 
@@ -88,6 +94,7 @@
         url = self._scheme + path
         result = self.__class__(url)
         result._dirs = self._dirs
+        result._symlinks = self._symlinks
         result._files = self._files
         result._locks = self._locks
         return result
@@ -122,7 +129,9 @@
     def has(self, relpath):
         """See Transport.has()."""
         _abspath = self._abspath(relpath)
-        return (_abspath in self._files) or (_abspath in self._dirs)
+        return ((_abspath in self._files) or
+                (_abspath in self._dirs) or
+                (_abspath in self._symlinks))
 
     def delete(self, relpath):
         """See Transport.delete()."""
@@ -254,10 +263,12 @@
         """See Transport.stat()."""
         _abspath = self._abspath(relpath)
         if _abspath in self._files:
-            return MemoryStat(len(self._files[_abspath][0]), False,
+            return MemoryStat(len(self._files[_abspath][0]), 'file',
                               self._files[_abspath][1])
         elif _abspath in self._dirs:
-            return MemoryStat(0, True, self._dirs[_abspath])
+            return MemoryStat(0, 'directory', self._dirs[_abspath])
+        elif _abspath in self._symlinks:
+            return MemoryStat(0, 'symlink', 0)
         else:
             raise NoSuchFile(_abspath)
 
@@ -287,8 +298,22 @@
                 pass
             else:
                 r.append(i)
+                r = self._symlinks.get('/'.join(r), r)
         return '/' + '/'.join(r)
 
+    def symlink(self, source, link_name):
+        """Create a symlink pointing to source named link_name."""
+        _abspath = self._abspath(link_name)
+        self._check_parent(_abspath)
+        self._symlinks[_abspath] = source.split('/')
+
+    def readlink(self, link_name):
+        _abspath = self._abspath(link_name)
+        try:
+            return '/'.join(self._symlinks[_abspath])
+        except KeyError:
+            raise NoSuchFile(link_name)
+
 
 class _MemoryLock(object):
     """This makes a lock."""