linden123/githaven-fork
1
1
Fork 0
forked from Shiloh/githaven
Code Pull Requests Activity

Merge pull request #2694 from mhartkorn/pullrefs

Browse Source 
Improved Pull Request refs
This commit is contained in:
Unknwon 2016-02-26 14:21:31 -05:00
commit 7a91d7e776
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
routers/repo/pull.go
View File

@ -623,7 +623,7 @@ func CompareAndPullRequestPost(ctx *middleware.Context, form auth.CreateIssueFor
return return
} }
pull := &models.Issue{ pullIssue := &models.Issue{
RepoID: repo.ID, RepoID: repo.ID,
Index: repo.NextIssueIndex(), Index: repo.NextIssueIndex(),
Name: form.Title, Name: form.Title,
@ -634,26 +634,33 @@ func CompareAndPullRequestPost(ctx *middleware.Context, form auth.CreateIssueFor
IsPull: true, IsPull: true,
Content: form.Content, Content: form.Content,
} }
if err := models.NewPullRequest(repo, pull, labelIDs, attachments, &models.PullRequest{ pullRequest := &models.PullRequest{
HeadRepoID: headRepo.ID, HeadRepoID: headRepo.ID,
BaseRepoID: repo.ID, BaseRepoID: repo.ID,
HeadUserName: headUser.Name, HeadUserName: headUser.Name,
HeadBranch: headBranch, HeadBranch: headBranch,
BaseBranch: baseBranch, BaseBranch: baseBranch,
HeadRepo: headRepo,
BaseRepo: repo,
MergeBase: prInfo.MergeBase, MergeBase: prInfo.MergeBase,
Type: models.PULL_REQUEST_GOGS, Type: models.PULL_REQUEST_GOGS,
}, patch); err != nil { }
if err := models.NewPullRequest(repo, pullIssue, labelIDs, attachments, pullRequest, patch); err != nil {
ctx.Handle(500, "NewPullRequest", err) ctx.Handle(500, "NewPullRequest", err)
return return
} }
if err := pullRequest.PushToBaseRepo(); err != nil {
ctx.Handle(500, "PushToBaseRepo", err)
return
}
notifyWatchersAndMentions(ctx, pull) notifyWatchersAndMentions(ctx, pullIssue)
if ctx.Written() { if ctx.Written() {
return return
} }
log.Trace("Pull request created: %d/%d", repo.ID, pull.ID) log.Trace("Pull request created: %d/%d", repo.ID, pullIssue.ID)
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pull.Index)) ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pullIssue.Index))
} }
func TriggerTask(ctx *middleware.Context) { func TriggerTask(ctx *middleware.Context) {