Merge branch 'mr/leger/master/fix-anod-checkout-external-on-symlink' into 'master'

Error with sync_tree when source top is a symlink

Closes #45

See merge request it/e3-core!124

Author: grouigrokon

src/e3/fs.py

@@ -1054,6 +1054,10 @@ def walk(
     if not os.path.exists(source):
         raise FSError(origin="sync_tree", message=f"{source} does not exist")
 
+    # Use realpath here, or a FileNotFoundError is raised instead of an FSError
+    # if source does not exist.
+    source_top = os.path.realpath(source_top, strict=True)
+
     # Keep track of deleted and updated files
     deleted_list: list[str] = []
     updated_list: list[str] = []

tests/tests_e3/fs/main_test.py

@@ -433,6 +433,40 @@ def test_sync_tree_links():
         assert f.read() == "content"
 
 
+def test_sync_tree_top_source_is_link():
+    """Check handling of source top is a link."""
+    e3.fs.mkdir("a")
+    with open("a/content", "w") as f:
+        f.write("content")
+
+    try:
+        # Symlinks are supported on Windows, but the user must have sufficient
+        # permissions.
+        os.symlink(
+            os.path.join(os.getcwd(), "a"),
+            os.path.join(os.getcwd(), "b"),
+            target_is_directory=True,
+        )
+    except Exception as e:
+        if sys.platform == "win32":
+            pytest.skip("Insufficient permissions to create symbolic links on Windows")
+        else:
+            raise e
+
+    # Sync tree in "c", source top is "b", which is a symlink to "a".
+    e3.fs.mkdir("c")
+    e3.fs.sync_tree(
+        os.path.join(os.getcwd(), "b"),
+        os.path.join(os.getcwd(), "c", "a"),
+        preserve_timestamps=False,
+    )
+
+    # Make sure "c/a" is not a symlink
+    assert not os.path.islink(os.path.join(os.getcwd(), "c", "a"))
+    with open("c/a/content") as f:
+        assert f.read() == "content"
+
+
 def test_sync_tree_does_not_exist():
     """Check error message when sync_tree source does not exist."""
     with pytest.raises(e3.fs.FSError) as err: