1 files changed, 85 insertions, 121 deletions

diff --git a/models/issues/issue_label.go b/models/issues/issue_label.go
index f082079e07..151469a9b8 100644
--- a/models/issues/issue_label.go
+++ b/models/issues/issue_label.go
@@ -88,36 +88,28 @@ func NewIssueLabel(ctx context.Context, issue *Issue, label *Label, doer *user_m
 		return nil
 	}
 
-	ctx, committer, err := db.TxContext(ctx)
-	if err != nil {
-		return err
-	}
-	defer committer.Close()
-
-	if err = issue.LoadRepo(ctx); err != nil {
-		return err
-	}
-
-	// Do NOT add invalid labels
-	if issue.RepoID != label.RepoID && issue.Repo.OwnerID != label.OrgID {
-		return nil
-	}
+	return db.WithTx(ctx, func(ctx context.Context) error {
+		if err = issue.LoadRepo(ctx); err != nil {
+			return err
+		}
 
-	if err = RemoveDuplicateExclusiveIssueLabels(ctx, issue, label, doer); err != nil {
-		return nil
-	}
+		// Do NOT add invalid labels
+		if issue.RepoID != label.RepoID && issue.Repo.OwnerID != label.OrgID {
+			return nil
+		}
 
-	if err = newIssueLabel(ctx, issue, label, doer); err != nil {
-		return err
-	}
+		if err = RemoveDuplicateExclusiveIssueLabels(ctx, issue, label, doer); err != nil {
+			return nil
+		}
 
-	issue.isLabelsLoaded = false
-	issue.Labels = nil
-	if err = issue.LoadLabels(ctx); err != nil {
-		return err
-	}
+		if err = newIssueLabel(ctx, issue, label, doer); err != nil {
+			return err
+		}
 
-	return committer.Commit()
+		issue.isLabelsLoaded = false
+		issue.Labels = nil
+		return issue.LoadLabels(ctx)
+	})
 }
 
 // newIssueLabels add labels to an issue. It will check if the labels are valid for the issue
