Merge pull request #21171 from JuliaLang/sb/libgit2/cat

deprecate use of cat with LibGit2 objects

base/deprecated.jl

@@ -1138,8 +1138,17 @@ end
      @deprecate revparse(repo::GitRepo, objname::AbstractString) GitObject(repo, objname) false
      @deprecate object(repo::GitRepo, te::GitTreeEntry) GitObject(repo, te) false
      @deprecate commit(ann::GitAnnotated) GitHash(ann) false
-     @deprecate cat{T<:GitObject}(repo::GitRepo, ::Type{T}, object::AbstractString) cat(repo, object)
      @deprecate lookup(repo::GitRepo, oid::GitHash) GitBlob(repo, oid) false
+    function Base.cat{T<:GitObject}(repo::GitRepo, ::Type{T}, object::Union{AbstractString,AbstractGitHash})
+        Base.depwarn("cat(repo::GitRepo, T, spec) is deprecated, use content(T(repo, spec))", :cat)
+        try
+            return content(GitBlob(repo, spec))
+        catch e
+            isa(e, LibGit2.GitError) && return nothing
+            rethrow(e)
+        end
+    end
+    Base.cat(repo::GitRepo, object::Union{AbstractString,AbstractGitHash}) = cat(repo, GitBlob, object)
 end
 
 # when this deprecation is deleted, remove all calls to it, and all

base/libgit2/libgit2.jl

@@ -2,7 +2,7 @@
 
 module LibGit2
 
-import Base: merge!, cat, ==
+import Base: merge!, ==
 
 export with, GitRepo, GitConfig
 
@@ -495,16 +495,6 @@ Equivalent to `git reset [--soft | --mixed | --hard] <id>`.
 reset!(repo::GitRepo, id::GitHash, mode::Cint = Consts.RESET_MIXED) =
     reset!(repo, GitObject(repo, id), mode)
 
-""" git cat-file <commit> """
-function cat(repo::GitRepo, spec::Union{AbstractString,AbstractGitHash})
-    obj = GitObject(repo, spec)
-    if isa(obj, GitBlob)
-        content(obj)
-    else
-        nothing
-    end
-end
-
 """ git rev-list --count <commit1> <commit2> """
 function revcount(repo::GitRepo, fst::AbstractString, snd::AbstractString)
     fst_id = revparseid(repo, fst)