diff options
| author | 6543 <6543@obermui.de> | 2020-12-25 09:59:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-25 11:59:32 +0200 |
| commit | a19447aed128ecadfcd938d6a80cd4951af1f4ce (patch) | |
| tree | 6312bf946d601aab29731645a4777feeaea66036 /services/repository | |
| parent | 04ae0f2f3f4556c6d0b4adc5f2cffd0cc7d25151 (diff) | |
| download | gitea-a19447aed128ecadfcd938d6a80cd4951af1f4ce.tar.gz gitea-a19447aed128ecadfcd938d6a80cd4951af1f4ce.zip | |
migrate from com.* to alternatives (#14103)
* remove github.com/unknwon/com from models
* dont use "com.ToStr()"
* replace "com.ToStr" with "fmt.Sprint" where its easy to do
* more refactor
* fix test
* just "proxy" Copy func for now
* as per @lunny
Diffstat (limited to 'services/repository')
| -rw-r--r-- | services/repository/transfer.go | 14 | ||||
| -rw-r--r-- | services/repository/transfer_test.go | 10 |
2 files changed, 13 insertions, 11 deletions
diff --git a/services/repository/transfer.go b/services/repository/transfer.go index d34c812b86..e2416cf8de 100644 --- a/services/repository/transfer.go +++ b/services/repository/transfer.go @@ -10,8 +10,6 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/sync" - - "github.com/unknwon/com" ) // repoWorkingPool represents a working pool to order the parallel changes to the same repository @@ -30,12 +28,12 @@ func TransferOwnership(doer, newOwner *models.User, repo *models.Repository, tea oldOwner := repo.Owner - repoWorkingPool.CheckIn(com.ToStr(repo.ID)) + repoWorkingPool.CheckIn(fmt.Sprint(repo.ID)) if err := models.TransferOwnership(doer, newOwner.Name, repo); err != nil { - repoWorkingPool.CheckOut(com.ToStr(repo.ID)) + repoWorkingPool.CheckOut(fmt.Sprint(repo.ID)) return err } - repoWorkingPool.CheckOut(com.ToStr(repo.ID)) + repoWorkingPool.CheckOut(fmt.Sprint(repo.ID)) newRepo, err := models.GetRepositoryByID(repo.ID) if err != nil { @@ -61,12 +59,12 @@ func ChangeRepositoryName(doer *models.User, repo *models.Repository, newRepoNam // repo so that we can atomically rename the repo path and updates the // local copy's origin accordingly. - repoWorkingPool.CheckIn(com.ToStr(repo.ID)) + repoWorkingPool.CheckIn(fmt.Sprint(repo.ID)) if err := models.ChangeRepositoryName(doer, repo, newRepoName); err != nil { - repoWorkingPool.CheckOut(com.ToStr(repo.ID)) + repoWorkingPool.CheckOut(fmt.Sprint(repo.ID)) return err } - repoWorkingPool.CheckOut(com.ToStr(repo.ID)) + repoWorkingPool.CheckOut(fmt.Sprint(repo.ID)) notification.NotifyRenameRepository(doer, repo, oldRepoName) diff --git a/services/repository/transfer_test.go b/services/repository/transfer_test.go index 9468e1ced2..052b8c9954 100644 --- a/services/repository/transfer_test.go +++ b/services/repository/transfer_test.go @@ -11,9 +11,9 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/notification/action" + "code.gitea.io/gitea/modules/util" "github.com/stretchr/testify/assert" - "github.com/unknwon/com" ) var notifySync sync.Once @@ -37,8 +37,12 @@ func TestTransferOwnership(t *testing.T) { transferredRepo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 3}).(*models.Repository) assert.EqualValues(t, 2, transferredRepo.OwnerID) - assert.False(t, com.IsExist(models.RepoPath("user3", "repo3"))) - assert.True(t, com.IsExist(models.RepoPath("user2", "repo3"))) + exist, err := util.IsExist(models.RepoPath("user3", "repo3")) + assert.NoError(t, err) + assert.False(t, exist) + exist, err = util.IsExist(models.RepoPath("user2", "repo3")) + assert.NoError(t, err) + assert.True(t, exist) models.AssertExistsAndLoadBean(t, &models.Action{ OpType: models.ActionTransferRepo, ActUserID: 2, |