Skip to content

Commit bebc343

Browse files
authored
1 parent f4ef7ee commit bebc343

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

routers/api/v1/repo/fork.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package repo
66

77
import (
8+
"errors"
89
"fmt"
910
"net/http"
1011

@@ -15,6 +16,7 @@ import (
1516
user_model "code.gitea.io/gitea/models/user"
1617
"code.gitea.io/gitea/modules/context"
1718
api "code.gitea.io/gitea/modules/structs"
19+
"code.gitea.io/gitea/modules/util"
1820
"code.gitea.io/gitea/modules/web"
1921
"code.gitea.io/gitea/routers/api/v1/utils"
2022
"code.gitea.io/gitea/services/convert"
@@ -141,7 +143,7 @@ func CreateFork(ctx *context.APIContext) {
141143
Description: repo.Description,
142144
})
143145
if err != nil {
144-
if repo_service.IsErrForkAlreadyExist(err) || repo_model.IsErrRepoAlreadyExist(err) || repo_model.IsErrReachLimitOfRepo(err) {
146+
if errors.Is(err, util.ErrAlreadyExist) || repo_model.IsErrReachLimitOfRepo(err) {
145147
ctx.Error(http.StatusConflict, "ForkRepository", err)
146148
} else {
147149
ctx.Error(http.StatusInternalServerError, "ForkRepository", err)

routers/web/repo/pull.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,17 @@ func ForkPost(ctx *context.Context) {
272272
ctx.RenderWithErr(msg, tplFork, &form)
273273
case repo_model.IsErrRepoAlreadyExist(err):
274274
ctx.RenderWithErr(ctx.Tr("repo.settings.new_owner_has_same_repo"), tplFork, &form)
275+
case repo_model.IsErrRepoFilesAlreadyExist(err):
276+
switch {
277+
case ctx.IsUserSiteAdmin() || (setting.Repository.AllowAdoptionOfUnadoptedRepositories && setting.Repository.AllowDeleteOfUnadoptedRepositories):
278+
ctx.RenderWithErr(ctx.Tr("form.repository_files_already_exist.adopt_or_delete"), tplFork, form)
279+
case setting.Repository.AllowAdoptionOfUnadoptedRepositories:
280+
ctx.RenderWithErr(ctx.Tr("form.repository_files_already_exist.adopt"), tplFork, form)
281+
case setting.Repository.AllowDeleteOfUnadoptedRepositories:
282+
ctx.RenderWithErr(ctx.Tr("form.repository_files_already_exist.delete"), tplFork, form)
283+
default:
284+
ctx.RenderWithErr(ctx.Tr("form.repository_files_already_exist"), tplFork, form)
285+
}
275286
case db.IsErrNameReserved(err):
276287
ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(db.ErrNameReserved).Name), tplFork, &form)
277288
case db.IsErrNamePatternNotAllowed(err):

0 commit comments

Comments
 (0)