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/pull | |
| 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/pull')
| -rw-r--r-- | services/pull/check.go | 7 | ||||
| -rw-r--r-- | services/pull/check_test.go | 4 | ||||
| -rw-r--r-- | services/pull/pull.go | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/services/pull/check.go b/services/pull/check.go index 8665b3e7df..5acee8174b 100644 --- a/services/pull/check.go +++ b/services/pull/check.go @@ -21,8 +21,6 @@ import ( "code.gitea.io/gitea/modules/queue" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" - - "github.com/unknwon/com" ) // prQueue represents a queue to handle update pull request tests @@ -203,14 +201,13 @@ func InitializePullRequests(ctx context.Context) { // handle passed PR IDs and test the PRs func handle(data ...queue.Data) { for _, datum := range data { - prID := datum.(string) - id := com.StrTo(prID).MustInt64() + id, _ := strconv.ParseInt(datum.(string), 10, 64) log.Trace("Testing PR ID %d from the pull requests patch checking queue", id) pr, err := models.GetPullRequestByID(id) if err != nil { - log.Error("GetPullRequestByID[%s]: %v", prID, err) + log.Error("GetPullRequestByID[%s]: %v", datum, err) continue } else if pr.HasMerged { continue diff --git a/services/pull/check_test.go b/services/pull/check_test.go index 1bddc0b592..33a230e5ab 100644 --- a/services/pull/check_test.go +++ b/services/pull/check_test.go @@ -15,7 +15,6 @@ import ( "code.gitea.io/gitea/modules/queue" "github.com/stretchr/testify/assert" - "github.com/unknwon/com" ) func TestPullRequest_AddToTaskQueue(t *testing.T) { @@ -25,8 +24,7 @@ func TestPullRequest_AddToTaskQueue(t *testing.T) { q, err := queue.NewChannelUniqueQueue(func(data ...queue.Data) { for _, datum := range data { - prID := datum.(string) - id := com.StrTo(prID).MustInt64() + id, _ := strconv.ParseInt(datum.(string), 10, 64) idChan <- id } }, queue.ChannelUniqueQueueConfiguration{ diff --git a/services/pull/pull.go b/services/pull/pull.go index 99db078420..476c5dad54 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -21,8 +21,6 @@ import ( "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/setting" issue_service "code.gitea.io/gitea/services/issue" - - "github.com/unknwon/com" ) // NewPullRequest creates new pull request with labels for repository. @@ -326,7 +324,7 @@ func checkIfPRContentChanged(pr *models.PullRequest, oldCommitID, newCommitID st defer headGitRepo.Close() // Add a temporary remote. - tmpRemote := "checkIfPRContentChanged-" + com.ToStr(time.Now().UnixNano()) + tmpRemote := "checkIfPRContentChanged-" + fmt.Sprint(time.Now().UnixNano()) if err = headGitRepo.AddRemote(tmpRemote, pr.BaseRepo.RepoPath(), true); err != nil { return false, fmt.Errorf("AddRemote: %s/%s-%s: %v", pr.HeadRepo.OwnerName, pr.HeadRepo.Name, tmpRemote, err) } |