 59b30f060a
			
		
	
	
		59b30f060a
		
			
		
	
	
	
	
		
			
			* Fix indention Signed-off-by: kolaente <k@knt.li> * Add option to merge a pr right now without waiting for the checks to succeed Signed-off-by: kolaente <k@knt.li> * Fix lint Signed-off-by: kolaente <k@knt.li> * Add scheduled pr merge to tables used for testing Signed-off-by: kolaente <k@knt.li> * Add status param to make GetPullRequestByHeadBranch reusable Signed-off-by: kolaente <k@knt.li> * Move "Merge now" to a seperate button to make the ui clearer Signed-off-by: kolaente <k@knt.li> * Update models/scheduled_pull_request_merge.go Co-authored-by: 赵智超 <1012112796@qq.com> * Update web_src/js/index.js Co-authored-by: 赵智超 <1012112796@qq.com> * Update web_src/js/index.js Co-authored-by: 赵智超 <1012112796@qq.com> * Re-add migration after merge * Fix frontend lint * Fix version compare * Add vendored dependencies * Add basic tets * Make sure the api route is capable of scheduling PRs for merging * Fix comparing version * make vendor * adopt refactor * apply suggestion: User -> Doer * init var once * Fix Test * Update templates/repo/issue/view_content/comments.tmpl * adopt * nits * next * code format * lint * use same name schema; rm CreateUnScheduledPRToAutoMergeComment * API: can not create schedule twice * Add TestGetBranchNamesForSha * nits * new go routine for each pull to merge * Update models/pull.go Co-authored-by: a1012112796 <1012112796@qq.com> * Update models/scheduled_pull_request_merge.go Co-authored-by: a1012112796 <1012112796@qq.com> * fix & add renaming sugestions * Update services/automerge/pull_auto_merge.go Co-authored-by: a1012112796 <1012112796@qq.com> * fix conflict relicts * apply latest refactors * fix: migration after merge * Update models/error.go Co-authored-by: delvh <dev.lh@web.de> * Update options/locale/locale_en-US.ini Co-authored-by: delvh <dev.lh@web.de> * Update options/locale/locale_en-US.ini Co-authored-by: delvh <dev.lh@web.de> * adapt latest refactors * fix test * use more context * skip potential edgecases * document func usage * GetBranchNamesForSha() -> GetRefsBySha() * start refactoring * ajust to new changes * nit * docu nit * the great check move * move checks for branchprotection into own package * resolve todo now ... * move & rename * unexport if posible * fix * check if merge is allowed before merge on scheduled pull * debugg * wording * improve SetDefaults & nits * NotAllowedToMerge -> DisallowedToMerge * fix test * merge files * use package "errors" * merge files * add string names * other implementation for gogit * adapt refactor * more context for models/pull.go * GetUserRepoPermission use context * more ctx * use context for loading pull head/base-repo * more ctx * more ctx * models.LoadIssueCtx() * models.LoadIssueCtx() * Handle pull_service.Merge in one DB transaction * add TODOs * next * next * next * more ctx * more ctx * Start refactoring structure of old pull code ... * move code into new packages * shorter names ... and finish **restructure** * Update models/branches.go Co-authored-by: zeripath <art27@cantab.net> * finish UpdateProtectBranch * more and fix * update datum * template: use "svg" helper * rename prQueue 2 prPatchCheckerQueue * handle automerge in queue * lock pull on git&db actions ... * lock pull on git&db actions ... * add TODO notes * the regex * transaction in tests * GetRepositoryByIDCtx * shorter table name and lint fix * close transaction bevore notify * Update models/pull.go * next * CheckPullMergable check all branch protections! * Update routers/web/repo/pull.go * CheckPullMergable check all branch protections! * Revert "PullService lock via pullID (#19520)" (for now...) This reverts commit 6cde7c9159a5ea75a10356feb7b8c7ad4c434a9a. * Update services/pull/check.go * Use for a repo action one database transaction * Apply suggestions from code review * Apply suggestions from code review Co-authored-by: delvh <dev.lh@web.de> * Update services/issue/status.go Co-authored-by: delvh <dev.lh@web.de> * Update services/issue/status.go Co-authored-by: delvh <dev.lh@web.de> * use db.WithTx() * gofmt * make pr.GetDefaultMergeMessage() context aware * make MergePullRequestForm.SetDefaults context aware * use db.WithTx() * pull.SetMerged only with context * fix deadlock in `test-sqlite\#TestAPIBranchProtection` * dont forget templates * db.WithTx allow to set the parentCtx * handle db transaction in service packages but not router * issue_service.ChangeStatus just had caused another deadlock :/ it has to do something with how notification package is handled * if we merge a pull in one database transaktion, we get a lock, because merge infoce internal api that cant handle open db sessions to the same repo * ajust to current master * Apply suggestions from code review Co-authored-by: delvh <dev.lh@web.de> * dont open db transaction in router * make generate-swagger * one _success less * wording nit * rm * adapt * remove not needed test files * rm less diff & use attr in JS * ... * Update services/repository/files/commit.go Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> * ajust db schema for PullAutoMerge * skip broken pull refs * more context in error messages * remove webUI part for another pull * remove more WebUI only parts * API: add CancleAutoMergePR * Apply suggestions from code review Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> * fix lint * Apply suggestions from code review * cancle -> cancel Co-authored-by: delvh <dev.lh@web.de> * change queue identifyer * fix swagger * prevent nil issue * fix and dont drop error * as per @zeripath * Update integrations/git_test.go Co-authored-by: delvh <dev.lh@web.de> * Update integrations/git_test.go Co-authored-by: delvh <dev.lh@web.de> * more declarative integration tests (dedup code) * use assert.False/True helper Co-authored-by: 赵智超 <1012112796@qq.com> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
		
			
				
	
	
		
			162 lines
		
	
	
	
		
			4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			162 lines
		
	
	
	
		
			4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2015 The Gogs Authors. All rights reserved.
 | |
