Fix IsErrPullClosed (#10093)

lunny · web-flow · commit 107a694fd6cc · 2020-02-01T11:24:26.000Z
diff --git a/services/pull/pull.go b/services/pull/pull.go
@@ -407,7 +407,7 @@ func CloseBranchPulls(doer *models.User, repoID int64, branch string) error {
 
 	var errs errlist
 	for _, pr := range prs {
-		if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrIssueWasClosed(err) {
+		if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrPullWasClosed(err) {
 			errs = append(errs, err)
 		}
 	}
@@ -436,7 +436,7 @@ func CloseRepoBranchesPulls(doer *models.User, repo *models.Repository) error {
 		}
 
 		for _, pr := range prs {
-			if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrIssueWasClosed(err) {
+			if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrPullWasClosed(err) {
 				errs = append(errs, err)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ func CloseBranchPulls(doer *models.User, repoID int64, branch string) error {`
`407`	`407`
`408`	`408`	`var errs errlist`
`409`	`409`	`for _, pr := range prs {`
`410`		`- if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrIssueWasClosed(err) {`
	`410`	`+ if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrPullWasClosed(err) {`
`411`	`411`	`errs = append(errs, err)`
`412`	`412`	`}`
`413`	`413`	`}`
`@@ -436,7 +436,7 @@ func CloseRepoBranchesPulls(doer models.User, repo models.Repository) error {`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`for _, pr := range prs {`
`439`		`- if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrIssueWasClosed(err) {`
	`439`	`+ if err = issue_service.ChangeStatus(pr.Issue, doer, true); err != nil && !models.IsErrPullWasClosed(err) {`
`440`	`440`	`errs = append(errs, err)`
`441`	`441`	`}`
`442`	`442`	`}`