mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	* Use go-git for tree reading and commit info lookup. Signed-off-by: Filip Navara <navara@emclient.com> * Use TreeEntry.IsRegular() instead of ObjectType that was removed. Signed-off-by: Filip Navara <navara@emclient.com> * Use the treePath to optimize commit info search. Signed-off-by: Filip Navara <navara@emclient.com> * Extract the latest commit at treePath along with the other commits. Signed-off-by: Filip Navara <navara@emclient.com> * Fix listing commit info for a directory that was created in one commit and never modified after. Signed-off-by: Filip Navara <navara@emclient.com> * Avoid nearly all external 'git' invocations when doing directory listing (.editorconfig code path is still hit). Signed-off-by: Filip Navara <navara@emclient.com> * Use go-git for reading blobs. Signed-off-by: Filip Navara <navara@emclient.com> * Make SHA1 type alias for plumbing.Hash in go-git. Signed-off-by: Filip Navara <navara@emclient.com> * Make Signature type alias for object.Signature in go-git. Signed-off-by: Filip Navara <navara@emclient.com> * Fix GetCommitsInfo for repository with only one commit. Signed-off-by: Filip Navara <navara@emclient.com> * Fix PGP signature verification. Signed-off-by: Filip Navara <navara@emclient.com> * Fix issues with walking commit graph across merges. Signed-off-by: Filip Navara <navara@emclient.com> * Fix typo in condition. Signed-off-by: Filip Navara <navara@emclient.com> * Speed up loading branch list by keeping the repository reference (and thus all the loaded packfile indexes). Signed-off-by: Filip Navara <navara@emclient.com> * Fix lising submodules. Signed-off-by: Filip Navara <navara@emclient.com> * Fix build Signed-off-by: Filip Navara <navara@emclient.com> * Add back commit cache because of name-rev Signed-off-by: Filip Navara <navara@emclient.com> * Fix tests Signed-off-by: Filip Navara <navara@emclient.com> * Fix code style * Fix spelling * Address PR feedback Signed-off-by: Filip Navara <navara@emclient.com> * Update vendor module list Signed-off-by: Filip Navara <navara@emclient.com> * Fix getting trees by commit id Signed-off-by: Filip Navara <navara@emclient.com> * Fix remaining unit test failures * Fix GetTreeBySHA * Avoid running `git name-rev` if not necessary Signed-off-by: Filip Navara <navara@emclient.com> * Move Branch code to git module * Clean up GPG signature verification and fix it for tagged commits * Address PR feedback (import formatting, copyright headers) * Make blob lookup by SHA working * Update tests to use public API * Allow getting content from any type of object through the blob interface * Change test to actually expect the object content that is in the GIT repository * Change one more test to actually expect the object content that is in the GIT repository * Add comments
		
			
				
	
	
		
			232 lines
		
	
	
		
			7.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			232 lines
		
	
	
		
			7.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2016 The Gogs Authors. All rights reserved.
 | |
| // Copyright 2019 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 models
 | |
| 
 | |
| import (
 | |
| 	"fmt"
 | |
| 	"time"
 | |
| 
 | |
| 	"code.gitea.io/gitea/modules/git"
 | |
| 	"code.gitea.io/gitea/modules/setting"
 | |
| 
 | |
| 	"github.com/Unknwon/com"
 | |
| )
 | |
| 
 | |
| // discardLocalRepoBranchChanges discards local commits/changes of
 | |
| // given branch to make sure it is even to remote branch.
 | |
| func discardLocalRepoBranchChanges(localPath, branch string) error {
 | |
| 	if !com.IsExist(localPath) {
 | |
| 		return nil
 | |
| 	}
 | |
| 	// No need to check if nothing in the repository.
 | |
| 	if !git.IsBranchExist(localPath, branch) {
 | |
| 		return nil
 | |
| 	}
 | |
| 
 | |
| 	refName := "origin/" + branch
 | |
| 	if err := git.ResetHEAD(localPath, true, refName); err != nil {
 | |
| 		return fmt.Errorf("git reset --hard %s: %v", refName, err)
 | |
| 	}
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // DiscardLocalRepoBranchChanges discards the local repository branch changes
 | |
| func (repo *Repository) DiscardLocalRepoBranchChanges(branch string) error {
 | |
| 	return discardLocalRepoBranchChanges(repo.LocalCopyPath(), branch)
 | |
| }
 | |
| 
 | |
| // checkoutNewBranch checks out to a new branch from the a branch name.
 | |
| func checkoutNewBranch(repoPath, localPath, oldBranch, newBranch string) error {
 | |
| 	if err := git.Checkout(localPath, git.CheckoutOptions{
 | |
| 		Timeout:   time.Duration(setting.Git.Timeout.Pull) * time.Second,
 | |
| 		Branch:    newBranch,
 | |
| 		OldBranch: oldBranch,
 | |
| 	}); err != nil {
 | |
| 		return fmt.Errorf("git checkout -b %s %s: %v", newBranch, oldBranch, err)
 | |
| 	}
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // CheckoutNewBranch checks out a new branch
 | |
| func (repo *Repository) CheckoutNewBranch(oldBranch, newBranch string) error {
 | |
| 	return checkoutNewBranch(repo.RepoPath(), repo.LocalCopyPath(), oldBranch, newBranch)
 | |
| }
 | |
| 
 | |
| // deleteLocalBranch deletes a branch from a local repo cache
 | |
| // First checks out default branch to avoid trying to delete the currently checked out branch
 | |
| func deleteLocalBranch(localPath, defaultBranch, deleteBranch string) error {
 | |
| 	if !com.IsExist(localPath) {
 | |
| 		return nil
 | |
| 	}
 | |
| 
 | |
| 	if !git.IsBranchExist(localPath, deleteBranch) {
 | |
| 		return nil
 | |
| 	}
 | |
| 
 | |
| 	// Must NOT have branch currently checked out
 | |
| 	// Checkout default branch first
 | |
| 	if err := git.Checkout(localPath, git.CheckoutOptions{
 | |
| 		Timeout: time.Duration(setting.Git.Timeout.Pull) * time.Second,
 | |
| 		Branch:  defaultBranch,
 | |
| 	}); err != nil {
 | |
| 		return fmt.Errorf("git checkout %s: %v", defaultBranch, err)
 | |
| 	}
 | |
| 
 | |
| 	cmd := git.NewCommand("branch")
 | |
| 	cmd.AddArguments("-D")
 | |
| 	cmd.AddArguments(deleteBranch)
 | |
| 	_, err := cmd.RunInDir(localPath)
 | |
| 	return err
 | |
| }
 | |
| 
 | |
| // DeleteLocalBranch deletes a branch from the local repo
 | |
| func (repo *Repository) DeleteLocalBranch(branchName string) error {
 | |
| 	return deleteLocalBranch(repo.LocalCopyPath(), repo.DefaultBranch, branchName)
 | |
| }
 | |
| 
 | |
| // CanCreateBranch returns true if repository meets the requirements for creating new branches.
 | |
| func (repo *Repository) CanCreateBranch() bool {
 | |
| 	return !repo.IsMirror
 | |
| }
 | |
| 
 | |
| // GetBranch returns a branch by its name
 | |
| func (repo *Repository) GetBranch(branch string) (*git.Branch, error) {
 | |
| 	gitRepo, err := git.OpenRepository(repo.RepoPath())
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 
 | |
| 	return gitRepo.GetBranch(branch)
 | |
| }
 | |
| 
 | |
| // GetBranches returns all the branches of a repository
 | |
| func (repo *Repository) GetBranches() ([]*git.Branch, error) {
 | |
| 	return git.GetBranchesByPath(repo.RepoPath())
 | |
| }
 | |
| 
 | |
| // CheckBranchName validates branch name with existing repository branches
 | |
| func (repo *Repository) CheckBranchName(name string) error {
 | |
| 	gitRepo, err := git.OpenRepository(repo.RepoPath())
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	branches, err := repo.GetBranches()
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	for _, branch := range branches {
 | |
| 		if branch.Name == name {
 | |
| 			return ErrBranchAlreadyExists{branch.Name}
 | |
| 		} else if (len(branch.Name) < len(name) && branch.Name+"/" == name[0:len(branch.Name)+1]) ||
 | |
| 			(len(branch.Name) > len(name) && name+"/" == branch.Name[0:len(name)+1]) {
 | |
| 			return ErrBranchNameConflict{branch.Name}
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	if _, err := gitRepo.GetTag(name); err == nil {
 | |
| 		return ErrTagAlreadyExists{name}
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // CreateNewBranch creates a new repository branch
 | |
| func (repo *Repository) CreateNewBranch(doer *User, oldBranchName, branchName string) (err error) {
 | |
| 	repoWorkingPool.CheckIn(com.ToStr(repo.ID))
 | |
| 	defer repoWorkingPool.CheckOut(com.ToStr(repo.ID))
 | |
| 
 | |
| 	// Check if branch name can be used
 | |
| 	if err := repo.CheckBranchName(branchName); err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	localPath := repo.LocalCopyPath()
 | |
| 
 | |
| 	if err = discardLocalRepoBranchChanges(localPath, oldBranchName); err != nil {
 | |
| 		return fmt.Errorf("discardLocalRepoChanges: %v", err)
 | |
| 	} else if err = repo.UpdateLocalCopyBranch(oldBranchName); err != nil {
 | |
| 		return fmt.Errorf("UpdateLocalCopyBranch: %v", err)
 | |
| 	}
 | |
| 
 | |
| 	if err = repo.CheckoutNewBranch(oldBranchName, branchName); err != nil {
 | |
| 		return fmt.Errorf("CreateNewBranch: %v", err)
 | |
| 	}
 | |
| 
 | |
| 	if err = git.Push(localPath, git.PushOptions{
 | |
| 		Remote: "origin",
 | |
| 		Branch: branchName,
 | |
| 	}); err != nil {
 | |
| 		return fmt.Errorf("Push: %v", err)
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // updateLocalCopyToCommit pulls latest changes of given commit from repoPath to localPath.
 | |
| // It creates a new clone if local copy does not exist.
 | |
| // This function checks out target commit by default, it is safe to assume subsequent
 | |
| // operations are operating against target commit when caller has confidence for no race condition.
 | |
| func updateLocalCopyToCommit(repoPath, localPath, commit string) error {
 | |
| 	if !com.IsExist(localPath) {
 | |
| 		if err := git.Clone(repoPath, localPath, git.CloneRepoOptions{
 | |
| 			Timeout: time.Duration(setting.Git.Timeout.Clone) * time.Second,
 | |
| 		}); err != nil {
 | |
| 			return fmt.Errorf("git clone: %v", err)
 | |
| 		}
 | |
| 	} else {
 | |
| 		_, err := git.NewCommand("fetch", "origin").RunInDir(localPath)
 | |
| 		if err != nil {
 | |
| 			return fmt.Errorf("git fetch origin: %v", err)
 | |
| 		}
 | |
| 		if err := git.ResetHEAD(localPath, true, "HEAD"); err != nil {
 | |
| 			return fmt.Errorf("git reset --hard HEAD: %v", err)
 | |
| 		}
 | |
| 	}
 | |
| 	if err := git.Checkout(localPath, git.CheckoutOptions{
 | |
| 		Branch: commit,
 | |
| 	}); err != nil {
 | |
| 		return fmt.Errorf("git checkout %s: %v", commit, err)
 | |
| 	}
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // updateLocalCopyToCommit makes sure local copy of repository is at given commit.
 | |
| func (repo *Repository) updateLocalCopyToCommit(commit string) error {
 | |
| 	return updateLocalCopyToCommit(repo.RepoPath(), repo.LocalCopyPath(), commit)
 | |
| }
 | |
| 
 | |
| // CreateNewBranchFromCommit creates a new repository branch
 | |
| func (repo *Repository) CreateNewBranchFromCommit(doer *User, commit, branchName string) (err error) {
 | |
| 	repoWorkingPool.CheckIn(com.ToStr(repo.ID))
 | |
| 	defer repoWorkingPool.CheckOut(com.ToStr(repo.ID))
 | |
| 
 | |
| 	// Check if branch name can be used
 | |
| 	if err := repo.CheckBranchName(branchName); err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	localPath := repo.LocalCopyPath()
 | |
| 
 | |
| 	if err = repo.updateLocalCopyToCommit(commit); err != nil {
 | |
| 		return fmt.Errorf("UpdateLocalCopyBranch: %v", err)
 | |
| 	}
 | |
| 
 | |
| 	if err = repo.CheckoutNewBranch(commit, branchName); err != nil {
 | |
| 		return fmt.Errorf("CheckoutNewBranch: %v", err)
 | |
| 	}
 | |
| 
 | |
| 	if err = git.Push(localPath, git.PushOptions{
 | |
| 		Remote: "origin",
 | |
| 		Branch: branchName,
 | |
| 	}); err != nil {
 | |
| 		return fmt.Errorf("Push: %v", err)
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 |