* Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfofor-closed-social
@ -0,0 +1,337 @@ | |||
// Copyright 2019 The Gitea Authors. All rights reserved. | |||
// Use of this source code is governed by a MIT-style | |||
// license that can be found in the LICENSE file. | |||
package repo | |||
import ( | |||
"path" | |||
"strings" | |||
"code.gitea.io/gitea/models" | |||
"code.gitea.io/gitea/modules/base" | |||
"code.gitea.io/gitea/modules/context" | |||
"code.gitea.io/gitea/modules/git" | |||
"code.gitea.io/gitea/modules/log" | |||
"code.gitea.io/gitea/modules/setting" | |||
) | |||
const ( | |||
tplCompare base.TplName = "repo/diff/compare" | |||
) | |||
// ParseCompareInfo parse compare info between two commit for preparing comparing references | |||
func ParseCompareInfo(ctx *context.Context) (*models.User, *models.Repository, *git.Repository, *git.CompareInfo, string, string) { | |||
baseRepo := ctx.Repo.Repository | |||
// Get compared branches information | |||
// format: <base branch>...[<head repo>:]<head branch> | |||
// base<-head: master...head:feature | |||
// same repo: master...feature | |||
var ( | |||
headUser *models.User | |||
headBranch string | |||
isSameRepo bool | |||
infoPath string | |||
err error | |||
) | |||
infoPath = ctx.Params("*") | |||
infos := strings.Split(infoPath, "...") | |||
if len(infos) != 2 { | |||
log.Trace("ParseCompareInfo[%d]: not enough compared branches information %s", baseRepo.ID, infos) | |||
ctx.NotFound("CompareAndPullRequest", nil) | |||
return nil, nil, nil, nil, "", "" | |||
} | |||
baseBranch := infos[0] | |||
ctx.Data["BaseBranch"] = baseBranch | |||
// If there is no head repository, it means compare between same repository. | |||
headInfos := strings.Split(infos[1], ":") | |||
if len(headInfos) == 1 { | |||
isSameRepo = true | |||
headUser = ctx.Repo.Owner | |||
headBranch = headInfos[0] | |||
} else if len(headInfos) == 2 { | |||
headUser, err = models.GetUserByName(headInfos[0]) | |||
if err != nil { | |||
if models.IsErrUserNotExist(err) { | |||
ctx.NotFound("GetUserByName", nil) | |||
} else { | |||
ctx.ServerError("GetUserByName", err) | |||
} | |||
return nil, nil, nil, nil, "", "" | |||
} | |||
headBranch = headInfos[1] | |||
isSameRepo = headUser.ID == ctx.Repo.Owner.ID | |||
} else { | |||
ctx.NotFound("CompareAndPullRequest", nil) | |||
return nil, nil, nil, nil, "", "" | |||
} | |||
ctx.Data["HeadUser"] = headUser | |||
ctx.Data["HeadBranch"] = headBranch | |||
ctx.Repo.PullRequest.SameRepo = isSameRepo | |||
// Check if base branch is valid. | |||
baseIsCommit := ctx.Repo.GitRepo.IsCommitExist(baseBranch) | |||
baseIsBranch := ctx.Repo.GitRepo.IsBranchExist(baseBranch) | |||
baseIsTag := ctx.Repo.GitRepo.IsTagExist(baseBranch) | |||
if !baseIsCommit && !baseIsBranch && !baseIsTag { | |||
// Check if baseBranch is short sha commit hash | |||
if baseCommit, _ := ctx.Repo.GitRepo.GetCommit(baseBranch); baseCommit != nil { | |||
baseBranch = baseCommit.ID.String() | |||
ctx.Data["BaseBranch"] = baseBranch | |||
baseIsCommit = true | |||
} else { | |||
ctx.NotFound("IsRefExist", nil) | |||
return nil, nil, nil, nil, "", "" | |||
} | |||
} | |||
ctx.Data["BaseIsCommit"] = baseIsCommit | |||
ctx.Data["BaseIsBranch"] = baseIsBranch | |||
ctx.Data["BaseIsTag"] = baseIsTag | |||
// Check if current user has fork of repository or in the same repository. | |||
headRepo, has := models.HasForkedRepo(headUser.ID, baseRepo.ID) | |||
if !has && !isSameRepo { | |||
ctx.Data["PageIsComparePull"] = false | |||
} | |||
var headGitRepo *git.Repository | |||
if isSameRepo { | |||
headRepo = ctx.Repo.Repository | |||
headGitRepo = ctx.Repo.GitRepo | |||
ctx.Data["BaseName"] = headUser.Name | |||
} else { | |||
headGitRepo, err = git.OpenRepository(models.RepoPath(headUser.Name, headRepo.Name)) | |||
ctx.Data["BaseName"] = baseRepo.OwnerName | |||
if err != nil { | |||
ctx.ServerError("OpenRepository", err) | |||
return nil, nil, nil, nil, "", "" | |||
} | |||
} | |||
// user should have permission to read baseRepo's codes and pulls, NOT headRepo's | |||
permBase, err := models.GetUserRepoPermission(baseRepo, ctx.User) | |||
if err != nil { | |||
ctx.ServerError("GetUserRepoPermission", err) | |||
return nil, nil, nil, nil, "", "" | |||
} | |||
if !permBase.CanRead(models.UnitTypeCode) { | |||
if log.IsTrace() { | |||
log.Trace("Permission Denied: User: %-v cannot read code in Repo: %-v\nUser in baseRepo has Permissions: %-+v", | |||
ctx.User, | |||
baseRepo, | |||
permBase) | |||
} | |||
ctx.NotFound("ParseCompareInfo", nil) | |||
return nil, nil, nil, nil, "", "" | |||
} | |||
// user should have permission to read headrepo's codes | |||
permHead, err := models.GetUserRepoPermission(headRepo, ctx.User) | |||
if err != nil { | |||
ctx.ServerError("GetUserRepoPermission", err) | |||
return nil, nil, nil, nil, "", "" | |||
} | |||
if !permHead.CanRead(models.UnitTypeCode) { | |||
if log.IsTrace() { | |||
log.Trace("Permission Denied: User: %-v cannot read code in Repo: %-v\nUser in headRepo has Permissions: %-+v", | |||
ctx.User, | |||
headRepo, | |||
permHead) | |||
} | |||
ctx.NotFound("ParseCompareInfo", nil) | |||
return nil, nil, nil, nil, "", "" | |||
} | |||
// Check if head branch is valid. | |||
headIsCommit := ctx.Repo.GitRepo.IsCommitExist(headBranch) | |||
headIsBranch := headGitRepo.IsBranchExist(headBranch) | |||
headIsTag := headGitRepo.IsTagExist(headBranch) | |||
if !headIsCommit && !headIsBranch && !headIsTag { | |||
// Check if headBranch is short sha commit hash | |||
if headCommit, _ := ctx.Repo.GitRepo.GetCommit(headBranch); headCommit != nil { | |||
headBranch = headCommit.ID.String() | |||
ctx.Data["HeadBranch"] = headBranch | |||
headIsCommit = true | |||
} else { | |||
ctx.NotFound("IsRefExist", nil) | |||
return nil, nil, nil, nil, "", "" | |||
} | |||
} | |||
ctx.Data["HeadIsCommit"] = headIsCommit | |||
ctx.Data["HeadIsBranch"] = headIsBranch | |||
ctx.Data["HeadIsTag"] = headIsTag | |||
// Treat as pull request if both references are branches | |||
if ctx.Data["PageIsComparePull"] == nil { | |||
ctx.Data["PageIsComparePull"] = headIsBranch && baseIsBranch | |||
} | |||
if ctx.Data["PageIsComparePull"] == true && !permBase.CanReadIssuesOrPulls(true) { | |||
if log.IsTrace() { | |||
log.Trace("Permission Denied: User: %-v cannot create/read pull requests in Repo: %-v\nUser in baseRepo has Permissions: %-+v", | |||
ctx.User, | |||
baseRepo, | |||
permBase) | |||
} | |||
ctx.NotFound("ParseCompareInfo", nil) | |||
return nil, nil, nil, nil, "", "" | |||
} | |||
compareInfo, err := headGitRepo.GetCompareInfo(models.RepoPath(baseRepo.Owner.Name, baseRepo.Name), baseBranch, headBranch) | |||
if err != nil { | |||
ctx.ServerError("GetCompareInfo", err) | |||
return nil, nil, nil, nil, "", "" | |||
} | |||
ctx.Data["BeforeCommitID"] = compareInfo.MergeBase | |||
return headUser, headRepo, headGitRepo, compareInfo, baseBranch, headBranch | |||
} | |||
// PrepareCompareDiff renders compare diff page | |||
func PrepareCompareDiff( | |||
ctx *context.Context, | |||
headUser *models.User, | |||
headRepo *models.Repository, | |||
headGitRepo *git.Repository, | |||
compareInfo *git.CompareInfo, | |||
baseBranch, headBranch string) bool { | |||
var ( | |||
repo = ctx.Repo.Repository | |||
err error | |||
title string | |||
) | |||
// Get diff information. | |||
ctx.Data["CommitRepoLink"] = headRepo.Link() | |||
headCommitID := headBranch | |||
if ctx.Data["HeadIsCommit"] == false { | |||
if ctx.Data["HeadIsTag"] == true { | |||
headCommitID, err = headGitRepo.GetTagCommitID(headBranch) | |||
} else { | |||
headCommitID, err = headGitRepo.GetBranchCommitID(headBranch) | |||
} | |||
if err != nil { | |||
ctx.ServerError("GetRefCommitID", err) | |||
return false | |||
} | |||
} | |||
ctx.Data["AfterCommitID"] = headCommitID | |||
if headCommitID == compareInfo.MergeBase { | |||
ctx.Data["IsNothingToCompare"] = true | |||
return true | |||
} | |||
diff, err := models.GetDiffRange(models.RepoPath(headUser.Name, headRepo.Name), | |||
compareInfo.MergeBase, headCommitID, setting.Git.MaxGitDiffLines, | |||
setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles) | |||
if err != nil { | |||
ctx.ServerError("GetDiffRange", err) | |||
return false | |||
} | |||
ctx.Data["Diff"] = diff | |||
ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0 | |||
headCommit, err := headGitRepo.GetCommit(headCommitID) | |||
if err != nil { | |||
ctx.ServerError("GetCommit", err) | |||
return false | |||
} | |||
compareInfo.Commits = models.ValidateCommitsWithEmails(compareInfo.Commits) | |||
compareInfo.Commits = models.ParseCommitsWithSignature(compareInfo.Commits) | |||
compareInfo.Commits = models.ParseCommitsWithStatus(compareInfo.Commits, headRepo) | |||
ctx.Data["Commits"] = compareInfo.Commits | |||
ctx.Data["CommitCount"] = compareInfo.Commits.Len() | |||
if ctx.Data["CommitCount"] == 0 { | |||
ctx.Data["PageIsComparePull"] = false | |||
} | |||
if compareInfo.Commits.Len() == 1 { | |||
c := compareInfo.Commits.Front().Value.(models.SignCommitWithStatuses) | |||
title = strings.TrimSpace(c.UserCommit.Summary()) | |||
body := strings.Split(strings.TrimSpace(c.UserCommit.Message()), "\n") | |||
if len(body) > 1 { | |||
ctx.Data["content"] = strings.Join(body[1:], "\n") | |||
} | |||
} else { | |||
title = headBranch | |||
} | |||
ctx.Data["title"] = title | |||
ctx.Data["Username"] = headUser.Name | |||
ctx.Data["Reponame"] = headRepo.Name | |||
ctx.Data["IsImageFile"] = headCommit.IsImageFile | |||
headTarget := path.Join(headUser.Name, repo.Name) | |||
ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", "commit", headCommitID) | |||
ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", "commit", compareInfo.MergeBase) | |||
ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(headTarget, "raw", "commit", headCommitID) | |||
return false | |||
} | |||
// CompareDiff show different from one commit to another commit | |||
func CompareDiff(ctx *context.Context) { | |||
headUser, headRepo, headGitRepo, compareInfo, baseBranch, headBranch := ParseCompareInfo(ctx) | |||
if ctx.Written() { | |||
return | |||
} | |||
nothingToCompare := PrepareCompareDiff(ctx, headUser, headRepo, headGitRepo, compareInfo, baseBranch, headBranch) | |||
if ctx.Written() { | |||
return | |||
} | |||
if ctx.Data["PageIsComparePull"] == true { | |||
pr, err := models.GetUnmergedPullRequest(headRepo.ID, ctx.Repo.Repository.ID, headBranch, baseBranch) | |||
if err != nil { | |||
if !models.IsErrPullRequestNotExist(err) { | |||
ctx.ServerError("GetUnmergedPullRequest", err) | |||
return | |||
} | |||
} else { | |||
ctx.Data["HasPullRequest"] = true | |||
ctx.Data["PullRequest"] = pr | |||
ctx.HTML(200, tplCompareDiff) | |||
return | |||
} | |||
if !nothingToCompare { | |||
// Setup information for new form. | |||
RetrieveRepoMetas(ctx, ctx.Repo.Repository) | |||
if ctx.Written() { | |||
return | |||
} | |||
} | |||
headBranches, err := headGitRepo.GetBranches() | |||
if err != nil { | |||
ctx.ServerError("GetBranches", err) | |||
return | |||
} | |||
ctx.Data["HeadBranches"] = headBranches | |||
} | |||
beforeCommitID := ctx.Data["BeforeCommitID"].(string) | |||
afterCommitID := ctx.Data["AfterCommitID"].(string) | |||
ctx.Data["Title"] = "Comparing " + base.ShortSha(beforeCommitID) + "..." + base.ShortSha(afterCommitID) | |||
ctx.Data["IsRepoToolbarCommits"] = true | |||
ctx.Data["IsDiffCompare"] = true | |||
ctx.Data["RequireHighlightJS"] = true | |||
ctx.Data["RequireTribute"] = true | |||
ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes | |||
setTemplateIfExists(ctx, pullRequestTemplateKey, pullRequestTemplateCandidates) | |||
renderAttachmentSettings(ctx) | |||
ctx.HTML(200, tplCompare) | |||
} |
@ -0,0 +1,89 @@ | |||
{{template "base/head" .}} | |||
<div class="repository diff"> | |||
{{template "repo/header" .}} | |||
<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}"> | |||
<div class="ui top attached info clearing segment {{if .Commit.Signature}} isSigned {{if .Verification.Verified }} isVerified {{end}}{{end}}"> | |||
<a class="ui floated right blue tiny button" href="{{EscapePound .SourcePath}}"> | |||
{{.i18n.Tr "repo.diff.browse_source"}} | |||
</a> | |||
<h3 class="has-emoji">{{RenderCommitMessage .Commit.Message $.RepoLink $.Repository.ComposeMetas}}{{template "repo/commit_status" .CommitStatus}}</h3> | |||
{{if IsMultilineCommitMessage .Commit.Message}} | |||
<pre class="commit-body">{{RenderCommitBody .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre> | |||
{{end}} | |||
<span class="text grey"><i class="octicon octicon-git-branch"></i>{{.BranchName}}</span> | |||
</div> | |||
<div class="ui attached info segment {{if .Commit.Signature}} isSigned {{if .Verification.Verified }} isVerified {{end}}{{end}}"> | |||
<div class="ui stackable grid"> | |||
<div class="nine wide column"> | |||
{{if .Author}} | |||
<img class="ui avatar image" src="{{.Author.RelAvatarLink}}" /> | |||
{{if .Author.FullName}} | |||
<a href="{{.Author.HomeLink}}"><strong>{{.Author.FullName}}</strong></a> {{if .IsSigned}}<{{.Commit.Author.Email}}>{{end}} | |||
{{else}} | |||
<a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a> {{if .IsSigned}}<{{.Commit.Author.Email}}>{{end}} | |||
{{end}} | |||
{{else}} | |||
<img class="ui avatar image" src="{{AvatarLink .Commit.Author.Email}}" /> | |||
<strong>{{.Commit.Author.Name}}</strong> | |||
{{end}} | |||
<span class="text grey" id="authored-time">{{TimeSince .Commit.Author.When $.Lang}}</span> | |||
</div> | |||
<div class="seven wide right aligned column"> | |||
<div class="ui horizontal list"> | |||
{{if .Parents}} | |||
<div class="item"> | |||
{{.i18n.Tr "repo.diff.parent"}} | |||
</div> | |||
<div class="item"> | |||
{{range .Parents}} | |||
<a class="ui blue sha label" href="{{$.RepoLink}}/commit/{{.}}">{{ShortSha .}}</a> | |||
{{end}} | |||
</div> | |||
{{end}} | |||
<div class="mobile-only"></div> | |||
<div class="item">{{.i18n.Tr "repo.diff.commit"}}</div> | |||
<div class="item"><span class="ui blue sha label">{{ShortSha .CommitID}}</span></div> | |||
</div> | |||
</div><!-- end column --> | |||
</div><!-- end grid --> | |||
</div> | |||
{{if .Commit.Signature}} | |||
{{if .Verification.Verified }} | |||
<div class="ui bottom attached positive message"> | |||
<i class="green lock icon"></i> | |||
<span>{{.i18n.Tr "repo.commits.signed_by"}}:</span> | |||
<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong></a> <{{.Commit.Committer.Email}}> | |||
<span class="pull-right"><span>{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> {{.Verification.SigningKey.KeyID}}</span> | |||
</div> | |||
{{else}} | |||
<div class="ui bottom attached message"> | |||
<i class="grey unlock icon"></i> | |||
{{.i18n.Tr .Verification.Reason}} | |||
</div> | |||
{{end}} | |||
{{end}} | |||
{{if .Note}} | |||
<div class="ui top attached info segment message git-notes"> | |||
<i class="sticky note icon"></i> | |||
{{.i18n.Tr "repo.diff.git-notes"}}: | |||
{{if .NoteAuthor}} | |||
<a href="{{.NoteAuthor.HomeLink}}"> | |||
{{if .NoteAuthor.FullName}} | |||
<strong>{{.NoteAuthor.FullName}}</strong> | |||
{{else}} | |||
<strong>{{.NoteCommit.Author.Name}}</strong> | |||
{{end}} | |||
</a> | |||
{{else}} | |||
<strong>{{.NoteCommit.Author.Name}}</strong> | |||
{{end}} | |||
<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When $.Lang}}</span> | |||
</div> | |||
<div class="ui bottom attached info segment git-notes"> | |||
<pre class="commit-body">{{RenderNote .Note $.RepoLink $.Repository.ComposeMetas}}</pre> | |||
</div> | |||
{{end}} | |||
{{template "repo/diff/box" .}} | |||
</div> | |||
</div> | |||
{{template "base/footer" .}} |
@ -0,0 +1,74 @@ | |||
{{template "base/head" .}} | |||
<div class="repository diff {{if .PageIsComparePull}}compare pull{{end}}"> | |||
{{template "repo/header" .}} | |||
<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}"> | |||
{{if .PageIsComparePull}} | |||
<h2 class="ui header"> | |||
{{.i18n.Tr "repo.pulls.compare_changes"}} | |||
<div class="sub header">{{.i18n.Tr "repo.pulls.compare_changes_desc"}}</div> | |||
</h2> | |||
<div class="ui segment choose branch"> | |||
<span class="octicon octicon-git-compare"></span> | |||
<div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> | |||
<div class="ui basic small button"> | |||
<span class="text">{{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}</span> | |||
<i class="dropdown icon"></i> | |||
</div> | |||
<div class="menu"> | |||
<div class="ui icon search input"> | |||
<i class="filter icon"></i> | |||
<input name="search" placeholder="{{.i18n.Tr "repo.pulls.filter_branch"}}..."> | |||
</div> | |||
<div class="scrolling menu"> | |||
{{range .Branches}} | |||
<div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-url="{{$.RepoLink}}/compare/{{EscapePound .}}...{{if not $.PullRequestCtx.SameRepo}}{{$.HeadUser.Name}}:{{end}}{{EscapePound $.HeadBranch}}">{{$.BaseName}}:{{.}}</div> | |||
{{end}} | |||
</div> | |||
</div> | |||
</div> | |||
... | |||
<div class="ui floating filter dropdown"> | |||
<div class="ui basic small button"> | |||
<span class="text">{{.i18n.Tr "repo.pulls.compare_compare"}}: {{$.HeadUser.Name}}:{{$.HeadBranch}}</span> | |||
<i class="dropdown icon"></i> | |||
</div> | |||
<div class="menu"> | |||
<div class="ui icon search input"> | |||
<i class="filter icon"></i> | |||
<input name="search" placeholder="{{.i18n.Tr "repo.pulls.filter_branch"}}..."> | |||
</div> | |||
<div class="scrolling menu"> | |||
{{range .HeadBranches}} | |||
<div class="{{if eq $.HeadBranch .}}selected{{end}} item" data-url="{{$.RepoLink}}/compare/{{EscapePound $.BaseBranch}}...{{if not $.PullRequestCtx.SameRepo}}{{$.HeadUser.Name}}:{{end}}{{EscapePound .}}">{{$.HeadUser.Name}}:{{.}}</div> | |||
{{end}} | |||
</div> | |||
</div> | |||
</div> | |||
</div> | |||
{{end}} | |||
{{if .IsNothingToCompare}} | |||
<div class="ui segment">{{.i18n.Tr "repo.pulls.nothing_to_compare"}}</div> | |||
{{else if .PageIsComparePull}} | |||
{{if .HasPullRequest}} | |||
<div class="ui segment"> | |||
{{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}} | |||
</div> | |||
{{else}} | |||
<div class="ui info message show-form-container"> | |||
<button class="ui button green show-form">{{.i18n.Tr "repo.pulls.new"}}</button> | |||
</div> | |||
<div class="pullrequest-form" style="display: none"> | |||
{{template "repo/issue/new_form" .}} | |||
</div> | |||
{{template "repo/commits_table" .}} | |||
{{template "repo/diff/box" .}} | |||
{{end}} | |||
{{else}} | |||
{{template "repo/commits_table" .}} | |||
{{template "repo/diff/box" .}} | |||
{{end}} | |||
</div> | |||
</div> | |||
{{template "base/footer" .}} |
@ -1,94 +0,0 @@ | |||
{{template "base/head" .}} | |||
<div class="repository diff"> | |||
{{template "repo/header" .}} | |||
<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}"> | |||
{{if .IsDiffCompare }} | |||
{{template "repo/commits_table" .}} | |||
{{else}} | |||
<div class="ui top attached info clearing segment {{if .Commit.Signature}} isSigned {{if .Verification.Verified }} isVerified {{end}}{{end}}"> | |||
<a class="ui floated right blue tiny button" href="{{EscapePound .SourcePath}}"> | |||
{{.i18n.Tr "repo.diff.browse_source"}} | |||
</a> | |||
<h3 class="has-emoji">{{RenderCommitMessage .Commit.Message $.RepoLink $.Repository.ComposeMetas}}{{template "repo/commit_status" .CommitStatus}}</h3> | |||
{{if IsMultilineCommitMessage .Commit.Message}} | |||
<pre class="commit-body">{{RenderCommitBody .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre> | |||
{{end}} | |||
<span class="text grey"><i class="octicon octicon-git-branch"></i>{{.BranchName}}</span> | |||
</div> | |||
<div class="ui attached info segment {{if .Commit.Signature}} isSigned {{if .Verification.Verified }} isVerified {{end}}{{end}}"> | |||
<div class="ui stackable grid"> | |||
<div class="nine wide column"> | |||
{{if .Author}} | |||
<img class="ui avatar image" src="{{.Author.RelAvatarLink}}" /> | |||
{{if .Author.FullName}} | |||
<a href="{{.Author.HomeLink}}"><strong>{{.Author.FullName}}</strong></a> {{if .IsSigned}}<{{.Commit.Author.Email}}>{{end}} | |||
{{else}} | |||
<a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a> {{if .IsSigned}}<{{.Commit.Author.Email}}>{{end}} | |||
{{end}} | |||
{{else}} | |||
<img class="ui avatar image" src="{{AvatarLink .Commit.Author.Email}}" /> | |||
<strong>{{.Commit.Author.Name}}</strong> | |||
{{end}} | |||
<span class="text grey" id="authored-time">{{TimeSince .Commit.Author.When $.Lang}}</span> | |||
</div> | |||
<div class="seven wide right aligned column"> | |||
<div class="ui horizontal list"> | |||
{{if .Parents}} | |||
<div class="item"> | |||
{{.i18n.Tr "repo.diff.parent"}} | |||
</div> | |||
<div class="item"> | |||
{{range .Parents}} | |||
<a class="ui blue sha label" href="{{$.RepoLink}}/commit/{{.}}">{{ShortSha .}}</a> | |||
{{end}} | |||
</div> | |||
{{end}} | |||
<div class="mobile-only"></div> | |||
<div class="item">{{.i18n.Tr "repo.diff.commit"}}</div> | |||
<div class="item"><span class="ui blue sha label">{{ShortSha .CommitID}}</span></div> | |||
</div> | |||
</div><!-- end column --> | |||
</div><!-- end grid --> | |||
</div> | |||
{{if .Commit.Signature}} | |||
{{if .Verification.Verified }} | |||
<div class="ui bottom attached positive message"> | |||
<i class="green lock icon"></i> | |||
<span>{{.i18n.Tr "repo.commits.signed_by"}}:</span> | |||
<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong></a> <{{.Commit.Committer.Email}}> | |||
<span class="pull-right"><span>{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> {{.Verification.SigningKey.KeyID}}</span> | |||
</div> | |||
{{else}} | |||
<div class="ui bottom attached message"> | |||
<i class="grey unlock icon"></i> | |||
{{.i18n.Tr .Verification.Reason}} | |||
</div> | |||
{{end}} | |||
{{end}} | |||
{{if .Note}} | |||
<div class="ui top attached info segment message git-notes"> | |||
<i class="sticky note icon"></i> | |||
{{.i18n.Tr "repo.diff.git-notes"}}: | |||
{{if .NoteAuthor}} | |||
<a href="{{.NoteAuthor.HomeLink}}"> | |||
{{if .NoteAuthor.FullName}} | |||
<strong>{{.NoteAuthor.FullName}}</strong> | |||
{{else}} | |||
<strong>{{.NoteCommit.Author.Name}}</strong> | |||
{{end}} | |||
</a> | |||
{{else}} | |||
<strong>{{.NoteCommit.Author.Name}}</strong> | |||
{{end}} | |||
<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When $.Lang}}</span> | |||
</div> | |||
<div class="ui bottom attached info segment git-notes"> | |||
<pre class="commit-body">{{RenderNote .Note $.RepoLink $.Repository.ComposeMetas}}</pre> | |||
</div> | |||
{{end}} | |||
{{end}} | |||
{{template "repo/diff/box" .}} | |||
</div> | |||
</div> | |||
{{template "base/footer" .}} |
@ -1,69 +0,0 @@ | |||
{{template "base/head" .}} | |||
<div class="repository compare pull diff"> | |||
{{template "repo/header" .}} | |||
<div class="ui container"> | |||
<div class="sixteen wide column page grid"> | |||
<h2 class="ui header"> | |||
{{.i18n.Tr "repo.pulls.compare_changes"}} | |||
<div class="sub header">{{.i18n.Tr "repo.pulls.compare_changes_desc"}}</div> | |||
</h2> | |||
<div class="ui segment choose branch"> | |||
<span class="octicon octicon-git-compare"></span> | |||
<div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> | |||
<div class="ui basic small button"> | |||
<span class="text">{{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}</span> | |||
<i class="dropdown icon"></i> | |||
</div> | |||
<div class="menu"> | |||
<div class="ui icon search input"> | |||
<i class="filter icon"></i> | |||
<input name="search" placeholder="{{.i18n.Tr "repo.pulls.filter_branch"}}..."> | |||
</div> | |||
<div class="scrolling menu"> | |||
{{range .Branches}} | |||
<div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-url="{{$.RepoLink}}/compare/{{EscapePound .}}...{{if not $.PullRequestCtx.SameRepo}}{{$.HeadUser.Name}}:{{end}}{{EscapePound $.HeadBranch}}">{{$.BaseName}}:{{.}}</div> | |||
{{end}} | |||
</div> | |||
</div> | |||
</div> | |||
... | |||
<div class="ui floating filter dropdown"> | |||
<div class="ui basic small button"> | |||
<span class="text">{{.i18n.Tr "repo.pulls.compare_compare"}}: {{$.HeadUser.Name}}:{{$.HeadBranch}}</span> | |||
<i class="dropdown icon"></i> | |||
</div> | |||
<div class="menu"> | |||
<div class="ui icon search input"> | |||
<i class="filter icon"></i> | |||
<input name="search" placeholder="{{.i18n.Tr "repo.pulls.filter_branch"}}..."> | |||
</div> | |||
<div class="scrolling menu"> | |||
{{range .HeadBranches}} | |||
<div class="{{if eq $.HeadBranch .}}selected{{end}} item" data-url="{{$.RepoLink}}/compare/{{EscapePound $.BaseBranch}}...{{if not $.PullRequestCtx.SameRepo}}{{$.HeadUser.Name}}:{{end}}{{EscapePound .}}">{{$.HeadUser.Name}}:{{.}}</div> | |||
{{end}} | |||
</div> | |||
</div> | |||
</div> | |||
</div> | |||
{{if .IsNothingToCompare}} | |||
<div class="ui segment"> | |||
{{.i18n.Tr "repo.pulls.nothing_to_compare"}} | |||
</div> | |||
{{else if .HasPullRequest}} | |||
<div class="ui segment"> | |||
{{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}} | |||
</div> | |||
{{else if eq .CommitCount 0 }} | |||
{{template "repo/commits_table" .}} | |||
{{template "repo/diff/box" .}} | |||
{{else}} | |||
{{template "repo/issue/new_form" .}} | |||
{{template "repo/commits_table" .}} | |||
{{template "repo/diff/box" .}} | |||
{{end}} | |||
</div> | |||
</div> | |||
</div> | |||
{{template "base/footer" .}} |