@@ -151,24 +143,16 @@ func newIssueLabels(ctx context.Context, issue *Issue, labels []*Label, doer *us
 
 // NewIssueLabels creates a list of issue-label relations.
 func NewIssueLabels(ctx context.Context, issue *Issue, labels []*Label, doer *user_model.User) (err error) {
-	ctx, committer, err := db.TxContext(ctx)
-	if err != nil {
-		return err
-	}
-	defer committer.Close()
-
-	if err = newIssueLabels(ctx, issue, labels, doer); err != nil {
-		return err
-	}
-
-	// reload all labels
-	issue.isLabelsLoaded = false
-	issue.Labels = nil
-	if err = issue.LoadLabels(ctx); err != nil {
-		return err
-	}
+	return db.WithTx(ctx, func(ctx context.Context) error {
+		if err = newIssueLabels(ctx, issue, labels, doer); err != nil {
+			return err
+		}
 
-	return committer.Commit()
+		// reload all labels
+		issue.isLabelsLoaded = false
+		issue.Labels = nil
+		return issue.LoadLabels(ctx)
+	})
 }
 
 func deleteIssueLabel(ctx context.Context, issue *Issue, label *Label, doer *user_model.User) (err error) {
@@ -365,35 +349,23 @@ func clearIssueLabels(ctx context.Context, issue *Issue, doer *user_model.User)
 // ClearIssueLabels removes all issue labels as the given user.
 // Triggers appropriate WebHooks, if any.
 func ClearIssueLabels(ctx context.Context, issue *Issue, doer *user_model.User) (err error) {
-	ctx, committer, err := db.TxContext(ctx)
-	if err != nil {
-		return err
-	}
-	defer committer.Close()
-
-	if err := issue.LoadRepo(ctx); err != nil {
-		return err
-	} else if err = issue.LoadPullRequest(ctx); err != nil {
-		return err
-	}
-
-	perm, err := access_model.GetUserRepoPermission(ctx, issue.Repo, doer)
-	if err != nil {
-		return err
-	}
-	if !perm.CanWriteIssuesOrPulls(issue.IsPull) {
-		return ErrRepoLabelNotExist{}
-	}
-
-	if err = clearIssueLabels(ctx, issue, doer); err != nil {
-		return err
-	}
+	return db.WithTx(ctx, func(ctx context.Context) error {
+		if err := issue.LoadRepo(ctx); err != nil {
+			return err
+		} else if err = issue.LoadPullRequest(ctx); err != nil {
+			return err
+		}
 
-	if err = committer.Commit(); err != nil {
-		return fmt.Errorf("Commit: %w", err)
-	}
+		perm, err := access_model.GetUserRepoPermission(ctx, issue.Repo, doer)
+		if err != nil {
+			return err
+		}
+		if !perm.CanWriteIssuesOrPulls(issue.IsPull) {
+			return ErrRepoLabelNotExist{}
+		}
 
-	return nil
+		return clearIssueLabels(ctx, issue, doer)
+	})
 }
 
 type labelSorter []*Label
@@ -438,69 +410,61 @@ func RemoveDuplicateExclusiveLabels(labels []*Label) []*Label {
 // ReplaceIssueLabels removes all current labels and add new labels to the issue.
 // Triggers appropriate WebHooks, if any.
 func ReplaceIssueLabels(ctx context.Context, issue *Issue, labels []*Label, doer *user_model.User) (err error) {
-	ctx, committer, err := db.TxContext(ctx)
-	if err != nil {
-		return err
-	}
-	defer committer.Close()
+	return db.WithTx(ctx, func(ctx context.Context) error {
+		if err = issue.LoadRepo(ctx); err != nil {
+			return err
+		}
 
-	if err = issue.LoadRepo(ctx); err != nil {
-		return err
-	}
+		if err = issue.LoadLabels(ctx); err != nil {
+			return err
+		}
 
-	if err = issue.LoadLabels(ctx); err != nil {
-		return err
-	}
+		labels = RemoveDuplicateExclusiveLabels(labels)
 
-	labels = RemoveDuplicateExclusiveLabels(labels)
+		sort.Sort(labelSorter(labels))
+		sort.Sort(labelSorter(issue.Labels))
 
-	sort.Sort(labelSorter(labels))
-	sort.Sort(labelSorter(issue.Labels))
+		var toAdd, toRemove []*Label
 
-	var toAdd, toRemove []*Label
+		addIndex, removeIndex := 0, 0
+		for addIndex < len(labels) && removeIndex < len(issue.Labels) {
+			addLabel := labels[addIndex]
+			removeLabel := issue.Labels[removeIndex]
+			if addLabel.ID == removeLabel.ID {
+				// Silently drop invalid labels
+				if removeLabel.RepoID != issue.RepoID && removeLabel.OrgID != issue.Repo.OwnerID {
+					toRemove = append(toRemove, removeLabel)
+				}
 
-	addIndex, removeIndex := 0, 0
-	for addIndex < len(labels) && removeIndex < len(issue.Labels) {
-		addLabel := labels[addIndex]
-		removeLabel := issue.Labels[removeIndex]
-		if addLabel.ID == removeLabel.ID {
-			// Silently drop invalid labels
-			if removeLabel.RepoID != issue.RepoID && removeLabel.OrgID != issue.Repo.OwnerID {
+				addIndex++
+				removeIndex++
+			} else if addLabel.ID < removeLabel.ID {
+				// Only add if the label is valid
+				if addLabel.RepoID == issue.RepoID || addLabel.OrgID == issue.Repo.OwnerID {
+					toAdd = append(toAdd, addLabel)
+				}
+				addIndex++
+			} else {
 				toRemove = append(toRemove, removeLabel)
+				removeIndex++
 			}
-
-			addIndex++
-			removeIndex++
-		} else if addLabel.ID < removeLabel.ID {
-			// Only add if the label is valid
-			if addLabel.RepoID == issue.RepoID || addLabel.OrgID == issue.Repo.OwnerID {
-				toAdd = append(toAdd, addLabel)
-			}
-			addIndex++
-		} else {
-			toRemove = append(toRemove, removeLabel)
-			removeIndex++
 		}
-	}
-	toAdd = append(toAdd, labels[addIndex:]...)
-	toRemove = append(toRemove, issue.Labels[removeIndex:]...)
+		toAdd = append(toAdd, labels[addIndex:]...)
+		toRemove = append(toRemove, issue.Labels[removeIndex:]...)
 
-	if len(toAdd) > 0 {
-		if err = newIssueLabels(ctx, issue, toAdd, doer); err != nil {
-			return fmt.Errorf("addLabels: %w", err)
+		if len(toAdd) > 0 {
+			if err = newIssueLabels(ctx, issue, toAdd, doer); err != nil {
+				return fmt.Errorf("addLabels: %w", err)
+			}
 		}
-	}
 
-	for _, l := range toRemove {
-		if err = deleteIssueLabel(ctx, issue, l, doer); err != nil {
-			return fmt.Errorf("removeLabel: %w", err)
+		for _, l := range toRemove {
+			if err = deleteIssueLabel(ctx, issue, l, doer); err != nil {
+				return fmt.Errorf("removeLabel: %w", err)
+			}
 		}
-	}
-
-	issue.Labels = nil
-	if err = issue.LoadLabels(ctx); err != nil {
-		return err
-	}
 
-	return committer.Commit()
+		issue.Labels = nil
+		return issue.LoadLabels(ctx)
+	})
 }