Fix: handle corner cases related to SCM with local sources optimization

conans/client/cmd/export.py

@@ -74,10 +74,7 @@ def _capture_export_scm_data(conanfile, conanfile_dir, destination_folder, outpu
     captured_revision = scm_data.capture_revision
 
     scm = SCM(scm_data, conanfile_dir, output)
-    if scm_data.capture_origin or scm_data.capture_revision:
-        # Generate the scm_folder.txt file pointing to the src_path
-        src_path = scm.get_repo_root()
-        save(scm_src_file, src_path.replace("\\", "/"))
+    captured = scm_data.capture_origin or scm_data.capture_revision
 
     if scm_data.url == "auto":
         origin = scm.get_qualified_remote_url(remove_credentials=True)
@@ -96,6 +93,12 @@ def _capture_export_scm_data(conanfile, conanfile_dir, destination_folder, outpu
 
     _replace_scm_data_in_conanfile(os.path.join(destination_folder, "conanfile.py"), scm_data)
 
+    if captured:
+        # Generate the scm_folder.txt file pointing to the src_path
+        src_path = scm.get_local_path_to_url(scm_data.url)
+        if src_path:
+            save(scm_src_file, os.path.normpath(src_path).replace("\\", "/"))
+
     return scm_data, captured_revision
 
 

conans/client/source.py

@@ -37,6 +37,7 @@ def complete_recipe_sources(remote_manager, cache, conanfile, ref):
 
 
 def merge_directories(src, dst, excluded=None, symlinks=True):
+    src = os.path.normpath(src)
     dst = os.path.normpath(dst)
     excluded = excluded or []
     excluded = [os.path.normpath(entry) for entry in excluded]
@@ -192,20 +193,30 @@ def _run_scm(conanfile, src_folder, local_sources_path, output, cache):
     dest_dir = os.path.normpath(os.path.join(src_folder, scm_data.subfolder))
     if cache:
         # When in cache, capturing the sources from user space is done only if exists
-        captured = local_sources_path and os.path.exists(local_sources_path)
+        if not local_sources_path or not os.path.exists(local_sources_path):
+            local_sources_path = None
     else:
         # In user space, if revision="auto", then copy
-        captured = scm_data.capture_origin or scm_data.capture_revision
-    local_sources_path = local_sources_path if captured and conanfile.develop else None
-
-    if local_sources_path:
+        if scm_data.capture_origin or scm_data.capture_revision:  # FIXME: or clause?
+            scm = SCM(scm_data, local_sources_path, output)
+            scm_url = scm_data.url if scm_data.url != "auto" else \
+                scm.get_qualified_remote_url(remove_credentials=True)
+
+            src_path = scm.get_local_path_to_url(url=scm_url)
+            if src_path:
+                local_sources_path = src_path
+        else:
+            local_sources_path = None
+
+    if local_sources_path and conanfile.develop:
         excluded = SCM(scm_data, local_sources_path, output).excluded_files
         output.info("Getting sources from folder: %s" % local_sources_path)
         merge_directories(local_sources_path, dest_dir, excluded=excluded)
     else:
         output.info("Getting sources from url: '%s'" % scm_data.url)
         scm = SCM(scm_data, dest_dir, output)
         scm.checkout()
+
     if cache:
         # This is a bit weird. Why after a SCM should we remove files. Maybe check conan 2.0
         _clean_source_folder(dest_dir)

conans/model/scm.py

@@ -1,4 +1,5 @@
 import json
+import os
 
 from conans.client.tools.scm import Git, SVN
 from conans.errors import ConanException
@@ -99,3 +100,23 @@ def get_qualified_remote_url(self, remove_credentials):
 
     def is_local_repository(self):
         return self.repo.is_local_repository()
+
+    @staticmethod
+    def clean_url(url):
+        _, last_chunk = url.rsplit('/', 1)
+        if '@' in last_chunk:  # Remove peg_revision
+            url, peg_revision = url.rsplit('@', 1)
+            return url
+        return url
+
+    def get_local_path_to_url(self, url):
+        """ Compute the local path to the directory where the URL is pointing to (only make sense
+            for CVS where chunks of the repository can be checked out isolated). The argument
+            'url' should be contained inside the root url.
+        """
+        src_root = self.get_repo_root()
+        url_root = SCM(self._data, src_root, self._output).get_remote_url(remove_credentials=True)
+        if url_root:
+            url = self.clean_url(url)
+            src_path = os.path.join(src_root, os.path.relpath(url, url_root))
+            return src_path

conans/test/functional/command/source_test.py

@@ -20,8 +20,10 @@ class ScmtestConan(ConanFile):
 """
         client = TestClient()
         client.save({"conanfile.py": conanfile})
+        client.runner("git init .", cwd=client.current_folder)
         client.run("source .")
-        self.assertEqual(["conanfile.py"], os.listdir(client.current_folder))
+        self.assertEqual(sorted(["conanfile.py", '.git']),
+                         sorted(os.listdir(client.current_folder)))
 
     def local_flow_patch_test(self):
         # https://github.com/conan-io/conan/issues/2327

conans/test/functional/python_requires/python_requires_test.py

@@ -286,7 +286,7 @@ def reuse_scm_test(self):
 
         conanfile = """from conans import ConanFile
 scm = {"type" : "git",
-       "url" : "somerepo",
+       "url" : "http://somerepo",
        "revision" : "auto"}
 
 class MyConanfileBase(ConanFile):
@@ -298,13 +298,13 @@ class MyConanfileBase(ConanFile):
         client.run("get MyConanfileBase/1.1@lasote/testing")
         # The global scm is left as-is
         self.assertIn("""scm = {"type" : "git",
-       "url" : "somerepo",
+       "url" : "http://somerepo",
        "revision" : "auto"}""", client.out)
         # but the class one is replaced
         self.assertNotIn("scm = scm", client.out)
         self.assertIn('    scm = {"revision":', client.out)
         self.assertIn('"type": "git",', client.out)
-        self.assertIn('"url": "somerepo"', client.out)
+        self.assertIn('"url": "http://somerepo"', client.out)
 
         reuse = """from conans import python_requires
 base = python_requires("MyConanfileBase/1.1@lasote/testing")
@@ -320,7 +320,7 @@ def _my_method(self):
         self.assertNotIn("scm = base.scm", client.out)
         self.assertIn('scm = {"revision":', client.out)
         self.assertIn('"type": "git",', client.out)
-        self.assertIn('"url": "somerepo"', client.out)
+        self.assertIn('"url": "http://somerepo"', client.out)
 
     def reuse_exports_test(self):
         conanfile = """from conans import ConanFile