2019-06-07 22:29:29 +02:00
{{ template "base/head" . }}
2023-02-01 23:56:10 +01:00
< div role = "main" aria-label = " {{ .Title }} " class = "page-content repository diff {{ if .PageIsComparePull }} compare pull {{ end }} " >
2019-06-07 22:29:29 +02:00
{{ template "repo/header" . }}
2023-05-09 07:21:03 +02:00
{{ $showDiffBox := false }}
2023-11-23 17:14:20 +01:00
< div class = "ui container fluid padded" >
2021-05-07 23:10:05 +02:00
< h2 class = "ui header" >
{{ if and $.PageIsComparePull $.IsSigned ( not .Repository.IsArchived ) }}
2023-09-25 15:15:51 +02:00
{{ ctx .Locale.Tr "repo.pulls.compare_changes" }}
< div class = "sub header" > {{ ctx .Locale.Tr "repo.pulls.compare_changes_desc" }} </ div >
2022-08-31 17:58:54 +02:00
{{ else }}
2023-09-25 15:15:51 +02:00
{{ ctx .Locale.Tr "action.compare_commits_general" }}
2022-08-31 17:58:54 +02:00
{{ end }}
2021-05-07 23:10:05 +02:00
< / h2 >
2022-09-02 09:58:49 +02:00
{{ if .Flash.WarningMsg }}
{{ /*
Fix various typos (#21103)
Found via `codespell -q 3 -S
./options/locale,./options/license,./public/vendor,./web_src/fomantic -L
actived,allways,attachements,ba,befores,commiter,pullrequest,pullrequests,readby,splitted,te,unknwon`
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2022-09-07 20:40:36 +02:00
There's already an importing of alert.tmpl in new_form.tmpl,
2022-09-02 09:58:49 +02:00
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 }}
2022-08-31 17:58:54 +02:00
{{ $BaseCompareName := $.BaseName -}}
2021-05-07 23:10:05 +02:00
{{- $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 -}}
2021-03-16 02:36:34 +01:00
{{- $HeadCompareName = printf "%s/%s" $.HeadRepo.OwnerName $.HeadRepo.Name -}}
{{- end -}}
2021-05-07 23:10:05 +02:00
{{- end -}}
< div class = "ui segment choose branch" >
2023-09-25 15:15:51 +02:00
< a href = " {{ $.HeadRepo.Link }} /compare/ {{ PathEscapeSegments $.HeadBranch }}{{ $.CompareSeparator }}{{ if not $.PullRequestCtx.SameRepo }}{{ PathEscape $.BaseName }} / {{ PathEscape $.Repository.Name }} : {{ end }}{{ PathEscapeSegments $.BaseBranch }} " title = " {{ ctx .Locale.Tr "repo.pulls.switch_head_and_base" }} " > {{ svg "octicon-git-compare" }} </ a >
< div class = "ui floating filter dropdown" data-no-results = " {{ ctx .Locale.Tr "repo.pulls.no_results" }} " >
2021-05-07 23:10:05 +02:00
< div class = "ui basic small button" >
2023-09-25 15:15:51 +02:00
< span class = "text" > {{ if $.PageIsComparePull }}{{ ctx .Locale.Tr "repo.pulls.compare_base" }}{{ else }}{{ ctx .Locale.Tr "repo.compare.compare_base" }}{{ end }} : {{ $BaseCompareName }} :{{ $.BaseBranch }} </ span >
2021-05-07 23:10:05 +02:00
{{ svg "octicon-triangle-down" 14 "dropdown icon" }}
< / div >
< div class = "menu" >
< div class = "ui icon search input" >
2023-06-14 18:40:15 +02:00
< i class = "icon" > {{ svg "octicon-filter" 16 }} </ i >
2023-09-25 15:15:51 +02:00
< input name = "search" placeholder = " {{ ctx .Locale.Tr "repo.filter_branch_and_tag" }} ..." >
2019-06-07 22:29:29 +02:00
< / div >
2021-05-07 23:10:05 +02:00
< 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" >
2023-09-25 15:15:51 +02:00
{{ svg "octicon-git-branch" 16 "gt-mr-2" }}{{ ctx .Locale.Tr "repo.branches" }}
2021-05-07 23:10:05 +02:00
< / span >
< / a >
< a class = "reference column" href = "#" data-target = ".base-tag-list" >
< span class = "text black" >
2023-09-25 15:15:51 +02:00
{{ svg "octicon-tag" 16 "gt-mr-2" }}{{ ctx .Locale.Tr "repo.tags" }}
2021-05-07 23:10:05 +02:00
< / span >
< / a >
< / div >
2019-06-07 22:29:29 +02:00
< / div >
2021-05-07 23:10:05 +02:00
< / div >
< div class = "scrolling menu reference-list-menu base-branch-list" >
{{ range .Branches }}
2021-11-16 19:18:25 +01:00
< 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 >
2021-05-07 23:10:05 +02:00
{{ end }}
{{ if not .PullRequestCtx.SameRepo }}
{{ range .HeadBranches }}
2021-11-16 19:18:25 +01:00
< div class = "item" data-url = " {{ $.HeadRepo.Link }} /compare/ {{ PathEscapeSegments . }}{{ $.CompareSeparator }}{{ PathEscape $.HeadUser.Name }} / {{ PathEscape $.HeadRepo.Name }} : {{ PathEscapeSegments $.HeadBranch }} " > {{ $HeadCompareName }} :{{ . }} </ div >
2019-06-07 22:29:29 +02:00
{{ end }}
2021-05-07 23:10:05 +02:00
{{ end }}
{{ if .OwnForkRepo }}
{{ range .OwnForkRepoBranches }}
2021-11-16 19:18:25 +01:00
< div class = "item" data-url = " {{ $.OwnForkRepo.Link }} /compare/ {{ PathEscapeSegments . }}{{ $.CompareSeparator }}{{ PathEscape $.HeadUser.Name }} / {{ PathEscape $.HeadRepo.Name }} : {{ PathEscapeSegments $.HeadBranch }} " > {{ $OwnForkCompareName }} :{{ . }} </ div >
2020-05-12 07:52:46 +02:00
{{ end }}
2021-05-07 23:10:05 +02:00
{{ end }}
2023-08-29 11:07:15 +02:00
{{ if and .RootRepo .RootRepo.AllowsPulls }}
2021-05-07 23:10:05 +02:00
{{ range .RootRepoBranches }}
2021-11-16 19:18:25 +01:00
< div class = "item" data-url = " {{ $.RootRepo.Link }} /compare/ {{ PathEscapeSegments . }}{{ $.CompareSeparator }}{{ PathEscape $.HeadUser.Name }} / {{ PathEscape $.HeadRepo.Name }} : {{ PathEscapeSegments $.HeadBranch }} " > {{ $RootRepoCompareName }} :{{ . }} </ div >
2020-05-12 07:52:46 +02:00
{{ end }}
2021-05-07 23:10:05 +02:00
{{ end }}
< / div >
2023-02-19 05:06:14 +01:00
< div class = "scrolling menu reference-list-menu base-tag-list gt-hidden" >
2021-05-07 23:10:05 +02:00
{{ range .Tags }}
2021-11-16 19:18:25 +01:00
< 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 >
2021-05-07 23:10:05 +02:00
{{ end }}
{{ if not .PullRequestCtx.SameRepo }}
{{ range .HeadTags }}
2021-11-16 19:18:25 +01:00
< div class = "item" data-url = " {{ $.HeadRepo.Link }} /compare/ {{ PathEscapeSegments . }}{{ $.CompareSeparator }}{{ PathEscape $.HeadUser.Name }} / {{ PathEscape $.HeadRepo.Name }} : {{ PathEscapeSegments $.HeadBranch }} " > {{ $HeadCompareName }} :{{ . }} </ div >
2019-10-30 06:58:18 +01:00
{{ end }}
2021-05-07 23:10:05 +02:00
{{ end }}
{{ if .OwnForkRepo }}
{{ range .OwnForkRepoTags }}
2021-11-16 19:18:25 +01:00
< div class = "item" data-url = " {{ $.OwnForkRepo.Link }} /compare/ {{ PathEscapeSegments . }}{{ $.CompareSeparator }}{{ PathEscape $.HeadUser.Name }} / {{ PathEscape $.HeadRepo.Name }} : {{ PathEscapeSegments $.HeadBranch }} " > {{ $OwnForkCompareName }} :{{ . }} </ div >
2021-05-07 23:10:05 +02:00
{{ end }}
{{ end }}
{{ if .RootRepo }}
{{ range .RootRepoTags }}
2021-11-16 19:18:25 +01:00
< div class = "item" data-url = " {{ $.RootRepo.Link }} /compare/ {{ PathEscapeSegments . }}{{ $.CompareSeparator }}{{ PathEscape $.HeadUser.Name }} / {{ PathEscape $.HeadRepo.Name }} : {{ PathEscapeSegments $.HeadBranch }} " > {{ $RootRepoCompareName }} :{{ . }} </ div >
2021-05-07 23:10:05 +02:00
{{ end }}
{{ end }}
2019-06-07 22:29:29 +02:00
< / div >
< / div >
2021-05-07 23:10:05 +02:00
< / div >
2023-09-25 15:15:51 +02:00
< a href = " {{ .RepoLink }} /compare/ {{ PathEscapeSegments .BaseBranch }}{{ .OtherCompareSeparator }}{{ if not $.PullRequestCtx.SameRepo }}{{ PathEscape $.HeadUser.Name }} / {{ PathEscape $.HeadRepo.Name }} : {{ end }}{{ PathEscapeSegments $.HeadBranch }} " title = " {{ ctx .Locale.Tr "repo.pulls.switch_comparison_type" }} " > {{ .CompareSeparator }} </ a >
2021-05-07 23:10:05 +02:00
< div class = "ui floating filter dropdown" >
< div class = "ui basic small button" >
2023-09-25 15:15:51 +02:00
< span class = "text" > {{ if $.PageIsComparePull }}{{ ctx .Locale.Tr "repo.pulls.compare_compare" }}{{ else }}{{ ctx .Locale.Tr "repo.compare.compare_head" }}{{ end }} : {{ $HeadCompareName }} :{{ $.HeadBranch }} </ span >
2021-05-07 23:10:05 +02:00
{{ svg "octicon-triangle-down" 14 "dropdown icon" }}
< / div >
< div class = "menu" >
< div class = "ui icon search input" >
2023-06-14 18:40:15 +02:00
< i class = "icon" > {{ svg "octicon-filter" 16 }} </ i >
2023-09-25 15:15:51 +02:00
< input name = "search" placeholder = " {{ ctx .Locale.Tr "repo.filter_branch_and_tag" }} ..." >
2019-06-07 22:29:29 +02:00
< / div >
2021-05-07 23:10:05 +02:00
< 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" >
2023-09-25 15:15:51 +02:00
{{ svg "octicon-git-branch" 16 "gt-mr-2" }}{{ ctx .Locale.Tr "repo.branches" }}
2021-05-07 23:10:05 +02:00
< / span >
< / a >
< a class = "reference column" href = "#" data-target = ".head-tag-list" >
< span class = "text black" >
2023-09-25 15:15:51 +02:00
{{ svg "octicon-tag" 16 "gt-mr-2" }}{{ ctx .Locale.Tr "repo.tags" }}
2021-05-07 23:10:05 +02:00
< / span >
< / a >
< / div >
2019-06-07 22:29:29 +02:00
< / div >
2021-05-07 23:10:05 +02:00
< / div >
< div class = "scrolling menu reference-list-menu head-branch-list" >
{{ range .HeadBranches }}
2021-11-16 19:18:25 +01:00
< 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 >
2021-05-07 23:10:05 +02:00
{{ end }}
{{ if not .PullRequestCtx.SameRepo }}
{{ range .Branches }}
2021-11-16 19:18:25 +01:00
< div class = "item" data-url = " {{ $.RepoLink }} /compare/ {{ PathEscapeSegments $.BaseBranch }}{{ $.CompareSeparator }}{{ PathEscape $.BaseName }} / {{ PathEscape $.Repository.Name }} : {{ PathEscapeSegments . }} " > {{ $BaseCompareName }} :{{ . }} </ div >
2020-05-12 07:52:46 +02:00
{{ end }}
2021-05-07 23:10:05 +02:00
{{ end }}
{{ if .OwnForkRepo }}
{{ range .OwnForkRepoBranches }}
2021-11-16 19:18:25 +01:00
< div class = "item" data-url = " {{ $.RepoLink }} /compare/ {{ PathEscapeSegments $.BaseBranch }}{{ $.CompareSeparator }}{{ PathEscape $.OwnForkRepo.OwnerName }} / {{ PathEscape $.OwnForkRepo.Name }} : {{ PathEscapeSegments . }} " > {{ $OwnForkCompareName }} :{{ . }} </ div >
2020-05-12 07:52:46 +02:00
{{ end }}
2021-05-07 23:10:05 +02:00
{{ end }}
{{ if .RootRepo }}
{{ range .RootRepoBranches }}
2021-11-16 19:18:25 +01:00
< div class = "item" data-url = " {{ $.RepoLink }} /compare/ {{ PathEscapeSegments $.BaseBranch }}{{ $.CompareSeparator }}{{ PathEscape $.RootRepo.OwnerName }} / {{ PathEscape $.RootRepo.Name }} : {{ PathEscapeSegments . }} " > {{ $RootRepoCompareName }} :{{ . }} </ div >
2020-05-12 07:52:46 +02:00
{{ end }}
2021-05-07 23:10:05 +02:00
{{ end }}
< / div >
2023-02-19 05:06:14 +01:00
< div class = "scrolling menu reference-list-menu head-tag-list gt-hidden" >
2021-05-07 23:10:05 +02:00
{{ range .HeadTags }}
2021-11-16 19:18:25 +01:00
< 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 >
2021-05-07 23:10:05 +02:00
{{ end }}
{{ if not .PullRequestCtx.SameRepo }}
{{ range .Tags }}
2021-11-16 19:18:25 +01:00
< div class = "item" data-url = " {{ $.RepoLink }} /compare/ {{ PathEscapeSegments $.BaseBranch }}{{ $.CompareSeparator }}{{ PathEscape $.BaseName }} / {{ PathEscape $.Repository.Name }} : {{ PathEscapeSegments . }} " > {{ $BaseCompareName }} :{{ . }} </ div >
2019-06-07 22:29:29 +02:00
{{ end }}
2021-05-07 23:10:05 +02:00
{{ end }}
{{ if .OwnForkRepo }}
{{ range .OwnForkRepoTags }}
2021-11-16 19:18:25 +01:00
< div class = "item" data-url = " {{ $.RepoLink }} /compare/ {{ PathEscapeSegments $.BaseBranch }}{{ $.CompareSeparator }}{{ PathEscape $.OwnForkRepo.OwnerName }} / {{ PathEscape $.OwnForkRepo.Name }} : {{ PathEscapeSegments . }} " > {{ $OwnForkCompareName }} :{{ . }} </ div >
2021-05-07 23:10:05 +02:00
{{ end }}
{{ end }}
{{ if .RootRepo }}
{{ range .RootRepoTags }}
2021-11-16 19:18:25 +01:00
< div class = "item" data-url = " {{ $.RepoLink }} /compare/ {{ PathEscapeSegments $.BaseBranch }}{{ $.CompareSeparator }}{{ PathEscape $.RootRepo.OwnerName }} / {{ PathEscape $.RootRepo.Name }} : {{ PathEscapeSegments . }} " > {{ $RootRepoCompareName }} :{{ . }} </ div >
2021-05-07 23:10:05 +02:00
{{ end }}
{{ end }}
2019-06-07 22:29:29 +02:00
< / div >
< / div >
< / div >
2021-05-07 23:10:05 +02:00
< / div >
2019-06-07 22:29:29 +02:00
{{ if .IsNothingToCompare }}
2022-08-31 17:58:54 +02:00
{{ if and $.IsSigned $.AllowEmptyPr ( not .Repository.IsArchived ) }}
2023-09-25 15:15:51 +02:00
< div class = "ui segment" > {{ ctx .Locale.Tr "repo.pulls.nothing_to_compare_and_allow_empty_pr" }} </ div >
2023-02-19 05:06:14 +01:00
< div class = "ui info message show-form-container {{ if .Flash }} gt-hidden {{ end }} " >
2023-09-25 15:15:51 +02:00
< button class = "ui button primary show-form" > {{ ctx .Locale.Tr "repo.pulls.new" }} </ button >
2021-03-04 04:41:23 +01:00
< / div >
2023-02-19 05:06:14 +01:00
< div class = "pullrequest-form {{ if not .Flash }} gt-hidden {{ end }} " >
2021-03-04 04:41:23 +01:00
{{ template "repo/issue/new_form" . }}
< / div >
{{ else }}
2023-09-25 15:15:51 +02:00
< div class = "ui segment" > {{ ctx .Locale.Tr "repo.pulls.nothing_to_compare" }} </ div >
2021-03-04 04:41:23 +01:00
{{ end }}
2020-05-02 10:06:01 +02:00
{{ else if and .PageIsComparePull ( gt .CommitCount 0 ) }}
2019-06-07 22:29:29 +02:00
{{ if .HasPullRequest }}
2021-12-24 13:14:42 +01:00
< div class = "ui segment grid title" >
< div class = "twelve wide column issue-title" >
2023-09-25 15:15:51 +02:00
{{ ctx .Locale.Tr "repo.pulls.has_pull_request" ( print ( Escape $.RepoLink ) "/pulls/" .PullRequest.Issue.Index ) ( Escape $.RepoRelPath ) .PullRequest.Index | Safe }}
2021-12-24 13:14:42 +01:00
< h1 >
2022-04-26 05:14:01 +02:00
< span id = "issue-title" > {{ RenderIssueTitle $.Context .PullRequest.Issue.Title $.RepoLink $.Repository.ComposeMetas }} </ span >
2021-12-24 13:14:42 +01:00
< span class = "index" > #{{ .PullRequest.Issue.Index }} </ span >
< / h1 >
< / div >
2023-05-09 07:21:03 +02:00
< div class = "four wide column middle aligned text right" >
2021-12-24 13:14:42 +01:00
{{- if .PullRequest.HasMerged -}}
2023-09-25 15:15:51 +02:00
< a href = " {{ Escape $.RepoLink }} /pulls/ {{ .PullRequest.Issue.Index }} " class = "ui button purple show-form" > {{ svg "octicon-git-merge" 16 }} {{ ctx .Locale.Tr "repo.pulls.view" }} </ a >
2021-12-24 13:14:42 +01:00
{{ else if .Issue.IsClosed }}
2023-09-25 15:15:51 +02:00
< a href = " {{ Escape $.RepoLink }} /pulls/ {{ .PullRequest.Issue.Index }} " class = "ui button red show-form" > {{ svg "octicon-issue-closed" 16 }} {{ ctx .Locale.Tr "repo.pulls.view" }} </ a >
2021-12-24 13:14:42 +01:00
{{ else }}
2023-09-25 15:15:51 +02:00
< a href = " {{ Escape $.RepoLink }} /pulls/ {{ .PullRequest.Issue.Index }} " class = "ui button primary show-form" > {{ svg "octicon-git-pull-request" 16 }} {{ ctx .Locale.Tr "repo.pulls.view" }} </ a >
2023-05-09 07:21:03 +02:00
{{ end }}
< / div >
2021-04-11 05:46:37 +02:00
< / div >
2020-05-05 00:44:30 +02:00
{{ else }}
{{ if and $.IsSigned ( not .Repository.IsArchived ) }}
2023-02-19 05:06:14 +01:00
< div class = "ui info message show-form-container {{ if .Flash }} gt-hidden {{ end }} " >
2023-09-25 15:15:51 +02:00
< button class = "ui button primary show-form" > {{ ctx .Locale.Tr "repo.pulls.new" }} </ button >
2020-05-05 00:44:30 +02:00
< / div >
{{ else if .Repository.IsArchived }}
2023-07-08 12:57:17 +02:00
< div class = "ui warning message gt-text-center" >
2023-04-26 16:46:26 +02:00
{{ if .Repository.ArchivedUnix.IsZero }}
2023-09-25 15:15:51 +02:00
{{ ctx .Locale.Tr "repo.archive.title" }}
2023-04-26 16:46:26 +02:00
{{ else }}
2023-09-25 15:15:51 +02:00
{{ ctx .Locale.Tr "repo.archive.title_date" ( DateTime "long" .Repository.ArchivedUnix ) | Safe }}
2023-04-26 16:46:26 +02:00
{{ end }}
2020-05-05 00:44:30 +02:00
< / div >
{{ end }}
{{ if $.IsSigned }}
2023-02-19 05:06:14 +01:00
< div class = "pullrequest-form {{ if not .Flash }} gt-hidden {{ end }} " >
2020-05-05 00:44:30 +02:00
{{ template "repo/issue/new_form" . }}
< / div >
{{ end }}
2023-05-09 07:21:03 +02:00
{{ $showDiffBox = true }}
2020-05-05 00:44:30 +02:00
{{ end }}
2019-06-07 22:29:29 +02:00
{{ else }}
2023-05-09 07:21:03 +02:00
{{ $showDiffBox = true }}
{{ end }}
< / div >
{{ if $showDiffBox }}
2023-11-23 17:14:20 +01:00
< div class = "ui container fluid padded" >
2019-06-07 22:29:29 +02:00
{{ template "repo/commits_table" . }}
{{ template "repo/diff/box" . }}
< / div >
2023-05-09 07:21:03 +02:00
{{ end }}
2019-06-07 22:29:29 +02:00
< / div >
{{ template "base/footer" . }}