diff --git a/docs/src/environments.md b/docs/src/environments.md index fd6fff9ab4..50bc1adc85 100644 --- a/docs/src/environments.md +++ b/docs/src/environments.md @@ -66,12 +66,12 @@ shell> git clone https://github.com/JuliaLang/Example.jl.git Cloning into 'Example.jl'... ... -(@v1.9) pkg> activate Example.jl +(@v1.12) pkg> activate Example.jl Activating project at `~/Example.jl` (Example) pkg> instantiate - No Changes to `~/Example.jl/Project.toml` - No Changes to `~/Example.jl/Manifest.toml` + No packages added to or removed from `~/Example.jl/Project.toml` + No packages added to or removed from `~/Example.jl/Manifest.toml` ``` If the project contains a manifest, this will install the packages in the same state that is given by that manifest. diff --git a/src/Operations.jl b/src/Operations.jl index 42db0ec638..752130b140 100644 --- a/src/Operations.jl +++ b/src/Operations.jl @@ -2276,7 +2276,7 @@ function print_status(env::EnvCache, old_env::Union{Nothing,EnvCache}, registrie end no_changes = all(p-> p[2] == p[3], xs) if no_changes - printpkgstyle(io, Symbol("No Changes"), "to $(pathrepr(manifest ? env.manifest_file : env.project_file))", ignore_indent) + printpkgstyle(io, Symbol("No packages added to or removed from"), "$(pathrepr(manifest ? env.manifest_file : env.project_file))", ignore_indent) else xs = !filter ? xs : eltype(xs)[(id, old, new) for (id, old, new) in xs if (id in uuids || something(new, old).name in names)] if isempty(xs) diff --git a/test/new.jl b/test/new.jl index 6ab8e6a6d7..e447c46a99 100644 --- a/test/new.jl +++ b/test/new.jl @@ -2278,8 +2278,8 @@ end # Double add should not claim "Updating" Pkg.add(Pkg.PackageSpec(; name="Example", version="0.3.0"); io=io) output = String(take!(io)) - @test occursin(r"No Changes to `.+Project\.toml`", output) - @test occursin(r"No Changes to `.+Manifest\.toml`", output) + @test occursin(r"No packages added to or removed from `.+Project\.toml`", output) + @test occursin(r"No packages added to or removed from `.+Manifest\.toml`", output) # From tracking registry to tracking repo Pkg.add(Pkg.PackageSpec(; name="Example", rev="master"); io=io) output = String(take!(io)) @@ -2401,22 +2401,22 @@ end git_init_and_commit(projdir) ## empty project + empty diff Pkg.status(; io=io, diff=true) - @test occursin(r"No Changes to `.+Project\.toml`", readline(io)) + @test occursin(r"No packages added to or removed from `.+Project\.toml`", readline(io)) Pkg.status(; io=io, mode=Pkg.PKGMODE_MANIFEST, diff=true) - @test occursin(r"No Changes to `.+Manifest\.toml`", readline(io)) + @test occursin(r"No packages added to or removed from `.+Manifest\.toml`", readline(io)) ### empty diff + filter Pkg.status("Example"; io=io, diff=true) - @test occursin(r"No Changes to `.+Project\.toml`", readline(io)) + @test occursin(r"No packages added to or removed from `.+Project\.toml`", readline(io)) ## non-empty project but empty diff Pkg.add("Markdown") git_init_and_commit(dirname(Pkg.project().path)) Pkg.status(; io=io, diff=true) - @test occursin(r"No Changes to `.+Project\.toml`", readline(io)) + @test occursin(r"No packages added to or removed from `.+Project\.toml`", readline(io)) Pkg.status(; io=io, mode=Pkg.PKGMODE_MANIFEST, diff=true) - @test occursin(r"No Changes to `.+Manifest\.toml`", readline(io)) + @test occursin(r"No packages added to or removed from `.+Manifest\.toml`", readline(io)) ### filter should still show "empty diff" Pkg.status("Example"; io=io, diff=true) - @test occursin(r"No Changes to `.+Project\.toml`", readline(io)) + @test occursin(r"No packages added to or removed from `.+Project\.toml`", readline(io)) ## non-empty project + non-empty diff Pkg.rm("Markdown") Pkg.add(name="Example", version="0.3.0") diff --git a/test/resolve.jl b/test/resolve.jl index f45e12b20f..f083d74e1a 100644 --- a/test/resolve.jl +++ b/test/resolve.jl @@ -740,8 +740,8 @@ end iob = IOBuffer() Pkg.resolve(io = iob) str = String(take!(iob)) - @test occursin(r"No Changes to .*Project.toml", str) - @test occursin(r"No Changes to .*Manifest.toml", str) + @test occursin(r"No packages added to or removed from .*Project.toml", str) + @test occursin(r"No packages added to or removed from .*Manifest.toml", str) end end