Browse Source

Add error for fork already existing (#7185)

tags/v1.9.0-rc1
John Olheiser 4 years ago
parent
commit
744fd6a1c8
3 changed files with 22 additions and 4 deletions
  1. 17
    0
      models/error.go
  2. 4
    3
      models/repo.go
  3. 1
    1
      models/repo_test.go

+ 17
- 0
models/error.go View File

@@ -674,6 +674,23 @@ func (err ErrRepoAlreadyExist) Error() string {
return fmt.Sprintf("repository already exists [uname: %s, name: %s]", err.Uname, err.Name)
}

// ErrForkAlreadyExist represents a "ForkAlreadyExist" kind of error.
type ErrForkAlreadyExist struct {
Uname string
RepoName string
ForkName string
}

// IsErrForkAlreadyExist checks if an error is an ErrForkAlreadyExist.
func IsErrForkAlreadyExist(err error) bool {
_, ok := err.(ErrForkAlreadyExist)
return ok
}

func (err ErrForkAlreadyExist) Error() string {
return fmt.Sprintf("repository is already forked by user [uname: %s, repo path: %s, fork path: %s]", err.Uname, err.RepoName, err.ForkName)
}

// ErrRepoRedirectNotExist represents a "RepoRedirectNotExist" kind of error.
type ErrRepoRedirectNotExist struct {
OwnerID int64

+ 4
- 3
models/repo.go View File

@@ -2395,9 +2395,10 @@ func ForkRepository(doer, u *User, oldRepo *Repository, name, desc string) (_ *R
return nil, err
}
if forkedRepo != nil {
return nil, ErrRepoAlreadyExist{
Uname: u.Name,
Name: forkedRepo.Name,
return nil, ErrForkAlreadyExist{
Uname: u.Name,
RepoName: oldRepo.FullName(),
ForkName: forkedRepo.FullName(),
}
}


+ 1
- 1
models/repo_test.go View File

@@ -131,7 +131,7 @@ func TestForkRepository(t *testing.T) {
fork, err := ForkRepository(user, user, repo, "test", "test")
assert.Nil(t, fork)
assert.Error(t, err)
assert.True(t, IsErrRepoAlreadyExist(err))
assert.True(t, IsErrForkAlreadyExist(err))
}

func TestRepoAPIURL(t *testing.T) {

Loading…
Cancel
Save