collect paths for input packages that are in a workspace (#4229)

Co-authored-by: KristofferC <[email protected]>
(cherry picked from commit 2097cdb)

Author: KristofferC

src/API.jl

@@ -187,35 +187,30 @@ for f in (:develop, :add, :rm, :up, :pin, :free, :test, :build, :status, :why, :
     end
 end
 
-function update_source_if_set(project, pkg)
+function update_source_if_set(env, pkg)
+    project = env.project
     source = get(project.sources, pkg.name, nothing)
-    source === nothing && return
-    # This should probably not modify the dicts directly...
-    if pkg.repo.source !== nothing
-        source["url"] = pkg.repo.source
-    end
-    if pkg.repo.rev !== nothing
-        source["rev"] = pkg.repo.rev
-    end
-    if pkg.path !== nothing
-        source["path"] = pkg.path
-    end
-    if pkg.subdir !== nothing
-        source["subdir"] = pkg.subdir
-    end
-    path, repo = get_path_repo(project, pkg.name)
-    if path !== nothing
-        pkg.path = path
-    end
-    if repo.source !== nothing
-        pkg.repo.source = repo.source
-    end
-    if repo.rev !== nothing
-        pkg.repo.rev = repo.rev
+    if source !== nothing
+        # This should probably not modify the dicts directly...
+        if pkg.repo.source !== nothing
+            source["url"] = pkg.repo.source
+        end
+        if pkg.repo.rev !== nothing
+            source["rev"] = pkg.repo.rev
+        end
+        if pkg.path !== nothing
+            source["path"] = pkg.path
+        end
     end
-    if repo.subdir !== nothing
-        pkg.repo.subdir = repo.subdir
+
+    # Packages in manifest should have their paths set to the path in the manifest
+    for (path, wproj) in env.workspace
+        if wproj.uuid == pkg.uuid
+            pkg.path = Types.relative_project_path(env.manifest_file, dirname(path))
+            break
+        end
     end
+    return
 end
 
 function develop(ctx::Context, pkgs::Vector{PackageSpec}; shared::Bool=true,
@@ -257,7 +252,7 @@ function develop(ctx::Context, pkgs::Vector{PackageSpec}; shared::Bool=true,
         if length(findall(x -> x.uuid == pkg.uuid, pkgs)) > 1
             pkgerror("it is invalid to specify multiple packages with the same UUID: $(err_rep(pkg))")
         end
-        update_source_if_set(ctx.env.project, pkg)
+        update_source_if_set(ctx.env, pkg)
     end
 
     Operations.develop(ctx, pkgs, new_git; preserve=preserve, platform=platform)
@@ -311,7 +306,7 @@ function add(ctx::Context, pkgs::Vector{PackageSpec}; preserve::PreserveLevel=Op
         if length(findall(x -> x.uuid == pkg.uuid, pkgs)) > 1
             pkgerror("it is invalid to specify multiple packages with the same UUID: $(err_rep(pkg))")
         end
-        update_source_if_set(ctx.env.project, pkg)
+        update_source_if_set(ctx.env, pkg)
     end
 
     Operations.add(ctx, pkgs, new_git; allow_autoprecomp, preserve, platform, target)
@@ -390,7 +385,7 @@ function up(ctx::Context, pkgs::Vector{PackageSpec};
         ensure_resolved(ctx, ctx.env.manifest, pkgs)
     end
     for pkg in pkgs
-        update_source_if_set(ctx.env.project, pkg)
+        update_source_if_set(ctx.env, pkg)
     end
     Operations.up(ctx, pkgs, level; skip_writing_project, preserve)
     return

test/test_packages/WorkspacePathResolution/Project.toml

@@ -0,0 +1,5 @@
+[workspace]
+projects = [
+    "SubProjectA",
+    "SubProjectB",
+]

test/test_packages/WorkspacePathResolution/SubProjectA/Project.toml

@@ -0,0 +1,9 @@
+name = "SubProjectA"
+uuid = "87654321-4321-4321-4321-210987654321"
+version = "0.1.0"
+
+[deps]
+SubProjectB = "12345678-1234-1234-1234-123456789012"
+
+[sources]
+SubProjectB = {path = "SubProjectB"}

test/test_packages/WorkspacePathResolution/SubProjectA/src/SubProjectA.jl

@@ -0,0 +1,7 @@
+module SubProjectA
+
+using SubProjectB
+
+greet() = "Hello from SubProjectA! " * SubProjectB.greet()
+
+end

test/test_packages/WorkspacePathResolution/SubProjectB/Project.toml

@@ -0,0 +1,3 @@
+name = "SubProjectB"
+uuid = "12345678-1234-1234-1234-123456789012"
+version = "0.1.0"

test/test_packages/WorkspacePathResolution/SubProjectB/src/SubProjectB.jl

@@ -0,0 +1,5 @@
+module SubProjectB
+
+greet() = "Hello from SubProjectB!"
+
+end

test/workspaces.jl

@@ -163,4 +163,19 @@ end
     end
 end
 
+@testset "workspace path resolution issue #4222" begin
+    mktempdir() do dir
+        path = copy_test_package(dir, "WorkspacePathResolution")
+        cd(path) do
+            with_current_env() do
+                # First resolve SubProjectB (non-root project) without existing Manifest
+                Pkg.activate("SubProjectB")
+                @test !isfile("Manifest.toml")
+                # Should be able to find SubProjectA and succeed
+                Pkg.update()
+            end
+        end
+    end
+end
+
 end # module