aboutsummaryrefslogtreecommitdiff
path: root/http_handle_repo_contrib_one.go
diff options
context:
space:
mode:
authorRunxi Yu <me@runxiyu.org>2025-03-22 13:59:00 +0800
committerRunxi Yu <me@runxiyu.org>2025-03-22 13:59:00 +0800
commit1f185f329bb82c87b250fb2312ae873d69a20d38 (patch)
tree892ad487e7e1154fcb71fbe05acf9e583592e96b /http_handle_repo_contrib_one.go
parentVariable name lengths (diff)
downloadforge-1f185f329bb82c87b250fb2312ae873d69a20d38.tar.gz
forge-1f185f329bb82c87b250fb2312ae873d69a20d38.tar.zst
forge-1f185f329bb82c87b250fb2312ae873d69a20d38.zip
Use a custom errPage500
Diffstat (limited to 'http_handle_repo_contrib_one.go')
-rw-r--r--http_handle_repo_contrib_one.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/http_handle_repo_contrib_one.go b/http_handle_repo_contrib_one.go
index 29e2ef6..4a5f6b8 100644
--- a/http_handle_repo_contrib_one.go
+++ b/http_handle_repo_contrib_one.go
@@ -35,18 +35,18 @@ func httpHandleRepoContribOne(writer http.ResponseWriter, request *http.Request,
"SELECT COALESCE(title, ''), status, source_ref, COALESCE(destination_branch, '') FROM merge_requests WHERE id = $1",
mrIDInt,
).Scan(&title, &status, &srcRefStr, &dstBranchStr); err != nil {
- http.Error(writer, "Error querying merge request: "+err.Error(), http.StatusInternalServerError)
+ errorPage500(writer, params, "Error querying merge request: "+err.Error())
return
}
repo = params["repo"].(*git.Repository)
if srcRefHash, err = getRefHash(repo, "branch", srcRefStr); err != nil {
- http.Error(writer, "Error getting source ref hash: "+err.Error(), http.StatusInternalServerError)
+ errorPage500(writer, params, "Error getting source ref hash: "+err.Error())
return
}
if srcCommit, err = repo.CommitObject(srcRefHash); err != nil {
- http.Error(writer, "Error getting source commit: "+err.Error(), http.StatusInternalServerError)
+ errorPage500(writer, params, "Error getting source commit: "+err.Error())
return
}
params["source_commit"] = srcCommit
@@ -58,18 +58,18 @@ func httpHandleRepoContribOne(writer http.ResponseWriter, request *http.Request,
dstBranchHash, err = getRefHash(repo, "branch", dstBranchStr)
}
if err != nil {
- http.Error(writer, "Error getting destination branch hash: "+err.Error(), http.StatusInternalServerError)
+ errorPage500(writer, params, "Error getting destination branch hash: "+err.Error())
return
}
if dstCommit, err = repo.CommitObject(dstBranchHash); err != nil {
- http.Error(writer, "Error getting destination commit: "+err.Error(), http.StatusInternalServerError)
+ errorPage500(writer, params, "Error getting destination commit: "+err.Error())
return
}
params["destination_commit"] = dstCommit
if mergeBases, err = srcCommit.MergeBase(dstCommit); err != nil {
- http.Error(writer, "Error getting merge base: "+err.Error(), http.StatusInternalServerError)
+ errorPage500(writer, params, "Error getting merge base: "+err.Error())
return
}
mergeBaseCommit = mergeBases[0]
@@ -77,7 +77,7 @@ func httpHandleRepoContribOne(writer http.ResponseWriter, request *http.Request,
patch, err := mergeBaseCommit.Patch(srcCommit)
if err != nil {
- http.Error(writer, "Error getting patch: "+err.Error(), http.StatusInternalServerError)
+ errorPage500(writer, params, "Error getting patch: "+err.Error())
return
}
params["file_patches"] = makeUsableFilePatches(patch)