| // Copyright 2018 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.
 | |
| 
 | |
| //go:build gogit
 | |
| 
 | |
| package git
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"strings"
 | |
| 
 | |
| 	"github.com/go-git/go-git/v5/plumbing"
 | |
| 	"github.com/go-git/go-git/v5/plumbing/storer"
 | |
| )
 | |
| 
 | |
| // IsObjectExist returns true if given reference exists in the repository.
 | |
| func (repo *Repository) IsObjectExist(name string) bool {
 | |
| 	if name == "" {
 | |
| 		return false
 | |
| 	}
 | |
| 
 | |
| 	_, err := repo.gogitRepo.ResolveRevision(plumbing.Revision(name))
 | |
| 
 | |
| 	return err == nil
 | |
| }
 | |
| 
 | |
| // IsReferenceExist returns true if given reference exists in the repository.
 | |
| func (repo *Repository) IsReferenceExist(name string) bool {
 | |
| 	if name == "" {
 | |
| 		return false
 | |
| 	}
 | |
| 
 | |
| 	reference, err := repo.gogitRepo.Reference(plumbing.ReferenceName(name), true)
 | |
| 	if err != nil {
 | |
| 		return false
 | |
| 	}
 | |
| 	return reference.Type() != plumbing.InvalidReference
 | |
| }
 | |
| 
 | |
| // IsBranchExist returns true if given branch exists in current repository.
 | |
| func (repo *Repository) IsBranchExist(name string) bool {
 | |
| 	if name == "" {
 | |
| 		return false
 | |
| 	}
 | |
| 	reference, err := repo.gogitRepo.Reference(plumbing.ReferenceName(BranchPrefix+name), true)
 | |
| 	if err != nil {
 | |
| 		return false
 | |
| 	}
 | |
| 	return reference.Type() != plumbing.InvalidReference
 | |
| }
 | |
| 
 | |
| // GetBranches returns branches from the repository, skipping skip initial branches and
 | |
| // returning at most limit branches, or all branches if limit is 0.
 | |
