mirror of
				https://gitea.com/gitea/tea.git
				synced 2025-10-30 16:55:25 +01:00 
			
		
		
		
	Introduce workaround for missing pull head sha (#340)
fix #318 test with `tea pr 58` Co-authored-by: Norwin Roosen <git@nroo.de> Reviewed-on: https://gitea.com/gitea/tea/pulls/340 Reviewed-by: Norwin <noerw@noreply.gitea.io> Reviewed-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de> Co-committed-by: 6543 <6543@obermui.de>
This commit is contained in:
		| @@ -12,6 +12,7 @@ import ( | |||||||
| 	"code.gitea.io/tea/modules/interact" | 	"code.gitea.io/tea/modules/interact" | ||||||
| 	"code.gitea.io/tea/modules/print" | 	"code.gitea.io/tea/modules/print" | ||||||
| 	"code.gitea.io/tea/modules/utils" | 	"code.gitea.io/tea/modules/utils" | ||||||
|  | 	"code.gitea.io/tea/modules/workaround" | ||||||
|  |  | ||||||
| 	"code.gitea.io/sdk/gitea" | 	"code.gitea.io/sdk/gitea" | ||||||
| 	"github.com/urfave/cli/v2" | 	"github.com/urfave/cli/v2" | ||||||
| @@ -65,6 +66,9 @@ func runPullDetail(cmd *cli.Context, index string) error { | |||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return err | 		return err | ||||||
| 	} | 	} | ||||||
|  | 	if err := workaround.FixPullHeadSha(client, pr); err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	reviews, _, err := client.ListPullReviews(ctx.Owner, ctx.Repo, idx, gitea.ListPullReviewsOptions{}) | 	reviews, _, err := client.ListPullReviews(ctx.Owner, ctx.Repo, idx, gitea.ListPullReviewsOptions{}) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
|   | |||||||
| @@ -9,6 +9,7 @@ import ( | |||||||
|  |  | ||||||
| 	"code.gitea.io/tea/modules/config" | 	"code.gitea.io/tea/modules/config" | ||||||
| 	local_git "code.gitea.io/tea/modules/git" | 	local_git "code.gitea.io/tea/modules/git" | ||||||
|  | 	"code.gitea.io/tea/modules/workaround" | ||||||
|  |  | ||||||
| 	"github.com/go-git/go-git/v5" | 	"github.com/go-git/go-git/v5" | ||||||
| 	git_plumbing "github.com/go-git/go-git/v5/plumbing" | 	git_plumbing "github.com/go-git/go-git/v5/plumbing" | ||||||
| @@ -28,6 +29,10 @@ func PullCheckout(login *config.Login, repoOwner, repoName string, forceCreateBr | |||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return err | 		return err | ||||||
| 	} | 	} | ||||||
|  | 	if err := workaround.FixPullHeadSha(client, pr); err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	remoteDeleted := pr.Head.Ref == fmt.Sprintf("refs/pull/%d/head", pr.Index) | 	remoteDeleted := pr.Head.Ref == fmt.Sprintf("refs/pull/%d/head", pr.Index) | ||||||
| 	if remoteDeleted { | 	if remoteDeleted { | ||||||
| 		return fmt.Errorf("Can't checkout: remote head branch was already deleted") | 		return fmt.Errorf("Can't checkout: remote head branch was already deleted") | ||||||
|   | |||||||
| @@ -9,6 +9,7 @@ import ( | |||||||
|  |  | ||||||
| 	"code.gitea.io/tea/modules/config" | 	"code.gitea.io/tea/modules/config" | ||||||
| 	local_git "code.gitea.io/tea/modules/git" | 	local_git "code.gitea.io/tea/modules/git" | ||||||
|  | 	"code.gitea.io/tea/modules/workaround" | ||||||
|  |  | ||||||
| 	"code.gitea.io/sdk/gitea" | 	"code.gitea.io/sdk/gitea" | ||||||
| 	git_config "github.com/go-git/go-git/v5/config" | 	git_config "github.com/go-git/go-git/v5/config" | ||||||
| @@ -33,6 +34,10 @@ func PullClean(login *config.Login, repoOwner, repoName string, index int64, ign | |||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return err | 		return err | ||||||
| 	} | 	} | ||||||
|  | 	if err := workaround.FixPullHeadSha(client, pr); err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	if pr.State == gitea.StateOpen { | 	if pr.State == gitea.StateOpen { | ||||||
| 		return fmt.Errorf("PR is still open, won't delete branches") | 		return fmt.Errorf("PR is still open, won't delete branches") | ||||||
| 	} | 	} | ||||||
|   | |||||||
							
								
								
									
										30
									
								
								modules/workaround/pull.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								modules/workaround/pull.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,30 @@ | |||||||
|  | // Copyright 2021 The Gitea Authors. All rights reserved. | ||||||
|  | // Use of this source code is governed by a MIT-style | ||||||
|  | // license that can be found in the LICENSE file. | ||||||
|  |  | ||||||
|  | package workaround | ||||||
|  |  | ||||||
|  | import ( | ||||||
|  | 	"fmt" | ||||||
|  |  | ||||||
|  | 	"code.gitea.io/sdk/gitea" | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | // FixPullHeadSha is a workaround for https://github.com/go-gitea/gitea/issues/12675 | ||||||
|  | // When no head sha is available, this is because the branch got deleted in the base repo. | ||||||
|  | // pr.Head.Ref points in this case not to the head repo branch name, but the base repo ref, | ||||||
|  | // which stays available to resolve the commit sha. | ||||||
|  | func FixPullHeadSha(client *gitea.Client, pr *gitea.PullRequest) error { | ||||||
|  | 	owner := pr.Base.Repository.Owner.UserName | ||||||
|  | 	repo := pr.Base.Repository.Name | ||||||
|  | 	if pr.Head != nil && pr.Head.Sha == "" { | ||||||
|  | 		refs, _, err := client.GetRepoRefs(owner, repo, pr.Head.Ref) | ||||||
|  | 		if err != nil { | ||||||
|  | 			return err | ||||||
|  | 		} else if len(refs) == 0 { | ||||||
|  | 			return fmt.Errorf("unable to resolve PR ref '%s'", pr.Head.Ref) | ||||||
|  | 		} | ||||||
|  | 		pr.Head.Sha = refs[0].Object.SHA | ||||||
|  | 	} | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
		Reference in New Issue
	
	Block a user
	 6543
					6543