mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-03 08:02:36 +09:00 
			
		
		
		
	Backport #23219 When fetching remotes for conflict checking, skip unnecessary and potentially slow writing of commit graphs. In a test with the Blender repository, this reduces conflict checking time for one pull request from about 2s to 0.1s. Co-authored-by: Brecht Van Lommel <brecht@blender.org>
		
			
				
	
	
		
			202 lines
		
	
	
		
			8.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			202 lines
		
	
	
		
			8.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
// Copyright 2019 The Gitea Authors.
 | 
						|
// All rights reserved.
 | 
						|
// SPDX-License-Identifier: MIT
 | 
						|
 | 
						|
package pull
 | 
						|
 | 
						|
import (
 | 
						|
	"context"
 | 
						|
	"fmt"
 | 
						|
	"os"
 | 
						|
	"path/filepath"
 | 
						|
	"strings"
 | 
						|
 | 
						|
	"code.gitea.io/gitea/models"
 | 
						|
	issues_model "code.gitea.io/gitea/models/issues"
 | 
						|
	repo_model "code.gitea.io/gitea/models/repo"
 | 
						|
	"code.gitea.io/gitea/modules/git"
 | 
						|
	"code.gitea.io/gitea/modules/log"
 | 
						|
	repo_module "code.gitea.io/gitea/modules/repository"
 | 
						|
)
 | 
						|
 | 
						|
// createTemporaryRepo creates a temporary repo with "base" for pr.BaseBranch and "tracking" for  pr.HeadBranch
 | 
						|
// it also create a second base branch called "original_base"
 | 
						|
