#37484

pending completion

Build # #37484

Build Type

push

local

Committed by

web-flow

Commit Message

minor follow up on #48996 (#49129)

- removed unnecessary `Union`-signature
- use one-liner definition when applicable
- add type assertion to make it more robust against invalidation

Run Details

5 of 5 new or added lines in 2 files covered. (100.0%)

70963 of 82484 relevant lines covered (86.03%)

33340438.71 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

75.0

/stdlib/LibGit2/src/error.jl

# This file is a part of Julia. License is MIT: https://julialang.org/license

module Error

import ..LibGit2: ensure_initialized

export GitError

@enum(Code, GIT_OK          = Cint(0),   # no error
            ERROR           = Cint(-01), # generic error
            ENOTFOUND       = Cint(-03), # requested object could not be found
            EEXISTS         = Cint(-04), # object exits preventing op
            EAMBIGUOUS      = Cint(-05), # more than one object matches
            EBUFS           = Cint(-06), # output buffer too small to hold data
            EUSER           = Cint(-07), # user callback generated error
            EBAREREPO       = Cint(-08), # operation not allowed on bare repo
            EUNBORNBRANCH   = Cint(-09), # HEAD refers to branch with 0 commits
            EUNMERGED       = Cint(-10), # merge in progress prevented op
            ENONFASTFORWARD = Cint(-11), # ref not fast-forwardable
            EINVALIDSPEC    = Cint(-12), # name / ref not in valid format
            EMERGECONFLICT  = Cint(-13), # merge conflict prevented op
            ELOCKED         = Cint(-14), # lock file prevented op
            EMODIFIED       = Cint(-15), # ref value does not match expected
            EAUTH           = Cint(-16), # authentication error
            ECERTIFICATE    = Cint(-17), # server certificate is invalid
            EAPPLIED        = Cint(-18), # patch/merge has already been applied
            EPEEL           = Cint(-19), # the requested peel operation is not possible
            EEOF            = Cint(-20), # unexpected EOF
            PASSTHROUGH     = Cint(-30), # internal only
            ITEROVER        = Cint(-31), # signals end of iteration
            RETRY           = Cint(-32), # internal only
            EMISMATCH       = Cint(-33), # hashsum mismatch in object
            EINDEXDIRTY     = Cint(-34), # unsaved changes in the index would be overwritten
            EAPPLYFAIL      = Cint(-35), # patch application failed
            EOWNER          = Cint(-36)) # the object is not owned by the current user

@enum(Class, None,
             NoMemory,
             OS,
             Invalid,
             Reference,
             Zlib,
             Repository,
             Config,
             Regex,
             Odb,
             Index,
             Object,
             Net,
             Tag,
             Tree,
             Indexer,
             SSL,
             Submodule,
             Thread,
             Stash,
             Checkout,
             FetchHead,
             Merge,
             SSH,
             Filter,
             Revert,
             Callback,
             CherryPick,
             Describe,
             Rebase,
             Filesystem,
             Patch,
             WorkTree,
             SHA1,
             HTTP)

struct ErrorStruct
    message::Ptr{UInt8}
    class::Cint
end

struct GitError <: Exception
    class::Class
    code::Code
    msg::String
end
Base.show(io::IO, err::GitError) = print(io, "GitError(Code:$(err.code), Class:$(err.class), $(err.msg))")

function last_error()
    ensure_initialized()
    err = ccall((:giterr_last, :libgit2), Ptr{ErrorStruct}, ())
    if err != C_NULL
        err_obj   = unsafe_load(err)
        err_class = Class(err_obj.class)
        err_msg   = unsafe_string(err_obj.message)
    else
        err_class = Class(0)
        err_msg = "No errors"
    end
    return (err_class, err_msg)
end

GitError(err_code::Integer) = GitError(Code(err_code))
function GitError(err_code::Code)
    err_class, err_msg = last_error()
    return GitError(err_class, err_code, err_msg)
end

end # Error module

macro check(git_func)
    quote
        err = Cint($(esc(git_func::Expr)))
        if err < 0
            throw(Error.GitError(err))
        end
        err
    end
end

