Skip to content

if the only thing that changed was the commit highlight it #4550

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

Open
IanButterworth wants to merge 1 commit into
base: master
Choose a base branch
from
Open

if the only thing that changed was the commit highlight it #4550

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
25 changes: 22 additions & 3 deletions src/Operations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3088,20 +3088,38 @@ end

# Display

function stat_rep(x::PackageSpec; name = true)
function stat_rep(x::PackageSpec; name = true, short_repo = nothing, show_hash = false)
name = name ? "$(x.name)" : ""
version = x.version == VersionSpec() ? "" : "v$(x.version)"
rev = ""
if x.repo.rev !== nothing
rev = occursin(r"\b([a-f0-9]{40})\b", x.repo.rev) ? x.repo.rev[1:7] : x.repo.rev
end
subdir_str = x.repo.subdir === nothing ? "" : ":$(x.repo.subdir)"
repo = Operations.is_tracking_repo(x) ? "`$(x.repo.source)$(subdir_str)#$(rev)`" : ""
tree_hash_str = (show_hash && x.tree_hash !== nothing) ? "@$(string(x.tree_hash)[1:7])" : ""
repo = if Operations.is_tracking_repo(x)
if short_repo === true
"`...$(tree_hash_str)`"
else
"`$(x.repo.source)$(subdir_str)#$(rev)$(tree_hash_str)`"
end
else
""
end
path = Operations.is_tracking_path(x) ? "$(pathrepr(x.path))" : ""
pinned = x.pinned ? "⚲" : ""
return join(filter(!isempty, [name, version, repo, path, pinned]), " ")
end

same_repo_source(::Nothing, ::Any) = false
same_repo_source(::Any, ::Nothing) = false
function same_repo_source(old::PackageSpec, new::PackageSpec)
return is_tracking_repo(old) && is_tracking_repo(new) &&
old.repo.source == new.repo.source &&
old.repo.rev == new.repo.rev &&
old.repo.subdir == new.repo.subdir
end

print_single(io::IO, pkg::PackageSpec) = print(io, stat_rep(pkg))

is_instantiated(::Nothing) = false
Expand All @@ -3120,7 +3138,8 @@ function print_diff(io::IO, old::Union{Nothing, PackageSpec}, new::Union{Nothing
printstyled(io, "↓ $(stat_rep(old)) ⇒ $(stat_rep(new; name = false))"; color = :light_magenta)
end
else
printstyled(io, "~ $(stat_rep(old)) ⇒ $(stat_rep(new; name = false))"; color = :light_yellow)
same_repo = same_repo_source(old, new)
printstyled(io, "~ $(stat_rep(old; show_hash = same_repo)) ⇒ $(stat_rep(new; name = false, short_repo = same_repo, show_hash = same_repo))"; color = :light_yellow)
end
end

Expand Down
Loading