diff options
| -rw-r--r-- | git_format_patch.go | 3 | ||||
| -rw-r--r-- | git_misc.go | 20 | ||||
| -rw-r--r-- | git_ref.go | 15 | ||||
| -rw-r--r-- | http_server.go | 2 | ||||
| -rw-r--r-- | url.go | 8 |
5 files changed, 9 insertions, 39 deletions
diff --git a/git_format_patch.go b/git_format_patch.go index ecb266e..2ebd2c2 100644 --- a/git_format_patch.go +++ b/git_format_patch.go @@ -7,7 +7,6 @@ import ( "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 @@ import ( 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 e528888..2827c17 100644 --- a/git_misc.go +++ b/git_misc.go @@ -9,13 +9,6 @@ import ( "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 @@ func build_display_git_tree(tree *object.Tree) []display_git_tree_entry_t { 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 @@ func get_recent_commits(repo *git.Repository, head_hash plumbing.Hash, number_of 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 @@ func get_recent_commits(repo *git.Repository, head_hash plumbing.Hash, number_of 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 @@ func get_patch_from_commit(commit_object *object.Commit) (parent_commit_hash plu 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 } } @@ -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 @@ func get_ref_hash_from_type_and_name(repo *git.Repository, ref_type, ref_name st 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 @@ func get_ref_hash_from_type_and_name(repo *git.Repository, ref_type, ref_name st 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 9c06ab0..2a92f76 100644 --- a/http_server.go +++ b/http_server.go @@ -213,5 +213,3 @@ func (router *http_router_t) ServeHTTP(w http.ResponseWriter, r *http.Request) { } } } - -var err_bad_request = errors.New("bad request") @@ -5,8 +5,6 @@ import ( "net/http" "net/url" "strings" - - "go.lindenii.runxiyu.org/lindenii-common/misc" ) var ( @@ -52,15 +50,11 @@ func parse_request_uri(request_uri string) (segments []string, params url.Values 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 } |