From 431d5f2eae378bc7ff62bd5ddc553f3768aac9b9 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Wed, 19 Feb 2025 19:17:28 +0800 Subject: [PATCH] all: Remove error wrapping I'm undecided on how I wrap errors in this project. I'll just return errors directly for now. This will probably be adjusted later. --- git_format_patch.go | 3 +-- git_misc.go | 20 ++++---------------- git_ref.go | 15 +++------------ http_server.go | 2 -- url.go | 8 +------- diff --git a/git_format_patch.go b/git_format_patch.go index ecb266ee318353b6b57a8053e2e0974b28952919..2ebd2c2daf3ebe616a07bb46ff9c07f766185d3e 100644 --- a/git_format_patch.go +++ b/git_format_patch.go @@ -7,7 +7,6 @@ "strings" "time" "github.com/go-git/go-git/v5/plumbing/object" - "go.lindenii.runxiyu.org/lindenii-common/misc" ) // get_patch_from_commit formats a commit object as if it was returned by @@ -15,7 +14,7 @@ // git-format-patch. func format_patch_from_commit(commit *object.Commit) (string, error) { _, patch, err := get_patch_from_commit(commit) if err != nil { - return "", misc.Wrap_one_error(err_getting_patch_of_commit, err) + return "", err } var buf bytes.Buffer diff --git a/git_misc.go b/git_misc.go index e528888c2fcd53a24935f90c0617739c95fb0614..2827c17d34c688246804271b184e8e0237315ef9 100644 --- a/git_misc.go +++ b/git_misc.go @@ -9,13 +9,6 @@ "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" - "go.lindenii.runxiyu.org/lindenii-common/misc" -) - -var ( - err_getting_commit_tree = errors.New("error getting commit tree") - err_getting_patch_of_commit = errors.New("error getting patch of commit") - err_getting_parent_commit_object = errors.New("error getting parent commit object") ) // open_git_repo opens a git repository by group and repo name. @@ -59,12 +52,9 @@ } return display_git_tree } -var err_get_recent_commits = errors.New("error getting recent commits") - func get_recent_commits(repo *git.Repository, head_hash plumbing.Hash, number_of_commits int) (recent_commits []*object.Commit, err error) { commit_iter, err := repo.Log(&git.LogOptions{From: head_hash}) if err != nil { - err = misc.Wrap_one_error(err_get_recent_commits, err) return nil, err } recent_commits = make([]*object.Commit, 0) @@ -75,7 +65,6 @@ this_recent_commit, err := commit_iter.Next() if errors.Is(err, io.EOF) { return recent_commits, nil } else if err != nil { - err = misc.Wrap_one_error(err_get_recent_commits, err) return nil, err } recent_commits = append(recent_commits, this_recent_commit) @@ -86,7 +75,6 @@ this_recent_commit, err := commit_iter.Next() if errors.Is(err, io.EOF) { return recent_commits, nil } else if err != nil { - err = misc.Wrap_one_error(err_get_recent_commits, err) return nil, err } recent_commits = append(recent_commits, this_recent_commit) @@ -100,22 +88,22 @@ parent_commit_object, err := commit_object.Parent(0) if errors.Is(err, object.ErrParentNotFound) { commit_tree, err := commit_object.Tree() if err != nil { - ret_err = misc.Wrap_one_error(err_getting_commit_tree, err) + ret_err = err return } patch, err = (&object.Tree{}).Patch(commit_tree) if err != nil { - ret_err = misc.Wrap_one_error(err_getting_patch_of_commit, err) + ret_err = err return } } else if err != nil { - ret_err = misc.Wrap_one_error(err_getting_parent_commit_object, err) + ret_err = err return } else { parent_commit_hash = parent_commit_object.Hash patch, err = parent_commit_object.Patch(commit_object) if err != nil { - ret_err = misc.Wrap_one_error(err_getting_patch_of_commit, err) + ret_err = err return } } diff --git a/git_ref.go b/git_ref.go index 13b5655501c1e1f47a867ed06fb5469c90e81c4c..ce4e067a3d05b957e1f157926a6dc0249bf99249 100644 --- a/git_ref.go +++ b/git_ref.go @@ -1,17 +1,8 @@ package main import ( - "errors" - "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" - "go.lindenii.runxiyu.org/lindenii-common/misc" -) - -var ( - err_getting_tag_reference = errors.New("error getting tag reference") - err_getting_branch_reference = errors.New("error getting branch reference") - err_getting_head = errors.New("error getting HEAD") ) // get_ref_hash_from_type_and_name returns the hash of a reference given its @@ -21,7 +12,7 @@ switch ref_type { case "": head, err := repo.Head() if err != nil { - ret_err = misc.Wrap_one_error(err_getting_head, err) + ret_err = err return } ref_hash = head.Hash() @@ -30,14 +21,14 @@ ref_hash = plumbing.NewHash(ref_name) case "branch": ref, err := repo.Reference(plumbing.NewBranchReferenceName(ref_name), true) if err != nil { - ret_err = misc.Wrap_one_error(err_getting_branch_reference, err) + ret_err = err return } ref_hash = ref.Hash() case "tag": ref, err := repo.Reference(plumbing.NewTagReferenceName(ref_name), true) if err != nil { - ret_err = misc.Wrap_one_error(err_getting_tag_reference, err) + ret_err = err return } ref_hash = ref.Hash() diff --git a/http_server.go b/http_server.go index 9c06ab0eae5aada0d8508229e4a74d9065627730..2a92f76832aa244fe6209ca365030db72e329057 100644 --- a/http_server.go +++ b/http_server.go @@ -213,5 +213,3 @@ http.Error(w, fmt.Sprintf("Unknown module type: %s", module_type), http.StatusNotFound) } } } - -var err_bad_request = errors.New("bad request") diff --git a/url.go b/url.go index 0265fc62aa887719ade5376ad0e4201125003842..ea11555e95d2ae02ca6435edd8f4f1c274c9ea1d 100644 --- a/url.go +++ b/url.go @@ -5,8 +5,6 @@ "errors" "net/http" "net/url" "strings" - - "go.lindenii.runxiyu.org/lindenii-common/misc" ) var ( @@ -52,15 +50,11 @@ for i, segment := range segments { segments[i], err = url.PathUnescape(segment) if err != nil { - return nil, nil, misc.Wrap_one_error(err_bad_request, err) + return } } params, err = url.ParseQuery(params_string) - if err != nil { - return nil, nil, misc.Wrap_one_error(err_bad_request, err) - } - return } -- 2.48.1