Add test for #2302, closes #2302 (#2352)

Closes #2302

* Fix is_instantiated if top-level project-package already
exist in the manifest.

Co-authored-by: Fredrik Ekre <[email protected]>
(cherry picked from commit 1f12cac)

Author: 2 people

src/Operations.jl

@@ -116,9 +116,15 @@ function is_instantiated(ctx::Context)::Bool
     pkgs = load_all_deps(ctx)
     # If the top-level project is a package, ensure it is instantiated as well
     if ctx.env.pkg !== nothing
-        push!(pkgs, Types.PackageSpec(
-            name=ctx.env.pkg.name, uuid=ctx.env.pkg.uuid, version=ctx.env.pkg.version, path=dirname(ctx.env.project_file)
-        ))
+        # Top-level project may already be in the manifest (cyclic deps)
+        # so only add it if it isn't there
+        idx = findfirst(x -> x.uuid == ctx.env.pkg.uuid, pkgs)
+        if idx === nothing
+            push!(pkgs, Types.PackageSpec(
+                name=ctx.env.pkg.name, uuid=ctx.env.pkg.uuid, version=ctx.env.pkg.version,
+                path=dirname(ctx.env.project_file)
+            ))
+        end
     end
     # Make sure all paths/artifacts exist
     return all(pkg -> is_package_downloaded(ctx, pkg), pkgs)

test/new.jl

@@ -2413,6 +2413,21 @@ end
             Pkg.add(path="A")
         end
     end
+    # test #2302
+    isolate(loaded_depot=true) do
+        cd_tempdir() do dir
+            Pkg.generate("A")
+            Pkg.generate("B")
+            git_init_and_commit("B")
+            Pkg.develop(path="B")
+            Pkg.activate("A")
+            Pkg.add(path="B")
+            git_init_and_commit("A")
+            Pkg.activate("B")
+            # This shouldn't error even though A has a dependency on B
+            Pkg.add(path="A")
+        end
+    end
 end
 
 @testset "Offline mode" begin