fix some LibGit2 errors #20155
fix some LibGit2 errors #20155
Conversation
|
Ah, found the problem. Tests added. |
simonbyrne
force-pushed
the
sb/libgit2/errors
branch
from
d5e3800
to
724c020
Compare
| @@ -42,6 +42,6 @@ function Base.getindex(diff::GitDiff, i::Integer) | |||
| delta_ptr = ccall((:git_diff_get_delta, :libgit2), | |||
| Ptr{DiffDelta}, | |||
| (Ptr{Void}, Csize_t), diff.ptr, i-1) | |||
| delta_ptr == C_NULL && return nothing | |||
| delta_ptr == C_NULL && throw(BoundsError("Attempt to access $(count(diff))-element GitDiff at index $i")) | |||
There was a problem hiding this comment.
boundserror doesn't take a string, does it?
There was a problem hiding this comment.
julia> BoundsError("yolo")
BoundsError("yolo",#undef)
| @@ -75,18 +75,22 @@ end | |||
| isdirty(repo::GitRepo, paths::AbstractString=""; cached::Bool=false) = | |||
| isdiff(repo, Consts.HEAD_FILE, paths, cached=cached) | |||
|
|
|||
| """ git diff-index <treeish> [-- <path>]""" | |||
| """ | |||
| LibGit2.isdiff(repo::GitRepo, treeish[, paths]; [cached=false]) | |||
There was a problem hiding this comment.
I don't think we typically put keyword arguments in brackets in docstrings?
| """ | ||
| LibGit2.isdiff(repo::GitRepo, treeish[, paths]; [cached=false]) | ||
|
|
||
| Checks if there are any differences between the tree specified by `treeish` and working tree (if `cached=false`) or the index (if `cached=true`). |
There was a problem hiding this comment.
Would be nice to break onto multiple lines to keep the line length down.
| function isdiff(repo::GitRepo, treeish::AbstractString, paths::AbstractString=""; cached::Bool=false) | ||
| tree_oid = revparseid(repo, "$treeish^{tree}") | ||
| iszero(tree_oid) && return true | ||
| iszero(tree_oid) && return error("invalid treeish $treeish") # this can be removed by #20104 |
There was a problem hiding this comment.
Perhaps just error instead of return error? Might actually be better as throw(ArgumentError(...)).
There was a problem hiding this comment.
This is a stopgap, will get removed after we merge #20104
| close(repo) | ||
| end | ||
| end | ||
|
|
There was a problem hiding this comment.
I think typically we don't put line breaks between ends at different indentation levels.
| isdirty(repo::GitRepo, paths::AbstractString=""; cached::Bool=false) = | ||
| isdiff(repo, Consts.HEAD_FILE, paths, cached=cached) | ||
|
|
||
| """ git diff-index <treeish> [-- <path>]""" | ||
| """ | ||
| LibGit2.isdiff(repo::GitRepo, treeish[, paths]; cached=false) |
There was a problem hiding this comment.
not something that this pr should address, but "isdiff" is an odd name - sounds like it's asking whether something is a diff
There was a problem hiding this comment.
I agree. I've added it to #19839
Some of these were due to typos in #19962. I do have some tests, but
they're currently failing.