coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix displaying commits and files of PR created from now deleted fork (#2023) 

Fix displaying commits and files of PR created from now deleted fork
This commit is contained in:
Kim "BKC" Carlbäcker 2017-06-22 19:40:47 +02:00 committed by GitHub
parent 228247511a 63504bf132
commit cc6b3f60c6
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
routers/repo/pull.go
View File

@ -256,8 +256,6 @@ func ViewPullCommits(ctx *context.Context) {
return return
} }
pull := issue.PullRequest pull := issue.PullRequest
ctx.Data["Username"] = pull.HeadUserName
ctx.Data["Reponame"] = pull.HeadRepo.Name
var commits *list.List var commits *list.List
if pull.HasMerged { if pull.HasMerged {
@ -265,6 +263,9 @@ func ViewPullCommits(ctx *context.Context) {
if ctx.Written() { if ctx.Written() {
return return
} }
ctx.Data["Username"] = ctx.Repo.Owner.Name
ctx.Data["Reponame"] = ctx.Repo.Repository.Name
startCommit, err := ctx.Repo.GitRepo.GetCommit(pull.MergeBase) startCommit, err := ctx.Repo.GitRepo.GetCommit(pull.MergeBase)
if err != nil { if err != nil {
ctx.Handle(500, "Repo.GitRepo.GetCommit", err) ctx.Handle(500, "Repo.GitRepo.GetCommit", err)
@ -280,7 +281,6 @@ func ViewPullCommits(ctx *context.Context) {
ctx.Handle(500, "Repo.GitRepo.CommitsBetween", err) ctx.Handle(500, "Repo.GitRepo.CommitsBetween", err)
return return
} }
} else { } else {
prInfo := PrepareViewPullInfo(ctx, issue) prInfo := PrepareViewPullInfo(ctx, issue)
if ctx.Written() { if ctx.Written() {
@ -289,6 +289,8 @@ func ViewPullCommits(ctx *context.Context) {
ctx.Handle(404, "ViewPullCommits", nil) ctx.Handle(404, "ViewPullCommits", nil)
return return
} }
ctx.Data["Username"] = pull.HeadUserName
ctx.Data["Reponame"] = pull.HeadRepo.Name
commits = prInfo.Commits commits = prInfo.Commits
} }
@ -319,6 +321,7 @@ func ViewPullFiles(ctx *context.Context) {
gitRepo *git.Repository gitRepo *git.Repository
) )
var headTarget string
if pull.HasMerged { if pull.HasMerged {
PrepareMergedViewPullInfo(ctx, issue) PrepareMergedViewPullInfo(ctx, issue)
if ctx.Written() { if ctx.Written() {
@ -329,6 +332,10 @@ func ViewPullFiles(ctx *context.Context) {
startCommitID = pull.MergeBase startCommitID = pull.MergeBase
endCommitID = pull.MergedCommitID endCommitID = pull.MergedCommitID
gitRepo = ctx.Repo.GitRepo gitRepo = ctx.Repo.GitRepo
headTarget = path.Join(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
ctx.Data["Username"] = ctx.Repo.Owner.Name
ctx.Data["Reponame"] = ctx.Repo.Repository.Name
} else { } else {
prInfo := PrepareViewPullInfo(ctx, issue) prInfo := PrepareViewPullInfo(ctx, issue)
if ctx.Written() { if ctx.Written() {
@ -356,6 +363,10 @@ func ViewPullFiles(ctx *context.Context) {
startCommitID = prInfo.MergeBase startCommitID = prInfo.MergeBase
endCommitID = headCommitID endCommitID = headCommitID
gitRepo = headGitRepo gitRepo = headGitRepo
headTarget = path.Join(pull.HeadUserName, pull.HeadRepo.Name)
ctx.Data["Username"] = pull.HeadUserName
ctx.Data["Reponame"] = pull.HeadRepo.Name
} }
diff, err := models.GetDiffRange(diffRepoPath, diff, err := models.GetDiffRange(diffRepoPath,
@ -374,9 +385,6 @@ func ViewPullFiles(ctx *context.Context) {
return return
} }
headTarget := path.Join(pull.HeadUserName, pull.HeadRepo.Name)
ctx.Data["Username"] = pull.HeadUserName
ctx.Data["Reponame"] = pull.HeadRepo.Name
ctx.Data["IsImageFile"] = commit.IsImageFile ctx.Data["IsImageFile"] = commit.IsImageFile
ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", endCommitID) ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", endCommitID)
ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", startCommitID) ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", startCommitID)