Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for future changes in code loading #521

Merged
merged 1 commit into from
Aug 28, 2020
Merged

fix for future changes in code loading #521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 35 additions & 2 deletions src/pkgs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,11 @@ end

function manifest_file(project_file)
if project_file isa String
mfile = Base.project_file_manifest_path(project_file)
mfile = @static if isdefined(Base, :TOMLCache)
Base.project_file_manifest_path(project_file, Base.TOMLCache())
else
Base.project_file_manifest_path(project_file)
end
if mfile isa String
return mfile
end
Expand All @@ -451,6 +455,34 @@ function manifest_file(project_file)
end
manifest_file() = manifest_file(Base.active_project())

if isdefined(Base, :TOMLCache)
function manifest_paths!(pkgpaths::Dict, manifest_file::String)
c = Base.TOMLCache()
d = Base.parsed_toml(c, manifest_file)
for (name, entries) in d
entries::Vector{Any}
for info in entries
name::String
info::Dict{String, Any}
uuid = UUID(info["uuid"]::String)
hash = get(info, "git-tree-sha1", nothing)::Union{String, Nothing}
path = nothing
if hash !== nothing
path = find_from_hash(name, uuid, Base.SHA1(hash))
path === nothing && error("no path found for $id and hash $hash")
end
maybe_path = get(info, "path", nothing)::Union{String, Nothing}
if maybe_path !== nothing
path = abspath(dirname(manifest_file), maybe_path)
end
if path !== nothing
pkgpaths[PkgId(Base.UUID(uuid), name)] = path
end
end
end
return pkgpaths
end
else
function manifest_paths!(pkgpaths::Dict, manifest_file::String)
open(manifest_file) do io
uuid = name = path = hash = id = nothing
Expand Down Expand Up @@ -481,11 +513,12 @@ function manifest_paths!(pkgpaths::Dict, manifest_file::String)
end
return pkgpaths
end
end

manifest_paths(manifest_file::String) =
manifest_paths!(Dict{PkgId,String}(), manifest_file)

function find_from_hash(name, uuid, hash)
function find_from_hash(name::String, uuid::Base.UUID, hash::Base.SHA1)
for slug in (Base.version_slug(uuid, hash, 4), Base.version_slug(uuid, hash))
for depot in DEPOT_PATH
path = abspath(depot, "packages", name, slug)
Expand Down