| func (repo *Repository) GetBranchNames(skip, limit int) ([]string, int, error) {
 | |
| 	var branchNames []string
 | |
| 
 | |
| 	branches, err := repo.gogitRepo.Branches()
 | |
| 	if err != nil {
 | |
| 		return nil, 0, err
 | |
| 	}
 | |
| 
 | |
| 	i := 0
 | |
| 	count := 0
 | |
| 	_ = branches.ForEach(func(branch *plumbing.Reference) error {
 | |
| 		count++
 | |
| 		if i < skip {
 | |
| 			i++
 | |
| 			return nil
 | |
| 		} else if limit != 0 && count > skip+limit {
 | |
| 			return nil
 | |
| 		}
 | |
| 
 | |
| 		branchNames = append(branchNames, strings.TrimPrefix(branch.Name().String(), BranchPrefix))
 | |
| 		return nil
 | |
| 	})
 | |
| 
 | |
| 	// TODO: Sort?
 | |
| 
 | |
| 	return branchNames, count, nil
 | |
| }
 | |
| 
 | |
| // WalkReferences walks all the references from the repository
 | |
| // refType should be empty, ObjectTag or ObjectBranch. All other values are equivalent to empty.
 | |
| func WalkReferences(ctx context.Context, repoPath string, walkfn func(sha1, refname string) error) (int, error) {
 | |
| 	repo := RepositoryFromContext(ctx, repoPath)
 | |
| 	if repo == nil {
 | |
| 		var err error
 | |
| 		repo, err = OpenRepository(ctx, repoPath)
 | |
| 		if err != nil {
 | |
| 			return 0, err
 | |
| 		}
 | |
| 		defer repo.Close()
 | |
| 	}
 | |
| 
 | |
| 	i := 0
 | |
| 	iter, err := repo.gogitRepo.References()
 | |
| 	if err != nil {
 | |
| 		return i, err
 | |
| 	}
 | |
| 	defer iter.Close()
 | |
| 
 | |
| 	err = iter.ForEach(func(ref *plumbing.Reference) error {
 | |
| 		err := walkfn(ref.Hash().String(), string(ref.Name()))
 | |
| 		i++
 | |
| 		return err
 | |
| 	})
 | |
| 	return i, err
 | |
| }
 | |
| 
 | |
| // WalkReferences walks all the references from the repository
 | |
| func (repo *Repository) WalkReferences(arg ObjectType, skip, limit int, walkfn func(sha1, refname string) error) (int, error) {
 | |
| 	i := 0
 | |
| 	var iter storer.ReferenceIter
 | |
| 	var err error
 | |
| 	switch arg {
 | |
| 	case ObjectTag:
 | |
| 		iter, err = repo.gogitRepo.Tags()
 | |
| 	case ObjectBranch:
 | |
| 		iter, err = repo.gogitRepo.Branches()
 | |
| 	default:
 | |
| 		iter, err = repo.gogitRepo.References()
 | |
| 	}
 | |
| 	if err != nil {
 | |
| 		return i, err
 | |
| 	}
 | |
| 	defer iter.Close()
 | |
| 
 | |
| 	err = iter.ForEach(func(ref *plumbing.Reference) error {
 | |
| 		if i < skip {
 | |
| 			i++
 | |
| 			return nil
 | |
| 		}
 | |
| 		err := walkfn(ref.Hash().String(), string(ref.Name()))
 | |
| 		i++
 | |
| 		if err != nil {
 | |
| 			return err
 | |
| 		}
 | |
| 		if limit != 0 && i >= skip+limit {
 | |
| 			return storer.ErrStop
 | |
| 		}
 | |
| 		return nil
 | |
| 	})
 | |
| 	return i, err
 | |
| }
 | |
| 
 | |
| // GetRefsBySha returns all references filtered with prefix that belong to a sha commit hash
 | |
| func (repo *Repository) GetRefsBySha(sha, prefix string) ([]string, error) {
 | |
| 	var revList []string
 | |
| 	iter, err := repo.gogitRepo.References()
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	err = iter.ForEach(func(ref *plumbing.Reference) error {
 | |
| 		if ref.Hash().String() == sha && strings.HasPrefix(string(ref.Name()), prefix) {
 | |
| 			revList = append(revList, string(ref.Name()))
 | |
| 		}
 | |
| 		return nil
 | |
| 	})
 | |
| 	return revList, err
 | |
| }
 |