Skip to content

Commit ade8097

Browse files
kshyattsimonbyrne
authored andcommitted
Deprecate GitAnyObject -> GitUnknownObject (#19935)
1 parent 9c3c2d5 commit ade8097

File tree

6 files changed

+15
-12
lines changed

6 files changed

+15
-12
lines changed

base/deprecated.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,4 +1522,7 @@ unsafe_wrap(::Type{String}, p::Cstring, len::Integer, own::Bool=false) =
15221522
@deprecate finalize(sa::LibGit2.StrArrayStruct) close(sa)
15231523
@deprecate finalize(sa::LibGit2.Buffer) close(sa)
15241524

1525+
# Rename LibGit2.GitAnyObject to LibGit2.GitUnknownObject (part of #19839)
1526+
eval(LibGit2, :(Base.@deprecate_binding GitAnyObject GitUnknownObject))
1527+
15251528
# End deprecations scheduled for 0.6

base/libgit2/libgit2.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ function checkout!(repo::GitRepo, commit::AbstractString = "";
284284
end
285285

286286
# search for commit to get a commit object
287-
obj = get(GitAnyObject, repo, Oid(commit))
287+
obj = get(GitUnknownObject, repo, Oid(commit))
288288
obj === nothing && return
289289
try
290290
peeled = peel(obj, Consts.OBJ_COMMIT)
@@ -341,7 +341,7 @@ end
341341

342342
""" git reset [--soft | --mixed | --hard] <commit> """
343343
function reset!(repo::GitRepo, commit::Oid, mode::Cint = Consts.RESET_MIXED)
344-
obj = get(GitAnyObject, repo, commit)
344+
obj = get(GitUnknownObject, repo, commit)
345345
# object must exist for reset
346346
obj === nothing && throw(GitError(Error.Object, Error.ERROR, "Commit `$(string(commit))` object not found"))
347347
try

base/libgit2/reference.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ function peel{T <: GitObject}(::Type{T}, ref::GitReference)
108108
return Oid()
109109
elseif err != Int(Error.GIT_OK)
110110
if obj_ptr_ptr[] != C_NULL
111-
close(GitAnyObject(ref.repo, obj_ptr_ptr[]))
111+
close(GitUnknownObject(ref.repo, obj_ptr_ptr[]))
112112
end
113113
throw(Error.GitError(err))
114114
end

base/libgit2/repository.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function revparse(repo::GitRepo, objname::AbstractString)
7474
err = ccall((:git_revparse_single, :libgit2), Cint,
7575
(Ptr{Ptr{Void}}, Ptr{Void}, Cstring), obj_ptr_ptr, repo.ptr, objname)
7676
err != 0 && return nothing
77-
return GitAnyObject(repo, obj_ptr_ptr[])
77+
return GitUnknownObject(repo, obj_ptr_ptr[])
7878
end
7979

8080
""" Returns id of a found object """
@@ -104,7 +104,7 @@ function get{T <: GitObject}(::Type{T}, repo::GitRepo, oid::Oid, oid_size::Int=O
104104
return nothing
105105
elseif err != Int(Error.GIT_OK)
106106
if obj_ptr_ptr[] != C_NULL
107-
close(GitAnyObject(repo, obj_ptr_ptr[]))
107+
close(GitUnknownObject(repo, obj_ptr_ptr[]))
108108
end
109109
throw(Error.GitError(err))
110110
end
@@ -134,7 +134,7 @@ function peel(obj::GitObject, obj_type::Cint)
134134
return Oid()
135135
elseif err != Int(Error.GIT_OK)
136136
if peeled_ptr_ptr[] != C_NULL
137-
close(GitAnyObject(obj.repo, peeled_ptr_ptr[]))
137+
close(GitUnknownObject(obj.repo, peeled_ptr_ptr[]))
138138
end
139139
throw(Error.GitError(err))
140140
end

base/libgit2/tree.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ function object(repo::GitRepo, te::GitTreeEntry)
3232
@check ccall((:git_tree_entry_to_object, :libgit2), Cint,
3333
(Ptr{Ptr{Void}}, Ptr{Void}, Ref{Void}),
3434
obj_ptr_ptr, repo.ptr, te.ptr)
35-
return GitAnyObject(repo, obj_ptr_ptr[])
35+
return GitUnknownObject(repo, obj_ptr_ptr[])
3636
end

base/libgit2/types.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ for (typ, reporef, sup, cname) in [
412412
(:GitRebase, :GitRepo, :AbstractGitObject, :git_rebase),
413413
(:GitStatus, :GitRepo, :AbstractGitObject, :git_status_list),
414414
(:GitBranchIter, :GitRepo, :AbstractGitObject, :git_branch_iterator),
415-
(:GitAnyObject, :GitRepo, :GitObject, :git_object),
415+
(:GitUnknownObject, :GitRepo, :GitObject, :git_object),
416416
(:GitCommit, :GitRepo, :GitObject, :git_commit),
417417
(:GitBlob, :GitRepo, :GitObject, :git_blob),
418418
(:GitTree, :GitRepo, :GitObject, :git_tree),
@@ -527,8 +527,8 @@ function getobjecttype{T<:GitObject}(::Type{T})
527527
Consts.OBJ_BLOB
528528
elseif T == GitTag
529529
Consts.OBJ_TAG
530-
elseif T == GitAnyObject
531-
Consts.OBJ_ANY
530+
elseif T == GitUnknownObject
531+
Consts.OBJ_ANY # this name comes from the header
532532
else
533533
throw(GitError(Error.Object, Error.ENOTFOUND, "Type $T is not supported"))
534534
end
@@ -543,8 +543,8 @@ function getobjecttype(obj_type::Cint)
543543
GitBlob
544544
elseif obj_type == Consts.OBJ_TAG
545545
GitTag
546-
elseif obj_type == Consts.OBJ_ANY
547-
GitAnyObject
546+
elseif obj_type == Consts.OBJ_ANY #this name comes from the header
547+
GitUnknownObject
548548
else
549549
throw(GitError(Error.Object, Error.ENOTFOUND, "Object type $obj_type is not supported"))
550550
end

0 commit comments

Comments
 (0)