mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)
Found using
`find . -type f -name '*.go' -print -exec vim {} -c
':%s/fmt\.Errorf(\(.*\)%v\(.*\)err/fmt.Errorf(\1%w\2err/g' -c ':wq' \;`
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
			
			
This commit is contained in:
		| @@ -84,14 +84,14 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error { | ||||
|  | ||||
| 	repo, err := repo_model.GetRepositoryByOwnerAndName(optsList[0].RepoUserName, optsList[0].RepoName) | ||||
| 	if err != nil { | ||||
| 		return fmt.Errorf("GetRepositoryByOwnerAndName failed: %v", err) | ||||
| 		return fmt.Errorf("GetRepositoryByOwnerAndName failed: %w", err) | ||||
| 	} | ||||
|  | ||||
| 	repoPath := repo.RepoPath() | ||||
|  | ||||
| 	gitRepo, err := git.OpenRepository(ctx, repoPath) | ||||
| 	if err != nil { | ||||
| 		return fmt.Errorf("OpenRepository[%s]: %v", repoPath, err) | ||||
| 		return fmt.Errorf("OpenRepository[%s]: %w", repoPath, err) | ||||
| 	} | ||||
| 	defer gitRepo.Close() | ||||
|  | ||||
| @@ -129,7 +129,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error { | ||||
| 			} else { // is new tag | ||||
| 				newCommit, err := gitRepo.GetCommit(opts.NewCommitID) | ||||
| 				if err != nil { | ||||
| 					return fmt.Errorf("gitRepo.GetCommit: %v", err) | ||||
| 					return fmt.Errorf("gitRepo.GetCommit: %w", err) | ||||
| 				} | ||||
|  | ||||
| 				commits := repo_module.NewPushCommits() | ||||
| @@ -162,7 +162,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error { | ||||
|  | ||||
| 				newCommit, err := gitRepo.GetCommit(opts.NewCommitID) | ||||
| 				if err != nil { | ||||
| 					return fmt.Errorf("gitRepo.GetCommit: %v", err) | ||||
| 					return fmt.Errorf("gitRepo.GetCommit: %w", err) | ||||
| 				} | ||||
|  | ||||
| 				refName := opts.RefName() | ||||
| @@ -182,19 +182,19 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error { | ||||
| 						} | ||||
| 						// Update the is empty and default_branch columns | ||||
| 						if err := repo_model.UpdateRepositoryCols(db.DefaultContext, repo, "default_branch", "is_empty"); err != nil { | ||||
| 							return fmt.Errorf("UpdateRepositoryCols: %v", err) | ||||
| 							return fmt.Errorf("UpdateRepositoryCols: %w", err) | ||||
| 						} | ||||
| 					} | ||||
|  | ||||
| 					l, err = newCommit.CommitsBeforeLimit(10) | ||||
| 					if err != nil { | ||||
| 						return fmt.Errorf("newCommit.CommitsBeforeLimit: %v", err) | ||||
| 						return fmt.Errorf("newCommit.CommitsBeforeLimit: %w", err) | ||||
| 					} | ||||
| 					notification.NotifyCreateRef(pusher, repo, "branch", opts.RefFullName, opts.NewCommitID) | ||||
| 				} else { | ||||
| 					l, err = newCommit.CommitsBeforeUntil(opts.OldCommitID) | ||||
| 					if err != nil { | ||||
| 						return fmt.Errorf("newCommit.CommitsBeforeUntil: %v", err) | ||||
| 						return fmt.Errorf("newCommit.CommitsBeforeUntil: %w", err) | ||||
| 					} | ||||
|  | ||||
| 					isForce, err := repo_module.IsForcePush(ctx, opts) | ||||
| @@ -277,12 +277,12 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error { | ||||
| 		} | ||||
| 	} | ||||
| 	if err := PushUpdateAddDeleteTags(repo, gitRepo, addTags, delTags); err != nil { | ||||
| 		return fmt.Errorf("PushUpdateAddDeleteTags: %v", err) | ||||
| 		return fmt.Errorf("PushUpdateAddDeleteTags: %w", err) | ||||
| 	} | ||||
|  | ||||
| 	// Change repository last updated time. | ||||
| 	if err := repo_model.UpdateRepositoryUpdatedTime(repo.ID, time.Now()); err != nil { | ||||
| 		return fmt.Errorf("UpdateRepositoryUpdatedTime: %v", err) | ||||
| 		return fmt.Errorf("UpdateRepositoryUpdatedTime: %w", err) | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| @@ -311,7 +311,7 @@ func pushUpdateAddTags(ctx context.Context, repo *repo_model.Repository, gitRepo | ||||
|  | ||||
| 	releases, err := repo_model.GetReleasesByRepoIDAndNames(ctx, repo.ID, lowerTags) | ||||
| 	if err != nil { | ||||
| 		return fmt.Errorf("GetReleasesByRepoIDAndNames: %v", err) | ||||
| 		return fmt.Errorf("GetReleasesByRepoIDAndNames: %w", err) | ||||
| 	} | ||||
| 	relMap := make(map[string]*repo_model.Release) | ||||
| 	for _, rel := range releases { | ||||
| @@ -325,11 +325,11 @@ func pushUpdateAddTags(ctx context.Context, repo *repo_model.Repository, gitRepo | ||||
| 	for i, lowerTag := range lowerTags { | ||||
| 		tag, err := gitRepo.GetTag(tags[i]) | ||||
| 		if err != nil { | ||||
| 			return fmt.Errorf("GetTag: %v", err) | ||||
| 			return fmt.Errorf("GetTag: %w", err) | ||||
| 		} | ||||
| 		commit, err := tag.Commit(gitRepo) | ||||
| 		if err != nil { | ||||
| 			return fmt.Errorf("Commit: %v", err) | ||||
| 			return fmt.Errorf("Commit: %w", err) | ||||
| 		} | ||||
|  | ||||
| 		sig := tag.Tagger | ||||
| @@ -348,7 +348,7 @@ func pushUpdateAddTags(ctx context.Context, repo *repo_model.Repository, gitRepo | ||||
| 			if !ok { | ||||
| 				author, err = user_model.GetUserByEmailContext(ctx, sig.Email) | ||||
| 				if err != nil && !user_model.IsErrUserNotExist(err) { | ||||
| 					return fmt.Errorf("GetUserByEmail: %v", err) | ||||
| 					return fmt.Errorf("GetUserByEmail: %w", err) | ||||
| 				} | ||||
| 				if author != nil { | ||||
| 					emailToUser[sig.Email] = author | ||||
| @@ -359,7 +359,7 @@ func pushUpdateAddTags(ctx context.Context, repo *repo_model.Repository, gitRepo | ||||
|  | ||||
| 		commitsCount, err := commit.CommitsCount() | ||||
| 		if err != nil { | ||||
| 			return fmt.Errorf("CommitsCount: %v", err) | ||||
| 			return fmt.Errorf("CommitsCount: %w", err) | ||||
| 		} | ||||
|  | ||||
| 		rel, has := relMap[lowerTag] | ||||
| @@ -393,14 +393,14 @@ func pushUpdateAddTags(ctx context.Context, repo *repo_model.Repository, gitRepo | ||||
| 				rel.PublisherID = author.ID | ||||
| 			} | ||||
| 			if err = repo_model.UpdateRelease(ctx, rel); err != nil { | ||||
| 				return fmt.Errorf("Update: %v", err) | ||||
| 				return fmt.Errorf("Update: %w", err) | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	if len(newReleases) > 0 { | ||||
| 		if err = db.Insert(ctx, newReleases); err != nil { | ||||
| 			return fmt.Errorf("Insert: %v", err) | ||||
| 			return fmt.Errorf("Insert: %w", err) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user