diff --git a/appview/pages/pages.go b/appview/pages/pages.go --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -1110,6 +1110,8 @@ MergeCheck types.MergeCheckResponse ResubmitCheck ResubmitResult Pipelines map[string]models.Pipeline + Diff *types.NiceDiff + DiffOpts types.DiffOpts OrderedReactionKinds []models.ReactionKind Reactions map[models.ReactionKind]models.ReactionDisplayData diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go --- a/appview/pulls/pulls.go +++ b/appview/pulls/pulls.go @@ -236,7 +236,14 @@ defs[l.AtUri().String()] = &l } - s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ + patch := pull.LatestSubmission().CombinedPatch() + diff := patchutil.AsNiceDiff(patch, pull.TargetBranch) + var diffOpts types.DiffOpts + if d := r.URL.Query().Get("diff"); d == "split" { + diffOpts.Split = true + } + + log.Println(s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ LoggedInUser: user, RepoInfo: s.repoResolver.GetRepoInfo(r, user), Pull: pull, @@ -247,13 +254,15 @@ MergeCheck: mergeCheckResponse, ResubmitCheck: resubmitResult, Pipelines: m, + Diff: &diff, + DiffOpts: diffOpts, OrderedReactionKinds: models.OrderedReactionKinds, Reactions: reactionMap, UserReacted: userReactions, LabelDefs: defs, - }) + })) } func (s *Pulls) mergeCheck(r *http.Request, f *models.Repo, pull *models.Pull, stack models.Stack) types.MergeCheckResponse { diff --git a/spindle/models/models.go b/spindle/models/models.go --- a/spindle/models/models.go +++ b/spindle/models/models.go @@ -53,10 +53,10 @@ StatusKindRunning, } FinishStates [4]StatusKind = [4]StatusKind{ - StatusKindCancelled, StatusKindFailed, - StatusKindSuccess, StatusKindTimeout, + StatusKindCancelled, + StatusKindSuccess, } ) diff --git a/appview/pages/templates/layouts/repobase.html b/appview/pages/templates/layouts/repobase.html --- a/appview/pages/templates/layouts/repobase.html +++ b/appview/pages/templates/layouts/repobase.html @@ -1,7 +1,7 @@ {{ define "title" }}{{ .RepoInfo.FullName }}{{ end }} {{ define "content" }} -
+