// Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT package repository import ( "context" "errors" "fmt" "strings" "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/queue" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" notify_service "code.gitea.io/gitea/services/notify" files_service "code.gitea.io/gitea/services/repository/files" "xorm.io/builder" ) // CreateNewBranch creates a new repository branch func CreateNewBranch(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, gitRepo *git.Repository, oldBranchName, branchName string) (err error) { branch, err := git_model.GetBranch(ctx, repo.ID, oldBranchName) if err != nil { return err } return CreateNewBranchFromCommit(ctx, doer, repo, gitRepo, branch.CommitID, branchName) } // Branch contains the branch information type Branch struct { DBBranch *git_model.Branch IsProtected bool IsIncluded bool CommitsAhead int CommitsBehind int LatestPullRequest *issues_model.PullRequest MergeMovedOn bool } // LoadBranches loads branches from the repository limited by page & pageSize. func LoadBranches(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, isDeletedBranch util.OptionalBool, keyword string, page, pageSize int) (*Branch, []*Branch, int64, error) { defaultDBBranch, err := git_model.GetBranch(ctx, repo.ID, repo.DefaultBranch) if err != nil { return nil, nil, 0, err } branchOpts := git_model.FindBranchOptions{ RepoID: repo.ID, IsDeletedBranch: isDeletedBranch, ListOptions: db.ListOptions{ Page: page, PageSize: pageSize, }, Keyword: keyword, } totalNumOfBranches, err := git_model.CountBranches(ctx, branchOpts) if err != nil { return nil, nil, 0, err } branchOpts.ExcludeBranchNames = []string{repo.DefaultBranch} dbBranches, err := git_model.FindBranches(ctx, branchOpts) if err != nil { return nil, nil, 0, err } if err := dbBranches.LoadDeletedBy(ctx); err != nil { return nil, nil, 0, err } if err := dbBranches.LoadPusher(ctx); err != nil { return nil, nil, 0, err } rules, err := git_model.FindRepoProtectedBranchRules(ctx, repo.ID) if err != nil { return nil, nil, 0, err } repoIDToRepo := map[int64]*repo_model.Repository{} repoIDToRepo[repo.ID] = repo repoIDToGitRepo := map[int64]*git.Repository{} repoIDToGitRepo[repo.ID] = gitRepo branches := make([]*Branch, 0, len(dbBranches)) for i := range dbBranches { branch, err := loadOneBranch(ctx, repo, dbBranches[i], &rules, repoIDToRepo, repoIDToGitRepo) if err != nil { log.Error("loadOneBranch() on repo #%d, branch '%s' failed: %v", repo.ID, dbBranches[i].Name, err) // TODO: Ideally, we would only do this if the branch doesn't exist // anymore. That is not practical to check here currently, so we do // this for all kinds of errors. totalNumOfBranches-- continue } branches = append(branches, branch) } // Always add the default branch log.Debug("loadOneBranch: load default: '%s'", defaultDBBranch.Name) defaultBranch, err := loadOneBranch(ctx, repo, defaultDBBranch, &rules, repoIDToRepo, repoIDToGitRepo) if err != nil { return nil, nil, 0, fmt.Errorf("loadOneBranch: %v", err) } return defaultBranch, branches, totalNumOfBranches, nil } func loadOneBranch(ctx context.Context, repo *repo_model.Repository, dbBranch *git_model.Branch, protectedBranches *git_model.ProtectedBranchRules, repoIDToRepo map[int64]*repo_model.Repository, repoIDToGitRepo map[int64]*git.Repository, ) (*Branch, error) { log.Trace("loadOneBranch: '%s'", dbBranch.Name) branchName := dbBranch.Name p := protectedBranches.GetFirstMatched(branchName) isProtected := p != nil var divergence *git.DivergeObject // it's not default branch if repo.DefaultBranch != dbBranch.Name && !dbBranch.IsDeleted { var err error divergence, err = files_service.CountDivergingCommits(ctx, repo, git.BranchPrefix+branchName) if err != nil { return nil, fmt.Errorf("CountDivergingCommits: %v", err) } } if divergence == nil { // tolerate error that we can't get divergence divergence = &git.DivergeObject{Ahead: -1, Behind: -1} } pr, err := issues_model.GetLatestPullRequestByHeadInfo(repo.ID, branchName) if err != nil { return nil, fmt.Errorf("GetLatestPullRequestByHeadInfo: %v", err) } headCommit := dbBranch.CommitID mergeMovedOn := false if pr != nil { pr.HeadRepo = repo if err := pr.LoadIssue(ctx); err != nil { return nil, fmt.Errorf("LoadIssue: %v", err) } if repo, ok := repoIDToRepo[pr.BaseRepoID]; ok { pr.BaseRepo = repo } else if err := pr.LoadBaseRepo(ctx); err != nil { return nil, fmt.Errorf("LoadBaseRepo: %v", err) } else { repoIDToRepo[pr.BaseRepoID] = pr.BaseRepo } pr.Issue.Repo = pr.BaseRepo if pr.HasMerged { baseGitRepo, ok := repoIDToGitRepo[pr.BaseRepoID] if !ok { baseGitRepo, err = git.OpenRepository(ctx, pr.BaseRepo.RepoPath()) if err != nil { return nil, fmt.Errorf("OpenRepository: %v", err) } defer baseGitRepo.Close() repoIDToGitRepo[pr.BaseRepoID] = baseGitRepo } pullCommit, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) if err != nil && !git.IsErrNotExist(err) { return nil, fmt.Errorf("GetBranchCommitID: %v", err) } if err == nil && headCommit != pullCommit { // the head has moved on from the merge - we shouldn't delete mergeMovedOn = true } } } isIncluded := divergence.Ahead == 0 && repo.DefaultBranch != branchName return &Branch{ DBBranch: dbBranch, IsProtected: isProtected, IsIncluded: isIncluded, CommitsAhead: divergence.Ahead, CommitsBehind: divergence.Behind, LatestPullRequest: pr, MergeMovedOn: mergeMovedOn, }, nil } func GetBranchCommitID(ctx context.Context, repo *repo_model.Repository, branch string) (string, error) { return git.GetBranchCommitID(ctx, repo.RepoPath(), branch) } // checkBranchName validates branch name with existing repository branches func checkBranchName(ctx context.Context, repo *repo_model.Repository, name string) error { _, err := git.WalkReferences(ctx, repo.RepoPath(), func(_, refName string) error { branchRefName := strings.TrimPrefix(refName, git.BranchPrefix) switch { case branchRefName == name: return git_model.ErrBranchAlreadyExists{ BranchName: name, } // If branchRefName like a/b but we want to create a branch named a then we have a conflict case strings.HasPrefix(branchRefName, name+"/"): return git_model.ErrBranchNameConflict{ BranchName: branchRefName, } // Conversely if branchRefName like a but we want to create a branch named a/b then we also have a conflict case strings.HasPrefix(name, branchRefName+"/"): return git_model.ErrBranchNameConflict{ BranchName: branchRefName, } case refName == git.TagPrefix+name: return models.ErrTagAlreadyExists{ TagName: name, } } return nil }) return err } // syncBranchToDB sync the branch information in the database. It will try to update the branch first, // if updated success with affect records > 0, then all are done. Because that means the branch has been in the database. // If no record is affected, that means the branch does not exist in database. So there are two possibilities. // One is this is a new branch, then we just need to insert the record. Another is the branches haven't been synced, // then we need to sync all the branches into database. func syncBranchToDB(ctx context.Context, repoID, pusherID int64, branchName string, commit *git.Commit) error { cnt, err := git_model.UpdateBranch(ctx, repoID, pusherID, branchName, commit) if err != nil { return fmt.Errorf("git_model.UpdateBranch %d:%s failed: %v", repoID, branchName, err) } if cnt > 0 { // This means branch does exist, so it's a normal update. It also means the branch has been synced. return nil } // if user haven't visit UI but directly push to a branch after upgrading from 1.20 -> 1.21, // we cannot simply insert the branch but need to check we have branches or not hasBranch, err := db.Exist[git_model.Branch](ctx, git_model.FindBranchOptions{ RepoID: repoID, IsDeletedBranch: util.OptionalBoolFalse, }.ToConds()) if err != nil { return err } if !hasBranch { if _, err = repo_module.SyncRepoBranches(ctx, repoID, pusherID); err != nil { return fmt.Errorf("repo_module.SyncRepoBranches %d:%s failed: %v", repoID, branchName, err) } return nil } // if database have branches but not this branch, it means this is a new branch return db.Insert(ctx, &git_model.Branch{ RepoID: repoID, Name: branchName, CommitID: commit.ID.String(), CommitMessage: commit.Summary(), PusherID: pusherID, CommitTime: timeutil.TimeStamp(commit.Committer.When.Unix()), }) } // CreateNewBranchFromCommit creates a new repository branch func CreateNewBranchFromCommit(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, gitRepo *git.Repository, commitID, branchName string) (err error) { err = repo.MustNotBeArchived() if err != nil { return err } // Check if branch name can be used if err := checkBranchName(ctx, repo, branchName); err != nil { return err } if err := git.Push(ctx, repo.RepoPath(), git.PushOptions{ Remote: repo.RepoPath(), Branch: fmt.Sprintf("%s:%s%s", commitID, git.BranchPrefix, branchName), Env: repo_module.PushingEnvironment(doer, repo), }); err != nil { if git.IsErrPushOutOfDate(err) || git.IsErrPushRejected(err) { return err } return fmt.Errorf("push: %w", err) } return nil } // RenameBranch rename a branch func RenameBranch(ctx context.Context, repo *repo_model.Repository, doer *user_model.User, gitRepo *git.Repository, from, to string) (string, error) { if from == to { return "target_exist", nil } if gitRepo.IsBranchExist(to) { return "target_exist", nil } if !gitRepo.IsBranchExist(from) { return "from_not_exist", nil } if err := git_model.RenameBranch(ctx, repo, from, to, func(isDefault bool) error { err2 := gitRepo.RenameBranch(from, to) if err2 != nil { return err2 } if isDefault { err2 = gitRepo.SetDefaultBranch(to) if err2 != nil { return err2 } } return nil }); err != nil { return "", err } refNameTo := git.RefNameFromBranch(to) refID, err := gitRepo.GetRefCommitID(refNameTo.String()) if err != nil { return "", err } notify_service.DeleteRef(ctx, doer, repo, git.RefNameFromBranch(from)) notify_service.CreateRef(ctx, doer, repo, refNameTo, refID) return "", nil } // enmuerates all branch related errors var ( ErrBranchIsDefault = errors.New("branch is default") ) // DeleteBranch delete branch func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, gitRepo *git.Repository, branchName string) error { if branchName == repo.DefaultBranch { return ErrBranchIsDefault } isProtected, err := git_model.IsBranchProtected(ctx, repo.ID, branchName) if err != nil { return err } if isProtected { return git_model.ErrBranchIsProtected } rawBranch, err := git_model.GetBranch(ctx, repo.ID, branchName) if err != nil { return fmt.Errorf("GetBranch: %vc", err) } if rawBranch.IsDeleted { return nil } commit, err := gitRepo.GetBranchCommit(branchName) if err != nil { return err } if err := db.WithTx(ctx, func(ctx context.Context) error { if err := git_model.AddDeletedBranch(ctx, repo.ID, branchName, doer.ID); err != nil { return err } return gitRepo.DeleteBranch(branchName, git.DeleteBranchOptions{ Force: true, }) }); err != nil { return err } // Don't return error below this if err := PushUpdate( &repo_module.PushUpdateOptions{ RefFullName: git.RefNameFromBranch(branchName), OldCommitID: commit.ID.String(), NewCommitID: git.EmptySHA, PusherID: doer.ID, PusherName: doer.Name, RepoUserName: repo.OwnerName, RepoName: repo.Name, }); err != nil { log.Error("Update: %v", err) } return nil } type BranchSyncOptions struct { RepoID int64 } // branchSyncQueue represents a queue to handle branch sync jobs. var branchSyncQueue *queue.WorkerPoolQueue[*BranchSyncOptions] func handlerBranchSync(items ...*BranchSyncOptions) []*BranchSyncOptions { for _, opts := range items { _, err := repo_module.SyncRepoBranches(graceful.GetManager().ShutdownContext(), opts.RepoID, 0) if err != nil { log.Error("syncRepoBranches [%d] failed: %v", opts.RepoID, err) } } return nil } func addRepoToBranchSyncQueue(repoID, doerID int64) error { return branchSyncQueue.Push(&BranchSyncOptions{ RepoID: repoID, }) } func initBranchSyncQueue(ctx context.Context) error { branchSyncQueue = queue.CreateUniqueQueue(ctx, "branch_sync", handlerBranchSync) if branchSyncQueue == nil { return errors.New("unable to create branch_sync queue") } go graceful.GetManager().RunWithCancel(branchSyncQueue) return nil } func AddAllRepoBranchesToSyncQueue(ctx context.Context, doerID int64) error { if err := db.Iterate(ctx, builder.Eq{"is_empty": false}, func(ctx context.Context, repo *repo_model.Repository) error { return addRepoToBranchSyncQueue(repo.ID, doerID) }); err != nil { return fmt.Errorf("run sync all branches failed: %v", err) } return nil }