func createTemporaryRepo(ctx context.Context, pr *issues_model.PullRequest) (string, error) {
 | 
						|
	if err := pr.LoadHeadRepo(ctx); err != nil {
 | 
						|
		log.Error("LoadHeadRepo: %v", err)
 | 
						|
		return "", fmt.Errorf("LoadHeadRepo: %w", err)
 | 
						|
	} else if pr.HeadRepo == nil {
 | 
						|
		log.Error("Pr %d HeadRepo %d does not exist", pr.ID, pr.HeadRepoID)
 | 
						|
		return "", &repo_model.ErrRepoNotExist{
 | 
						|
			ID: pr.HeadRepoID,
 | 
						|
		}
 | 
						|
	} else if err := pr.LoadBaseRepo(ctx); err != nil {
 | 
						|
		log.Error("LoadBaseRepo: %v", err)
 | 
						|
		return "", fmt.Errorf("LoadBaseRepo: %w", err)
 | 
						|
	} else if pr.BaseRepo == nil {
 | 
						|
		log.Error("Pr %d BaseRepo %d does not exist", pr.ID, pr.BaseRepoID)
 | 
						|
		return "", &repo_model.ErrRepoNotExist{
 | 
						|
			ID: pr.BaseRepoID,
 | 
						|
		}
 | 
						|
	} else if err := pr.HeadRepo.LoadOwner(ctx); err != nil {
 | 
						|
		log.Error("HeadRepo.LoadOwner: %v", err)
 | 
						|
		return "", fmt.Errorf("HeadRepo.LoadOwner: %w", err)
 | 
						|
	} else if err := pr.BaseRepo.LoadOwner(ctx); err != nil {
 | 
						|
		log.Error("BaseRepo.LoadOwner: %v", err)
 | 
						|
		return "", fmt.Errorf("BaseRepo.LoadOwner: %w", err)
 | 
						|
	}
 | 
						|
 | 
						|
	// Clone base repo.
 | 
						|
	tmpBasePath, err := repo_module.CreateTemporaryPath("pull")
 | 
						|
	if err != nil {
 | 
						|
		log.Error("CreateTemporaryPath: %v", err)
 | 
						|
		return "", err
 | 
						|
	}
 | 
						|
 | 
						|
	baseRepoPath := pr.BaseRepo.RepoPath()
 | 
						|
	headRepoPath := pr.HeadRepo.RepoPath()
 | 
						|
 | 
						|
	if err := git.InitRepository(ctx, tmpBasePath, false); err != nil {
 | 
						|
		log.Error("git init tmpBasePath: %v", err)
 | 
						|
		if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
 | 
						|
			log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
 | 
						|
		}
 | 
						|
		return "", err
 | 
						|
	}
 | 
						|
 | 
						|
	remoteRepoName := "head_repo"
 | 
						|
	baseBranch := "base"
 | 
						|
 | 
						|
	fetchArgs := git.TrustedCmdArgs{"--no-tags"}
 | 
						|
	if git.CheckGitVersionAtLeast("2.25.0") == nil {
 | 
						|
		// Writing the commit graph can be slow and is not needed here
 | 
						|
		fetchArgs = append(fetchArgs, "--no-write-commit-graph")
 | 
						|
	}
 | 
						|
 | 
						|
	// Add head repo remote.
 | 
						|
	addCacheRepo := func(staging, cache string) error {
 | 
						|
		p := filepath.Join(staging, ".git", "objects", "info", "alternates")
 | 
						|
		f, err := os.OpenFile(p, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o600)
 | 
						|
		if err != nil {
 | 
						|
			log.Error("Could not create .git/objects/info/alternates file in %s: %v", staging, err)
 | 
						|
			return err
 | 
						|
		}
 | 
						|
		defer f.Close()
 | 
						|
		data := filepath.Join(cache, "objects")
 | 
						|
		if _, err := fmt.Fprintln(f, data); err != nil {
 | 
						|
			log.Error("Could not write to .git/objects/info/alternates file in %s: %v", staging, err)
 | 
						|
			return err
 | 
						|
		}
 | 
						|
		return nil
 | 
						|
	}
 | 
						|
 | 
						|
	if err := addCacheRepo(tmpBasePath, baseRepoPath); err != nil {
 | 
						|
		log.Error("Unable to add base repository to temporary repo [%s -> %s]: %v", pr.BaseRepo.FullName(), tmpBasePath, err)
 | 
						|
		if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
 | 
						|
			log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
 | 
						|
		}
 | 
						|
		return "", fmt.Errorf("Unable to add base repository to temporary repo [%s -> tmpBasePath]: %w", pr.BaseRepo.FullName(), err)
 | 
						|
	}
 | 
						|
 | 
						|
	var outbuf, errbuf strings.Builder
 | 
						|
	if err := git.NewCommand(ctx, "remote", "add", "-t").AddDynamicArguments(pr.BaseBranch).AddArguments("-m").AddDynamicArguments(pr.BaseBranch).AddDynamicArguments("origin", baseRepoPath).
 | 
						|
		Run(&git.RunOpts{
 | 
						|
			Dir:    tmpBasePath,
 | 
						|
			Stdout: &outbuf,
 | 
						|
			Stderr: &errbuf,
 | 
						|
		}); err != nil {
 | 
						|
		log.Error("Unable to add base repository as origin [%s -> %s]: %v\n%s\n%s", pr.BaseRepo.FullName(), tmpBasePath, err, outbuf.String(), errbuf.String())
 | 
						|
		if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
 | 
						|
			log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
 | 
						|
		}
 | 
						|
		return "", fmt.Errorf("Unable to add base repository as origin [%s -> tmpBasePath]: %w\n%s\n%s", pr.BaseRepo.FullName(), err, outbuf.String(), errbuf.String())
 | 
						|
	}
 | 
						|
	outbuf.Reset()
 | 
						|
	errbuf.Reset()
 | 
						|
 | 
						|
	if err := git.NewCommand(ctx, "fetch", "origin").AddArguments(fetchArgs...).AddDashesAndList(pr.BaseBranch+":"+baseBranch, pr.BaseBranch+":original_"+baseBranch).
 | 
						|
		Run(&git.RunOpts{
 | 
						|
			Dir:    tmpBasePath,
 | 
						|
			Stdout: &outbuf,
 | 
						|
			Stderr: &errbuf,
 | 
						|
		}); err != nil {
 | 
						|
		log.Error("Unable to fetch origin base branch [%s:%s -> base, original_base in %s]: %v:\n%s\n%s", pr.BaseRepo.FullName(), pr.BaseBranch, tmpBasePath, err, outbuf.String(), errbuf.String())
 | 
						|
		if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
 | 
						|
			log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
 | 
						|
		}
 | 
						|
		return "", fmt.Errorf("Unable to fetch origin base branch [%s:%s -> base, original_base in tmpBasePath]: %w\n%s\n%s", pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
 | 
						|
	}
 | 
						|
	outbuf.Reset()
 | 
						|
	errbuf.Reset()
 | 
						|
 | 
						|
	if err := git.NewCommand(ctx, "symbolic-ref").AddDynamicArguments("HEAD", git.BranchPrefix+baseBranch).
 | 
						|
		Run(&git.RunOpts{
 | 
						|
			Dir:    tmpBasePath,
 | 
						|
			Stdout: &outbuf,
 | 
						|
			Stderr: &errbuf,
 | 
						|
		}); err != nil {
 | 
						|
		log.Error("Unable to set HEAD as base branch [%s]: %v\n%s\n%s", tmpBasePath, err, outbuf.String(), errbuf.String())
 | 
						|
		if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
 | 
						|
			log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
 | 
						|
		}
 | 
						|
		return "", fmt.Errorf("Unable to set HEAD as base branch [tmpBasePath]: %w\n%s\n%s", err, outbuf.String(), errbuf.String())
 | 
						|
	}
 | 
						|
	outbuf.Reset()
 | 
						|
	errbuf.Reset()
 | 
						|
 | 
						|
	if err := addCacheRepo(tmpBasePath, headRepoPath); err != nil {
 | 
						|
		log.Error("Unable to add head repository to temporary repo [%s -> %s]: %v", pr.HeadRepo.FullName(), tmpBasePath, err)
 | 
						|
		if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
 | 
						|
			log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
 | 
						|
		}
 | 
						|
		return "", fmt.Errorf("Unable to head base repository to temporary repo [%s -> tmpBasePath]: %w", pr.HeadRepo.FullName(), err)
 | 
						|
	}
 | 
						|
 | 
						|
	if err := git.NewCommand(ctx, "remote", "add").AddDynamicArguments(remoteRepoName, headRepoPath).
 | 
						|
		Run(&git.RunOpts{
 | 
						|
			Dir:    tmpBasePath,
 | 
						|
			Stdout: &outbuf,
 | 
						|
			Stderr: &errbuf,
 | 
						|
		}); err != nil {
 | 
						|
		log.Error("Unable to add head repository as head_repo [%s -> %s]: %v\n%s\n%s", pr.HeadRepo.FullName(), tmpBasePath, err, outbuf.String(), errbuf.String())
 | 
						|
		if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
 | 
						|
			log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
 | 
						|
		}
 | 
						|
		return "", fmt.Errorf("Unable to add head repository as head_repo [%s -> tmpBasePath]: %w\n%s\n%s", pr.HeadRepo.FullName(), err, outbuf.String(), errbuf.String())
 | 
						|
	}
 | 
						|
	outbuf.Reset()
 | 
						|
	errbuf.Reset()
 | 
						|
 | 
						|
	trackingBranch := "tracking"
 | 
						|
	// Fetch head branch
 | 
						|
	var headBranch string
 | 
						|
	if pr.Flow == issues_model.PullRequestFlowGithub {
 | 
						|
		headBranch = git.BranchPrefix + pr.HeadBranch
 | 
						|
	} else if len(pr.HeadCommitID) == git.SHAFullLength { // for not created pull request
 | 
						|
		headBranch = pr.HeadCommitID
 | 
						|
	} else {
 | 
						|
		headBranch = pr.GetGitRefName()
 | 
						|
	}
 | 
						|
	if err := git.NewCommand(ctx, "fetch").AddArguments(fetchArgs...).AddDynamicArguments(remoteRepoName, headBranch+":"+trackingBranch).
 | 
						|
		Run(&git.RunOpts{
 | 
						|
			Dir:    tmpBasePath,
 | 
						|
			Stdout: &outbuf,
 | 
						|
			Stderr: &errbuf,
 | 
						|
		}); err != nil {
 | 
						|
		if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil {
 | 
						|
			log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err)
 | 
						|
		}
 | 
						|
		if !git.IsBranchExist(ctx, pr.HeadRepo.RepoPath(), pr.HeadBranch) {
 | 
						|
			return "", models.ErrBranchDoesNotExist{
 | 
						|
				BranchName: pr.HeadBranch,
 | 
						|
			}
 | 
						|
		}
 | 
						|
		log.Error("Unable to fetch head_repo head branch [%s:%s -> tracking in %s]: %v:\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, tmpBasePath, err, outbuf.String(), errbuf.String())
 | 
						|
		return "", fmt.Errorf("Unable to fetch head_repo head branch [%s:%s -> tracking in tmpBasePath]: %w\n%s\n%s", pr.HeadRepo.FullName(), headBranch, err, outbuf.String(), errbuf.String())
 | 
						|
	}
 | 
						|
	outbuf.Reset()
 | 
						|
	errbuf.Reset()
 | 
						|
 | 
						|
	return tmpBasePath, nil
 | 
						|
}
 |