123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239 |
- {{template "base/head" .}}
- <div role="main" aria-label="{{.Title}}" class="page-content repository diff {{if .PageIsComparePull}}compare pull{{end}}">
- {{template "repo/header" .}}
- <div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}">
-
- <h2 class="ui header">
- {{if and $.PageIsComparePull $.IsSigned (not .Repository.IsArchived)}}
- {{.locale.Tr "repo.pulls.compare_changes"}}
- <div class="sub header">{{.locale.Tr "repo.pulls.compare_changes_desc"}}</div>
- {{else}}
- {{.locale.Tr "action.compare_commits_general"}}
- {{end}}
- </h2>
- {{if .Flash.WarningMsg}}
- {{/*
- There's already an importing of alert.tmpl in new_form.tmpl,
- but only the negative message will be displayed within forms for some reasons, see semantic.css:10659.
- To avoid repeated negative messages, the importing here if for .Flash.WarningMsg only.
- */}}
- {{template "base/alert" .}}
- {{end}}
- {{$BaseCompareName := $.BaseName -}}
- {{- $HeadCompareName := $.HeadRepo.OwnerName -}}
- {{- if and (eq $.BaseName $.HeadRepo.OwnerName) (ne $.Repository.Name $.HeadRepo.Name) -}}
- {{- $HeadCompareName = printf "%s/%s" $.HeadRepo.OwnerName $.HeadRepo.Name -}}
- {{- end -}}
- {{- $OwnForkCompareName := "" -}}
- {{- if .OwnForkRepo -}}
- {{- $OwnForkCompareName = .OwnForkRepo.OwnerName -}}
- {{- end -}}
- {{- $RootRepoCompareName := "" -}}
- {{- if .RootRepo -}}
- {{- $RootRepoCompareName = .RootRepo.OwnerName -}}
- {{- if eq $.HeadRepo.OwnerName .RootRepo.OwnerName -}}
- {{- $HeadCompareName = printf "%s/%s" $.HeadRepo.OwnerName $.HeadRepo.Name -}}
- {{- end -}}
- {{- if .OwnForkRepo -}}
- {{- if eq $.OwnForkRepo.OwnerName .RootRepo.OwnerName -}}
- {{- $OwnForkRepoCompareName = printf "%s/%s" $.OwnForkRepo.OwnerName $.OwnForkRepo.Name -}}
- {{- end -}}
- {{- end -}}
- {{- end -}}
- <div class="ui segment choose branch">
- <a href="{{$.HeadRepo.Link}}/compare/{{PathEscapeSegments $.HeadBranch}}{{$.CompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.BaseName}}/{{PathEscape $.Repository.Name}}:{{end}}{{PathEscapeSegments $.BaseBranch}}" title="{{.locale.Tr "repo.pulls.switch_head_and_base"}}">{{svg "octicon-git-compare"}}</a>
- <div class="ui floating filter dropdown" data-no-results="{{.locale.Tr "repo.pulls.no_results"}}">
- <div class="ui basic small button">
- <span class="text">{{if $.PageIsComparePull}}{{.locale.Tr "repo.pulls.compare_base"}}{{else}}{{.locale.Tr "repo.compare.compare_base"}}{{end}}: {{$BaseCompareName}}:{{$.BaseBranch}}</span>
- {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- </div>
- <div class="menu">
- <div class="ui icon search input">
- <i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i>
- <input name="search" placeholder="{{.locale.Tr "repo.filter_branch_and_tag"}}...">
- </div>
- <div class="header">
- <div class="ui grid">
- <div class="two column row">
- <a class="reference column" href="#" data-target=".base-branch-list">
- <span class="text black">
- {{svg "octicon-git-branch" 16 "mr-2"}}{{.locale.Tr "repo.branches"}}
- </span>
- </a>
- <a class="reference column" href="#" data-target=".base-tag-list">
- <span class="text black">
- {{svg "octicon-tag" 16 "mr-2"}}{{.locale.Tr "repo.tags"}}
- </span>
- </a>
- </div>
- </div>
- </div>
- <div class="scrolling menu reference-list-menu base-branch-list">
- {{range .Branches}}
- <div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{end}}{{PathEscapeSegments $.HeadBranch}}">{{$BaseCompareName}}:{{.}}</div>
- {{end}}
- {{if not .PullRequestCtx.SameRepo}}
- {{range .HeadBranches}}
- <div class="item" data-url="{{$.HeadRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$HeadCompareName}}:{{.}}</div>
- {{end}}
- {{end}}
- {{if .OwnForkRepo}}
- {{range .OwnForkRepoBranches}}
- <div class="item" data-url="{{$.OwnForkRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$OwnForkCompareName}}:{{.}}</div>
- {{end}}
- {{end}}
- {{if .RootRepo}}
- {{range .RootRepoBranches}}
- <div class="item" data-url="{{$.RootRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$RootRepoCompareName}}:{{.}}</div>
- {{end}}
- {{end}}
- </div>
- <div class="scrolling menu reference-list-menu base-tag-list" style="display: none">
- {{range .Tags}}
- <div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{end}}{{PathEscapeSegments $.HeadBranch}}">{{$BaseCompareName}}:{{.}}</div>
- {{end}}
- {{if not .PullRequestCtx.SameRepo}}
- {{range .HeadTags}}
- <div class="item" data-url="{{$.HeadRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$HeadCompareName}}:{{.}}</div>
- {{end}}
- {{end}}
- {{if .OwnForkRepo}}
- {{range .OwnForkRepoTags}}
- <div class="item" data-url="{{$.OwnForkRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$OwnForkCompareName}}:{{.}}</div>
- {{end}}
- {{end}}
- {{if .RootRepo}}
- {{range .RootRepoTags}}
- <div class="item" data-url="{{$.RootRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$RootRepoCompareName}}:{{.}}</div>
- {{end}}
- {{end}}
- </div>
- </div>
- </div>
- <a href="{{.RepoLink}}/compare/{{PathEscapeSegments .BaseBranch}}{{.OtherCompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{end}}{{PathEscapeSegments $.HeadBranch}}" title="{{.locale.Tr "repo.pulls.switch_comparison_type"}}">{{.CompareSeparator}}</a>
- <div class="ui floating filter dropdown">
- <div class="ui basic small button">
- <span class="text">{{if $.PageIsComparePull}}{{.locale.Tr "repo.pulls.compare_compare"}}{{else}}{{.locale.Tr "repo.compare.compare_head"}}{{end}}: {{$HeadCompareName}}:{{$.HeadBranch}}</span>
- {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- </div>
- <div class="menu">
- <div class="ui icon search input">
- <i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i>
- <input name="search" placeholder="{{.locale.Tr "repo.filter_branch_and_tag"}}...">
- </div>
- <div class="header">
- <div class="ui grid">
- <div class="two column row">
- <a class="reference column" href="#" data-target=".head-branch-list">
- <span class="text black">
- {{svg "octicon-git-branch" 16 "mr-2"}}{{.locale.Tr "repo.branches"}}
- </span>
- </a>
- <a class="reference column" href="#" data-target=".head-tag-list">
- <span class="text black">
- {{svg "octicon-tag" 16 "mr-2"}}{{.locale.Tr "repo.tags"}}
- </span>
- </a>
- </div>
- </div>
- </div>
- <div class="scrolling menu reference-list-menu head-branch-list">
- {{range .HeadBranches}}
- <div class="{{if eq $.HeadBranch .}}selected{{end}} item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{end}}{{PathEscapeSegments .}}">{{$HeadCompareName}}:{{.}}</div>
- {{end}}
- {{if not .PullRequestCtx.SameRepo}}
- {{range .Branches}}
- <div class="item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{PathEscape $.BaseName}}/{{PathEscape $.Repository.Name}}:{{PathEscapeSegments .}}">{{$BaseCompareName}}:{{.}}</div>
- {{end}}
- {{end}}
- {{if .OwnForkRepo}}
- {{range .OwnForkRepoBranches}}
- <div class="item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{PathEscape $.OwnForkRepo.OwnerName}}/{{PathEscape $.OwnForkRepo.Name}}:{{PathEscapeSegments .}}">{{$OwnForkCompareName}}:{{.}}</div>
- {{end}}
- {{end}}
- {{if .RootRepo}}
- {{range .RootRepoBranches}}
- <div class="item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{PathEscape $.RootRepo.OwnerName}}/{{PathEscape $.RootRepo.Name}}:{{PathEscapeSegments .}}">{{$RootRepoCompareName}}:{{.}}</div>
- {{end}}
- {{end}}
- </div>
- <div class="scrolling menu reference-list-menu head-tag-list" style="display: none">
- {{range .HeadTags}}
- <div class="{{if eq $.HeadBranch .}}selected{{end}} item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{end}}{{PathEscapeSegments .}}">{{$HeadCompareName}}:{{.}}</div>
- {{end}}
- {{if not .PullRequestCtx.SameRepo}}
- {{range .Tags}}
- <div class="item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{PathEscape $.BaseName}}/{{PathEscape $.Repository.Name}}:{{PathEscapeSegments .}}">{{$BaseCompareName}}:{{.}}</div>
- {{end}}
- {{end}}
- {{if .OwnForkRepo}}
- {{range .OwnForkRepoTags}}
- <div class="item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{PathEscape $.OwnForkRepo.OwnerName}}/{{PathEscape $.OwnForkRepo.Name}}:{{PathEscapeSegments .}}">{{$OwnForkCompareName}}:{{.}}</div>
- {{end}}
- {{end}}
- {{if .RootRepo}}
- {{range .RootRepoTags}}
- <div class="item" data-url="{{$.RepoLink}}/compare/{{PathEscapeSegments $.BaseBranch}}{{$.CompareSeparator}}{{PathEscape $.RootRepo.OwnerName}}/{{PathEscape $.RootRepo.Name}}:{{PathEscapeSegments .}}">{{$RootRepoCompareName}}:{{.}}</div>
- {{end}}
- {{end}}
- </div>
- </div>
- </div>
- </div>
-
- {{if .IsNothingToCompare}}
- {{if and $.IsSigned $.AllowEmptyPr (not .Repository.IsArchived)}}
- <div class="ui segment">{{.locale.Tr "repo.pulls.nothing_to_compare_and_allow_empty_pr"}}</div>
- <div class="ui info message show-form-container" {{if .Flash}}style="display: none"{{end}}>
- <button class="ui button green show-form">{{.locale.Tr "repo.pulls.new"}}</button>
- </div>
- <div class="pullrequest-form" {{if not .Flash}}style="display: none"{{end}}>
- {{template "repo/issue/new_form" .}}
- </div>
- {{else}}
- <div class="ui segment">{{.locale.Tr "repo.pulls.nothing_to_compare"}}</div>
- {{end}}
- {{else if and .PageIsComparePull (gt .CommitCount 0)}}
- {{if .HasPullRequest}}
- <div class="ui segment grid title">
- <div class="twelve wide column issue-title">
- {{.locale.Tr "repo.pulls.has_pull_request" (Escape $.RepoLink) (Escape $.RepoRelPath) .PullRequest.Index | Safe}}
- <h1>
- <span id="issue-title">{{RenderIssueTitle $.Context .PullRequest.Issue.Title $.RepoLink $.Repository.ComposeMetas}}</span>
- <span class="index">#{{.PullRequest.Issue.Index}}</span>
- </h1>
- </div>
- <div class="four wide right middle aligned column">
- {{- if .PullRequest.HasMerged -}}
- <a href="{{Escape $.RepoLink}}/pulls/{{.PullRequest.Issue.Index}}" class="ui button purple show-form">{{svg "octicon-git-merge" 16}} {{.locale.Tr "repo.pulls.view"}}</a>
- {{else if .Issue.IsClosed}}
- <a href="{{Escape $.RepoLink}}/pulls/{{.PullRequest.Issue.Index}}" class="ui button red show-form">{{svg "octicon-issue-closed" 16}} {{.locale.Tr "repo.pulls.view"}}</a>
- {{else}}
- <a href="{{Escape $.RepoLink}}/pulls/{{.PullRequest.Issue.Index}}" class="ui button green show-form">{{svg "octicon-git-pull-request" 16}} {{.locale.Tr "repo.pulls.view"}}</a>
- {{end}}</div>
- </div>
- {{else}}
- {{if and $.IsSigned (not .Repository.IsArchived)}}
- <div class="ui info message show-form-container" {{if .Flash}}style="display: none"{{end}}>
- <button class="ui button green show-form">{{.locale.Tr "repo.pulls.new"}}</button>
- </div>
- {{else if .Repository.IsArchived}}
- <div class="ui warning message">
- {{.locale.Tr "repo.archive.title"}}
- </div>
- {{end}}
- {{if $.IsSigned}}
- <div class="pullrequest-form" {{if not .Flash}}style="display: none"{{end}}>
- {{template "repo/issue/new_form" .}}
- </div>
- {{end}}
- {{template "repo/commits_table" .}}
- {{template "repo/diff/box" .}}
- {{end}}
- {{else}}
- {{template "repo/commits_table" .}}
- {{template "repo/diff/box" .}}
- {{end}}
- </div>
- </div>
- {{template "base/footer" .}}
|