Skip to content

Commit e1266a1

Browse files
kazlafriks
authored andcommitted
Change pull description text (#2075) (#2646)
* Change pull description text * move duplicated code into helper function
1 parent fcca037 commit e1266a1

File tree

1 file changed

+23
-11
lines changed

1 file changed

+23
-11
lines changed

routers/repo/pull.go

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,30 @@ func checkPullInfo(ctx *context.Context) *models.Issue {
179179
return issue
180180
}
181181

182+
func setMergeTarget(ctx *context.Context, pull *models.PullRequest) {
183+
if ctx.Repo.Owner.Name == pull.HeadUserName {
184+
ctx.Data["HeadTarget"] = pull.HeadBranch
185+
} else if pull.HeadRepo == nil {
186+
ctx.Data["HeadTarget"] = pull.HeadUserName + ":" + pull.HeadBranch
187+
} else {
188+
ctx.Data["HeadTarget"] = pull.HeadUserName + "/" + pull.HeadRepo.Name + ":" + pull.HeadBranch
189+
}
190+
ctx.Data["BaseTarget"] = pull.BaseBranch
191+
}
192+
182193
// PrepareMergedViewPullInfo show meta information for a merged pull request view page
183194
func PrepareMergedViewPullInfo(ctx *context.Context, issue *models.Issue) {
184195
pull := issue.PullRequest
185-
ctx.Data["HasMerged"] = true
186-
ctx.Data["HeadTarget"] = issue.PullRequest.HeadUserName + "/" + pull.HeadBranch
187-
ctx.Data["BaseTarget"] = ctx.Repo.Owner.Name + "/" + pull.BaseBranch
188196

189197
var err error
198+
if err = pull.GetHeadRepo(); err != nil {
199+
ctx.Handle(500, "GetHeadRepo", err)
200+
return
201+
}
202+
203+
setMergeTarget(ctx, pull)
204+
ctx.Data["HasMerged"] = true
205+
190206
ctx.Data["NumCommits"], err = ctx.Repo.GitRepo.CommitsCountBetween(pull.MergeBase, pull.MergedCommitID)
191207
if err != nil {
192208
ctx.Handle(500, "Repo.GitRepo.CommitsCountBetween", err)
@@ -204,19 +220,15 @@ func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.PullReq
204220
repo := ctx.Repo.Repository
205221
pull := issue.PullRequest
206222

207-
ctx.Data["HeadTarget"] = pull.HeadUserName + "/" + pull.HeadBranch
208-
ctx.Data["BaseTarget"] = ctx.Repo.Owner.Name + "/" + pull.BaseBranch
209-
210-
var (
211-
headGitRepo *git.Repository
212-
err error
213-
)
214-
223+
var err error
215224
if err = pull.GetHeadRepo(); err != nil {
216225
ctx.Handle(500, "GetHeadRepo", err)
217226
return nil
218227
}
219228

229+
setMergeTarget(ctx, pull)
230+
231+
var headGitRepo *git.Repository
220232
if pull.HeadRepo != nil {
221233
headGitRepo, err = git.OpenRepository(pull.HeadRepo.RepoPath())
222234
if err != nil {

0 commit comments

Comments
 (0)