1	# This file is a part of Julia. License is MIT: https://julialang.org/license
2
3	module Error
4
5	import ..LibGit2: ensure_initialized
6
7	export GitError
8
9	@enum(Code, GIT_OK = Cint(0), # no error
10	ERROR = Cint(-01), # generic error
11	ENOTFOUND = Cint(-03), # requested object could not be found
12	EEXISTS = Cint(-04), # object exits preventing op
13	EAMBIGUOUS = Cint(-05), # more than one object matches
14	EBUFS = Cint(-06), # output buffer too small to hold data
15	EUSER = Cint(-07), # user callback generated error
16	EBAREREPO = Cint(-08), # operation not allowed on bare repo
17	EUNBORNBRANCH = Cint(-09), # HEAD refers to branch with 0 commits
18	EUNMERGED = Cint(-10), # merge in progress prevented op
19	ENONFASTFORWARD = Cint(-11), # ref not fast-forwardable
20	EINVALIDSPEC = Cint(-12), # name / ref not in valid format
21	EMERGECONFLICT = Cint(-13), # merge conflict prevented op
22	ELOCKED = Cint(-14), # lock file prevented op
23	EMODIFIED = Cint(-15), # ref value does not match expected
24	EAUTH = Cint(-16), # authentication error
25	ECERTIFICATE = Cint(-17), # server certificate is invalid
26	EAPPLIED = Cint(-18), # patch/merge has already been applied
27	EPEEL = Cint(-19), # the requested peel operation is not possible
28	EEOF = Cint(-20), # unexpected EOF
29	PASSTHROUGH = Cint(-30), # internal only
30	ITEROVER = Cint(-31), # signals end of iteration
31	RETRY = Cint(-32), # internal only
32	EMISMATCH = Cint(-33), # hashsum mismatch in object
33	EINDEXDIRTY = Cint(-34), # unsaved changes in the index would be overwritten
34	EAPPLYFAIL = Cint(-35), # patch application failed
35	EOWNER = Cint(-36)) # the object is not owned by the current user
36
37	@enum(Class, None,
38	NoMemory,
39	OS,
40	Invalid,
41	Reference,
42	Zlib,
43	Repository,
44	Config,
45	Regex,
46	Odb,
47	Index,
48	Object,
49	Net,
50	Tag,
51	Tree,
52	Indexer,
53	SSL,
54	Submodule,
55	Thread,
56	Stash,
57	Checkout,
58	FetchHead,
59	Merge,
60	SSH,
61	Filter,
62	Revert,
63	Callback,
64	CherryPick,
65	Describe,
66	Rebase,
67	Filesystem,
68	Patch,
69	WorkTree,
70	SHA1,
71	HTTP)
72
73	struct ErrorStruct
74	message::Ptr{UInt8}
75	class::Cint
76	end
77
78	struct GitError <: Exception
79	class::Class	27✔
80	code::Code
81	msg::String
82	end
83	Base.show(io::IO, err::GitError) = print(io, "GitError(Code:$(err.code), Class:$(err.class), $(err.msg))")	×
84
85	function last_error()	×
86	ensure_initialized()	27✔
87	err = ccall((:giterr_last, :libgit2), Ptr{ErrorStruct}, ())	27✔
88	if err != C_NULL	27✔
89	err_obj = unsafe_load(err)	27✔
90	err_class = Class(err_obj.class)	27✔
91	err_msg = unsafe_string(err_obj.message)	27✔
92	else
93	err_class = Class(0)	×
94	err_msg = "No errors"	×
95	end
96	return (err_class, err_msg)	27✔
97	end
98
99	GitError(err_code::Integer) = GitError(Code(err_code))	27✔
100	function GitError(err_code::Code)	×
101	err_class, err_msg = last_error()	27✔
102	return GitError(err_class, err_code, err_msg)	27✔
103	end
104
105	end # Error module
106
107	macro check(git_func)
108	quote
109	err = Cint($(esc(git_func::Expr)))	147✔
110	if err < 0	147✔
111	throw(Error.GitError(err))	24✔
112	end
113	err	22✔
114	end
115	end

JuliaLang / julia / #37484

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous