summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/error.go45
-rw-r--r--models/repo.go35
-rw-r--r--models/repo_branch.go133
3 files changed, 178 insertions, 35 deletions
diff --git a/models/error.go b/models/error.go
index 37505e8aa5..aa9db7abef 100644
--- a/models/error.go
+++ b/models/error.go
@@ -649,6 +649,51 @@ func (err ErrBranchNotExist) Error() string {
return fmt.Sprintf("branch does not exist [name: %s]", err.Name)
}
+// ErrBranchAlreadyExists represents an error that branch with such name already exists
+type ErrBranchAlreadyExists struct {
+ BranchName string
+}
+
+// IsErrBranchAlreadyExists checks if an error is an ErrBranchAlreadyExists.
+func IsErrBranchAlreadyExists(err error) bool {
+ _, ok := err.(ErrBranchAlreadyExists)
+ return ok
+}
+
+func (err ErrBranchAlreadyExists) Error() string {
+ return fmt.Sprintf("branch already exists [name: %s]", err.BranchName)
+}
+
+// ErrBranchNameConflict represents an error that branch name conflicts with other branch
+type ErrBranchNameConflict struct {
+ BranchName string
+}
+
+// IsErrBranchNameConflict checks if an error is an ErrBranchNameConflict.
+func IsErrBranchNameConflict(err error) bool {
+ _, ok := err.(ErrBranchNameConflict)
+ return ok
+}
+
+func (err ErrBranchNameConflict) Error() string {
+ return fmt.Sprintf("branch conflicts with existing branch [name: %s]", err.BranchName)
+}
+
+// ErrTagAlreadyExists represents an error that tag with such name already exists
+type ErrTagAlreadyExists struct {
+ TagName string
+}
+
+// IsErrTagAlreadyExists checks if an error is an ErrTagAlreadyExists.
+func IsErrTagAlreadyExists(err error) bool {
+ _, ok := err.(ErrTagAlreadyExists)
+ return ok
+}
+
+func (err ErrTagAlreadyExists) Error() string {
+ return fmt.Sprintf("tag already exists [name: %s]", err.TagName)
+}
+
// __ __ ___. .__ __
// / \ / \ ____\_ |__ | |__ ____ ____ | | __
// \ \/\/ // __ \| __ \| | \ / _ \ / _ \| |/ /
diff --git a/models/repo.go b/models/repo.go
index 9819d4b77a..293f251d3e 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -2426,38 +2426,3 @@ func (repo *Repository) GetUserFork(userID int64) (*Repository, error) {
}
return &forkedRepo, nil
}
-
-// __________ .__
-// \______ \____________ ____ ____ | |__
-// | | _/\_ __ \__ \ / \_/ ___\| | \
-// | | \ | | \// __ \| | \ \___| Y \
-// |______ / |__| (____ /___| /\___ >___| /
-// \/ \/ \/ \/ \/
-//
-
-// 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))
-
- 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
-}
diff --git a/models/repo_branch.go b/models/repo_branch.go
index 4821902e37..cd12742ba1 100644
--- a/models/repo_branch.go
+++ b/models/repo_branch.go
@@ -5,7 +5,13 @@
package models
import (
+ "fmt"
+ "time"
+
"code.gitea.io/git"
+ "code.gitea.io/gitea/modules/setting"
+
+ "github.com/Unknwon/com"
)
// Branch holds the branch information
@@ -36,6 +42,11 @@ func GetBranchesByPath(path string) ([]*Branch, error) {
return branches, nil
}
+// 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 it's name
func (repo *Repository) GetBranch(branch string) (*Branch, error) {
if !git.IsBranchExist(repo.RepoPath(), branch) {
@@ -52,6 +63,128 @@ func (repo *Repository) GetBranches() ([]*Branch, error) {
return 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
+ }
+
+ if _, err := gitRepo.GetTag(name); err == nil {
+ return ErrTagAlreadyExists{name}
+ }
+
+ 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}
+ }
+ }
+ 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
+}
+
// GetCommit returns all the commits of a branch
func (branch *Branch) GetCommit() (*git.Commit, error) {
gitRepo, err := git.OpenRepository(branch.Path)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 19:17:48 +0000