[pull] master from JuliaLang:master

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    groups:
+      all-actions:
+        patterns:
+          - "*"

.github/workflows/test.yml

@@ -4,10 +4,12 @@ on:
     branches:
       - 'master'
       - 'release-*'
+      - 'backports-release-*'
   push:
     branches:
       - 'master'
       - 'release-*'
+      - 'backports-release-*'
     tags: '*'
 defaults:
   run:
@@ -82,9 +84,10 @@ jobs:
       - uses: julia-actions/julia-processcoverage@v1
         env:
             JULIA_PKG_SERVER: ${{ matrix.pkg-server }}
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v5
         with:
-          file: lcov.info
+          files: lcov.info
+          token: ${{ secrets.CODECOV_TOKEN }}
   docs:
     runs-on: ubuntu-latest
     timeout-minutes: 60

CHANGELOG.md

@@ -4,6 +4,7 @@ Pkg v1.12 Release Notes
 - Pkg now has support for "workspaces" which is a way to resolve multiple project files into a single manifest.
   The functions `Pkg.status`, `Pkg.why`, `Pkg.instantiate`, `Pkg.precompile` (and their REPL variants) have been updated
   to take a `workspace` option. Read more about this feature in the manual about the TOML-files.
+- `status` now shows when different versions/sources of dependencies are loaded than that which is expected by the manifest ([#4109])
 
 Pkg v1.11 Release Notes
 =======================

Project.toml

@@ -32,4 +32,20 @@ REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 REPLExt = "REPL"
 
 [compat]
+Artifacts = "1.11"
+Dates = "1.11"
+Downloads = "1.6"
+FileWatching = "1.11"
+LibGit2 = "1.11"
+Libdl = "1.11"
+Logging = "1.11"
+Markdown = "1.11"
+Printf = "1.11"
+Random = "1.11"
+REPL = "1.11"
+SHA = "0.7"
+TOML = "1"
+Tar = "1.10"
+UUIDs = "1.11"
 julia = "1.12"
+p7zip_jll = "17.5"

contrib/list_missing_pkg_tags.jl

@@ -0,0 +1,89 @@
+using LibGit2
+
+const JULIA_REPO_URL = "https://github.com/JuliaLang/julia.git"
+const JULIA_REPO_DIR = "julia"
+const PKG_VERSION_PATH = "stdlib/Pkg.version"
+const PKG_REPO_URL = "https://github.com/JuliaLang/Pkg.jl.git"
+const PKG_REPO_DIR = "Pkg.jl"
+
+function checkout_or_update_repo(url, dir)
+    if isdir(dir)
+        println("Updating existing repository: $dir")
+        repo = LibGit2.GitRepo(dir)
+        LibGit2.fetch(repo)
+    else
+        println("Cloning repository: $url")
+        LibGit2.clone(url, dir)
+    end
+end
+
+function get_tags(repo)
+    refs = LibGit2.ref_list(repo)
+    tags = filter(ref -> startswith(ref, "refs/tags/"), refs)
+    return sort!(replace.(tags, "refs/tags/" => ""))
+end
+
+function is_stable_v1_release(tag)
+    return occursin(r"^v\d+\.\d+\.\d+$", tag) && VersionNumber(tag) >= v"1.0.0"
+end
+
+function extract_pkg_sha1(text::AbstractString)
+    m = match(r"PKG_SHA1\s*=\s*([a-f0-9]{40})", text)
+    return m !== nothing ? m[1] : nothing
+end
+
+function get_commit_hash_for_pkg_version(repo, tag)
+    try
+        tag_ref = LibGit2.GitReference(repo, "refs/tags/" * tag)
+        LibGit2.checkout!(repo, string(LibGit2.GitHash(LibGit2.peel(tag_ref))))
+        version_file = joinpath(JULIA_REPO_DIR, PKG_VERSION_PATH)
+        if isfile(version_file)
+            return extract_pkg_sha1(readchomp(version_file))
+        else
+            println("Warning: Pkg.version file missing for tag $tag")
+            return nothing
+        end
+    catch
+        println("Error processing tag $tag")
+        rethrow()
+    end
+end
+
+tempdir = mktempdir()
+cd(tempdir) do
+    # Update Julia repo
+    checkout_or_update_repo(JULIA_REPO_URL, JULIA_REPO_DIR)
+    julia_repo = LibGit2.GitRepo(JULIA_REPO_DIR)
+
+    # Get Julia tags, filtering only stable releases
+    julia_tags = filter(is_stable_v1_release, get_tags(julia_repo))
+    version_commit_map = Dict{String, String}()
+
+    for tag in julia_tags
+        println("Processing Julia tag: $tag")
+        commit_hash = get_commit_hash_for_pkg_version(julia_repo, tag)
+        if commit_hash !== nothing
+            version_commit_map[tag] = commit_hash
+        end
+    end
+
+    # Update Pkg.jl repo
+    checkout_or_update_repo(PKG_REPO_URL, PKG_REPO_DIR)
+    pkg_repo = LibGit2.GitRepo(PKG_REPO_DIR)
+
+    # Get existing tags in Pkg.jl
+    pkg_tags = Set(get_tags(pkg_repo))
+
+    # Filter out versions that already exist
+    missing_versions = filter(v -> v ∉ pkg_tags, collect(keys(version_commit_map)))
+
+    # Sort versions numerically
+    sort!(missing_versions, by=VersionNumber)
+
+    # Generate `git tag` commands
+    println("\nGit tag commands for missing Pkg.jl versions:")
+    for version in missing_versions
+        commit = version_commit_map[version]
+        println("git tag $version $commit")
+    end
+end

docs/src/apps.md

@@ -0,0 +1,59 @@
+# [**?.** Apps](@id Apps)
+
+!!! note
+    The app support in Pkg is currently considered experimental and some functionality and API may change.
+
+    Some inconveniences that can be encountered are:
+    - You need to manually make `~/.julia/bin` available on the PATH environment.
+    - The path to the julia executable used is the same as the one used to install the app. If this
+      julia installation gets removed, you might need to reinstall the app.
+    - You can only have one app installed per package.
+
+Apps are Julia packages that are intended to be run as a "standalone programs" (by e.g. typing the name of the app in the terminal possibly together with some arguments or flags/options).
+This is in contrast to most Julia packages that are used as "libraries" and are loaded by other files or in the Julia REPL.
+
+## Creating a Julia app
+
+A Julia app is structured similar to a standard Julia library with the following additions:
+
+- A `@main` entry point in the package module (see the [Julia help on `@main`](https://docs.julialang.org/en/v1/manual/command-line-interface/#The-Main.main-entry-point) for details)
+- An `[app]` section in the `Project.toml` file listing the executable names that the package provides.
+
+A very simple example of an app that prints the reversed input arguments would be:
+
+```julia
+# src/MyReverseApp.jl
+module MyReverseApp
+
+function (@main)(ARGS)
+    for arg in ARGS
+        print(stdout, reverse(arg), " ")
+    end
+    return
+end
+
+end # module
+```
+
+```toml
+# Project.toml
+
+# standard fields here
+
+[apps]
+reverse = {}
+```
+The empty table `{}` is to allow for giving metadata about the app but it is currently unused.
+
+After installing this app one could run:
+
+```
+$ reverse some input string
+emos tupni gnirts
+```
+
+directly in the terminal.
+
+## Installing Julia apps
+
+The installation of Julia apps are similar to installing julia libraries but instead of using e.g. `Pkg.add` or `pkg> add` one uses `Pkg.Apps.add` or `pkg> app add` (`develop` is also available).

docs/src/environments.md

@@ -1,4 +1,4 @@
-# [**4.** Working with Environment](@id Working-with-Environments)
+# [**4.** Working with Environments](@id Working-with-Environments)
 
 The following discusses Pkg's interaction with environments. For more on the role, environments play in code loading, including the "stack" of environments from which code can be loaded, see [this section in the Julia manual](https://docs.julialang.org/en/v1/manual/code-loading/#Environments-1).
 

docs/src/toml-files.md

@@ -22,13 +22,38 @@ are described below.
 
 ### The `authors` field
 
-For a package, the optional `authors` field is a list of strings describing the
-package authors, in the form `NAME <EMAIL>`. For example:
+For a package, the optional `authors` field is a TOML array describing the package authors. 
+Entries in the array can either be a string in the form `"NAME"` or `"NAME <EMAIL>"`, or a table keys following the [Citation File Format schema](https://github.com/citation-file-format/citation-file-format/blob/main/schema-guide.md) for either a
+[`person`](https://github.com/citation-file-format/citation-file-format/blob/main/schema-guide.md#definitionsperson) or an[`entity`](https://github.com/citation-file-format/citation-file-format/blob/main/schema-guide.md#definitionsentity).
+
+For example:
 ```toml
-authors = ["Some One <[email protected]>",
-           "Foo Bar <[email protected]>"]
+authors = [
+  "Some One <[email protected]>",
+  "Foo Bar <[email protected]>",
+  {given-names = "Baz", family-names = "Qux", email = "[email protected]", orcid = "https://orcid.org/0000-0000-0000-0000", website = "https://github.com/bazqux"},
+]
 ```
 
+If all authors are specified by tables, it is possible to use [the TOML Array of Tables syntax](https://toml.io/en/v1.0.0#array-of-tables)
+```toml
+[[authors]]
+given-names = "Some"
+family-names = "One"
+email = "[email protected]"
+
+[[authors]]
+given-names = "Foo"
+family-names = "Bar"
+email = "[email protected]"
+
+[[authors]]
+given-names = "Baz"
+family-names = "Qux"
+email = "[email protected]"
+orcid = "https://orcid.org/0000-0000-0000-0000"
+website = "https://github.com/bazqux"
+```
 
 ### The `name` field
 
@@ -100,6 +125,7 @@ corresponding manifest file.
 ```toml
 [sources]
 Example = {url = "https://github.com/JuliaLang/Example.jl", rev = "custom_branch"}
+WithinMonorepo = {url = "https://github.org/author/BigProject", subdir = "SubPackage"}
 SomeDependency = {path = "deps/SomeDependency.jl"}
 ```
 
@@ -161,7 +187,7 @@ For the details, see [`Pkg.instantiate`](@ref).
 
 ### Different Manifests for Different Julia versions
 
-Starting from Julia v1.11, there is an option to name manifest files in the format `Manifest-v{major}.{minor}.toml`.
+Starting from Julia v1.10.8, there is an option to name manifest files in the format `Manifest-v{major}.{minor}.toml`.
 Julia will then preferentially use the version-specific manifest file if available.
 For example, if both `Manifest-v1.11.toml` and `Manifest.toml` exist, Julia 1.11 will prioritize using `Manifest-v1.11.toml`.
 However, Julia versions 1.10, 1.12, and all others will default to using `Manifest.toml`.

ext/REPLExt/REPLExt.jl

@@ -154,7 +154,7 @@ function create_mode(repl::REPL.AbstractREPL, main::LineEdit.Prompt)
                     end
                 else
                     LineEdit.edit_insert(s, ';')
-                    LineEdit.check_for_hint(s) && LineEdit.refresh_line(s)
+                    LineEdit.check_show_hint(s)
                 end
             end
         end
@@ -181,7 +181,7 @@ function repl_init(repl::REPL.LineEditREPL)
                 end
             else
                 LineEdit.edit_insert(s, ']')
-                LineEdit.check_for_hint(s) && LineEdit.refresh_line(s)
+                LineEdit.check_show_hint(s)
             end
         end
     )

ext/REPLExt/completions.jl

@@ -54,9 +54,9 @@ end
 
 
 const JULIA_UUID = UUID("1222c4b2-2114-5bfd-aeef-88e4692bbb3e")
-function complete_remote_package(partial; hint::Bool)
-    found_match = false
-    isempty(partial) && return String[]
+function complete_remote_package!(comps, partial; hint::Bool)
+    isempty(partial) && return true # true means returned early
+    found_match = !isempty(comps)
     cmp = Set{String}()
     for reg in Registry.reachable_registries()
         for (uuid, regpkg) in reg
@@ -80,9 +80,9 @@ function complete_remote_package(partial; hint::Bool)
                     if is_julia_compat === nothing || is_julia_compat
                         push!(cmp, name)
                         # In hint mode the result is only used if there is a single matching entry
-                        # so we abort the search
+                        # so we can return no matches in case of more than one match
                         if hint && found_match
-                            return sort!(collect(cmp))
+                            return true # true means returned early
                         end
                         found_match = true
                         break
@@ -91,7 +91,8 @@ function complete_remote_package(partial; hint::Bool)
             end
         end
     end
-    return sort!(collect(cmp))
+    append!(comps, sort!(collect(cmp)))
+    return false # false means performed full search
 end
 
 function complete_help(options, partial; hint::Bool)
@@ -149,13 +150,31 @@ function complete_add_dev(options, partial, i1, i2; hint::Bool)
     if occursin(Base.Filesystem.path_separator_re, partial)
         return comps, idx, !isempty(comps)
     end
-    comps = vcat(comps, sort(complete_remote_package(partial; hint)))
-    if !isempty(partial)
+    returned_early = complete_remote_package!(comps, partial; hint)
+    # returning early means that no further search should be done here
+    if !returned_early
         append!(comps, filter!(startswith(partial), [info.name for info in values(Types.stdlib_infos())]))
     end
     return comps, idx, !isempty(comps)
 end
 
+# TODO: Move
+import Pkg: Operations, Types, Apps
+function complete_installed_apps(options, partial; hint)
+    manifest = try
+        Types.read_manifest(joinpath(Apps.app_env_folder(), "AppManifest.toml"))
+    catch err
+        err isa PkgError || rethrow()
+        return String[]
+    end
+    apps = String[]
+    for (uuid, entry) in manifest.deps
+        append!(apps, keys(entry.apps))
+        push!(apps, entry.name)
+    end
+    return unique!(apps)
+end
+
 ########################
 # COMPLETION INTERFACE #
 ########################