File tree 2 files changed +14
-1
lines changed 2 files changed +14
-1
lines changed Original file line number Diff line number Diff line change 5
5
package repo
6
6
7
7
import (
8
+ "errors"
8
9
"fmt"
9
10
"net/http"
10
11
@@ -15,6 +16,7 @@ import (
15
16
user_model "code.gitea.io/gitea/models/user"
16
17
"code.gitea.io/gitea/modules/context"
17
18
api "code.gitea.io/gitea/modules/structs"
19
+ "code.gitea.io/gitea/modules/util"
18
20
"code.gitea.io/gitea/modules/web"
19
21
"code.gitea.io/gitea/routers/api/v1/utils"
20
22
"code.gitea.io/gitea/services/convert"
@@ -141,7 +143,7 @@ func CreateFork(ctx *context.APIContext) {
141
143
Description : repo .Description ,
142
144
})
143
145
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 ) {
145
147
ctx .Error (http .StatusConflict , "ForkRepository" , err )
146
148
} else {
147
149
ctx .Error (http .StatusInternalServerError , "ForkRepository" , err )
Original file line number Diff line number Diff line change @@ -272,6 +272,17 @@ func ForkPost(ctx *context.Context) {
272
272
ctx .RenderWithErr (msg , tplFork , & form )
273
273
case repo_model .IsErrRepoAlreadyExist (err ):
274
274
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
+ }
275
286
case db .IsErrNameReserved (err ):
276
287
ctx .RenderWithErr (ctx .Tr ("repo.form.name_reserved" , err .(db.ErrNameReserved ).Name ), tplFork , & form )
277
288
case db .IsErrNamePatternNotAllowed (err ):
You can’t perform that action at this time.
0 commit comments