Skip to content

User facing messages for AGit errors #33012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jan 27, 2025
Merged

User facing messages for AGit errors #33012

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7712d78
Add error prefix in git remote
TheFox0x7 Dec 27, 2024
2d57d46
fix: agit prompt to create a pull request
TheFox0x7 Jan 23, 2025
54cb733
disable create message in services instead of hook
TheFox0x7 Jan 24, 2025
2b21cb3
inline translation keys
TheFox0x7 Jan 25, 2025
5a5a96c
fix legacy code log message
wxiaoguang Jan 25, 2025
fcdff48
add comment for empty lines
wxiaoguang Jan 25, 2025
ff7ebd2
Merge branch 'main' into agit-qol-fixes
GiteaBot Jan 27, 2025
47f258d
Merge branch 'main' into agit-qol-fixes
GiteaBot Jan 27, 2025
ae73f60
Merge branch 'main' into agit-qol-fixes
GiteaBot Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cmd/serv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ func fail(ctx context.Context, userMessage, logMsgFmt string, args ...any) error
// There appears to be a chance to cause a zombie process and failure to read the Exit status
// if nothing is outputted on stdout.
_, _ = fmt.Fprintln(os.Stdout, "")
_, _ = fmt.Fprintln(os.Stderr, "Gitea:", userMessage)
_, _ = fmt.Fprintln(os.Stderr, "error:")
_, _ = fmt.Fprintln(os.Stderr, "error:", userMessage)
_, _ = fmt.Fprintln(os.Stderr, "error:")

if logMsgFmt != "" {
logMsg := fmt.Sprintf(logMsgFmt, args...)
Expand Down
11 changes: 11 additions & 0 deletions routers/private/hook_proc_receive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
package private

import (
"errors"
"net/http"

issues_model "code.gitea.io/gitea/models/issues"
repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/private"
Expand All @@ -27,6 +30,14 @@ func HookProcReceive(ctx *gitea_context.PrivateContext) {
if err != nil {
if repo_model.IsErrUserDoesNotHaveAccessToRepo(err) {
ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err.Error())
} else if errors.Is(err, issues_model.ErrMustCollaborator) {
ctx.JSON(http.StatusUnauthorized, private.Response{
Err: err.Error(), UserMsg: string(ctx.Tr("repo.pulls.new.must_collaborator")),
})
} else if errors.Is(err, user_model.ErrBlockedUser) {
ctx.JSON(http.StatusUnauthorized, private.Response{
Err: err.Error(), UserMsg: string(ctx.Tr("repo.pulls.new.blocked_user")),
})
} else {
log.Error(err.Error())
ctx.JSON(http.StatusInternalServerError, private.Response{
Expand Down
2 changes: 1 addition & 1 deletion services/agit/agit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func ProcReceive(ctx context.Context, repo *repo_model.Repository, gitRepo *git.
OriginalRef: opts.RefFullNames[i],
OldOID: objectFormat.EmptyObjectID().String(),
NewOID: opts.NewCommitIDs[i],
IsCreatePR: true,
IsCreatePR: false, // AGit always creates a pull request so there is no point in prompting user to create one
URL: fmt.Sprintf("%s/pulls/%d", repo.HTMLURL(), pr.Index),
ShouldShowMessage: setting.Git.PullRequestPushMessage && repo.AllowsPulls(ctx),
HeadBranch: headBranch,
Expand Down
Loading