diff options
Diffstat (limited to 'services/issue/commit.go')
| -rw-r--r-- | services/issue/commit.go | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/services/issue/commit.go b/services/issue/commit.go index 7a8c71e609..e493a03211 100644 --- a/services/issue/commit.go +++ b/services/issue/commit.go @@ -4,6 +4,7 @@ package issue import ( + "context" "fmt" "html" "net/url" @@ -12,7 +13,6 @@ import ( "strings" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" @@ -78,20 +78,20 @@ func timeLogToAmount(str string) int64 { return a } -func issueAddTime(issue *issues_model.Issue, doer *user_model.User, time time.Time, timeLog string) error { +func issueAddTime(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, time time.Time, timeLog string) error { amount := timeLogToAmount(timeLog) if amount == 0 { return nil } - _, err := issues_model.AddTime(doer, issue, amount, time) + _, err := issues_model.AddTime(ctx, doer, issue, amount, time) return err } // getIssueFromRef returns the issue referenced by a ref. Returns a nil *Issue // if the provided ref references a non-existent issue. -func getIssueFromRef(repo *repo_model.Repository, index int64) (*issues_model.Issue, error) { - issue, err := issues_model.GetIssueByIndex(repo.ID, index) +func getIssueFromRef(ctx context.Context, repo *repo_model.Repository, index int64) (*issues_model.Issue, error) { + issue, err := issues_model.GetIssueByIndex(ctx, repo.ID, index) if err != nil { if issues_model.IsErrIssueNotExist(err) { return nil, nil @@ -102,7 +102,7 @@ func getIssueFromRef(repo *repo_model.Repository, index int64) (*issues_model.Is } // UpdateIssuesCommit checks if issues are manipulated by commit message. -func UpdateIssuesCommit(doer *user_model.User, repo *repo_model.Repository, commits []*repository.PushCommit, branchName string) error { +func UpdateIssuesCommit(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, commits []*repository.PushCommit, branchName string) error { // Commits are appended in the reverse order. for i := len(commits) - 1; i >= 0; i-- { c := commits[i] @@ -120,7 +120,7 @@ func UpdateIssuesCommit(doer *user_model.User, repo *repo_model.Repository, comm // issue is from another repo if len(ref.Owner) > 0 && len(ref.Name) > 0 { - refRepo, err = repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, ref.Owner, ref.Name) + refRepo, err = repo_model.GetRepositoryByOwnerAndName(ctx, ref.Owner, ref.Name) if err != nil { if repo_model.IsErrRepoNotExist(err) { log.Warn("Repository referenced in commit but does not exist: %v", err) @@ -132,14 +132,14 @@ func UpdateIssuesCommit(doer *user_model.User, repo *repo_model.Repository, comm } else { refRepo = repo } - if refIssue, err = getIssueFromRef(refRepo, ref.Index); err != nil { + if refIssue, err = getIssueFromRef(ctx, refRepo, ref.Index); err != nil { return err } if refIssue == nil { continue } - perm, err := access_model.GetUserRepoPermission(db.DefaultContext, refRepo, doer) + perm, err := access_model.GetUserRepoPermission(ctx, refRepo, doer) if err != nil { return err } @@ -159,7 +159,7 @@ func UpdateIssuesCommit(doer *user_model.User, repo *repo_model.Repository, comm } message := fmt.Sprintf(`<a href="%s/commit/%s">%s</a>`, html.EscapeString(repo.Link()), html.EscapeString(url.PathEscape(c.Sha1)), html.EscapeString(strings.SplitN(c.Message, "\n", 2)[0])) - if err = CreateRefComment(doer, refRepo, refIssue, message, c.Sha1); err != nil { + if err = CreateRefComment(ctx, doer, refRepo, refIssue, message, c.Sha1); err != nil { return err } @@ -187,13 +187,13 @@ func UpdateIssuesCommit(doer *user_model.User, repo *repo_model.Repository, comm } close := ref.Action == references.XRefActionCloses if close && len(ref.TimeLog) > 0 { - if err := issueAddTime(refIssue, doer, c.Timestamp, ref.TimeLog); err != nil { + if err := issueAddTime(ctx, refIssue, doer, c.Timestamp, ref.TimeLog); err != nil { return err } } if close != refIssue.IsClosed { refIssue.Repo = refRepo - if err := ChangeStatus(refIssue, doer, c.Sha1, close); err != nil { + if err := ChangeStatus(ctx, refIssue, doer, c.Sha1, close); err != nil { return err } } |