peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add issue updating from commits being tracked by pull requests

Browse Source
This commit is contained in:
Keith Rutkowski 2018-03-27 12:57:09 -04:00
parent 58662ff1b6
commit 13df8f596e
1 changed files with 66 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
models/update.go
View File

@ -67,7 +67,7 @@ type PushUpdateOptions struct {
// PushUpdate must be called for any push actions in order to // PushUpdate must be called for any push actions in order to
// generates necessary push action history feeds. // generates necessary push action history feeds.
func PushUpdate(branch string, opt PushUpdateOptions) error { func PushUpdate(branch string, opt PushUpdateOptions) error {
repo, err := pushUpdate(opt) repo, err := pushUpdate(branch, opt)
if err != nil { if err != nil {
return err return err
} }
@ -183,7 +183,7 @@ func pushUpdateAddTag(repo *Repository, gitRepo *git.Repository, tagName string)
return nil return nil
} }
func pushUpdate(opts PushUpdateOptions) (repo *Repository, err error) { func pushUpdate(branch string, opts PushUpdateOptions) (repo *Repository, err error) {
isNewRef := opts.OldCommitID == git.EmptySHA isNewRef := opts.OldCommitID == git.EmptySHA
isDelRef := opts.NewCommitID == git.EmptySHA isDelRef := opts.NewCommitID == git.EmptySHA
if isNewRef && isDelRef { if isNewRef && isDelRef {
@ -277,5 +277,69 @@ func pushUpdate(opts PushUpdateOptions) (repo *Repository, err error) {
}); err != nil { }); err != nil {
return nil, fmt.Errorf("CommitRepoAction: %v", err) return nil, fmt.Errorf("CommitRepoAction: %v", err)
} }
// create actions that update pull requests tracking the branch that was pushed to
prs, err := GetUnmergedPullRequestsByHeadInfo(repo.ID, branch)
if err != nil {
log.Error(4, "Find pull requests [head_repo_id: %d, head_branch: %s]: %v", repo.ID, branch, err)
} else {
pusher, err := GetUserByID(opts.PusherID)
if err != nil {
return nil, fmt.Errorf("GetUserByID: %v", err)
}
for _, pr := range prs {
if err = pr.GetHeadRepo(); err != nil {
log.Error(4, "GetHeadRepo: %v", err)
continue
} else if err = pr.GetBaseRepo(); err != nil {
log.Error(4, "GetBaseRepo: %v", err)
continue
}
var (
baseBranch *Branch
headBranch *Branch
baseCommit *git.Commit
headCommit *git.Commit
headGitRepo *git.Repository
)
if baseBranch, err = pr.BaseRepo.GetBranch(pr.BaseBranch); err != nil {
log.Error(4, "BaseRepo.GetBranch: %v", err)
continue
}
if baseCommit, err = baseBranch.GetCommit(); err != nil {
log.Error(4, "baseBranch.GetCommit: %v", err)
continue
}
if headBranch, err = pr.HeadRepo.GetBranch(pr.HeadBranch); err != nil {
log.Error(4, "HeadRepo.GetBranch: %v", err)
continue
}
if headCommit, err = headBranch.GetCommit(); err != nil {
log.Error(4, "headRepo.GetCommit: %v", err)
continue
}
// NOTICE: this is using pr.HeadRepo rather than pr.BaseRepo to get commits since they are going to be pushed in a go routine
if headGitRepo, err = git.OpenRepository(pr.HeadRepo.RepoPath()); err != nil {
log.Error(4, "OpenRepository", err)
continue
}
l, err := headGitRepo.CommitsBetweenIDs(headCommit.ID.String(), baseCommit.ID.String())
if err != nil {
log.Error(4, "CommitsBetweenIDs: %v", err)
continue
}
commits := ListToPushCommits(l)
if err = UpdatePullRequestAction(pusher, pr.BaseRepo, pr.Issue, commits); err != nil {
log.Error(4, "UpdatePullRequestAction [%d]: %v", pr.ID, err)
continue
}
}
}
return repo, nil return repo, nil
} }