diff --git a/integrations/compare_test.go b/integrations/compare_test.go new file mode 100644 index 0000000000..08468cbfd6 --- /dev/null +++ b/integrations/compare_test.go @@ -0,0 +1,24 @@ +// Copyright 2021 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 integrations + +import ( + "net/http" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestCompareTag(t *testing.T) { + defer prepareTestEnv(t)() + + session := loginUser(t, "user2") + req := NewRequest(t, "GET", "/user2/repo1/compare/v1.1...master") + resp := session.MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + selection := htmlDoc.doc.Find(".choose.branch .filter.dropdown") + // A dropdown for both base and head. + assert.Lenf(t, selection.Nodes, 2, "The template has changed") +} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 40e4e0c0ba..51fa316022 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1286,6 +1286,9 @@ issues.review.resolved_by = marked this conversation as resolved issues.assignee.error = Not all assignees was added due to an unexpected error. issues.reference_issue.body = Body +compare.compare_base = base +compare.compare_head = compare + pulls.desc = Enable pull requests and code reviews. pulls.new = New Pull Request pulls.compare_changes = New Pull Request diff --git a/routers/repo/compare.go b/routers/repo/compare.go index a658374d9b..d02ea0b160 100644 --- a/routers/repo/compare.go +++ b/routers/repo/compare.go @@ -391,7 +391,7 @@ func ParseCompareInfo(ctx *context.Context) (*models.User, *models.Repository, * if rootRepo != nil && rootRepo.ID != headRepo.ID && rootRepo.ID != baseRepo.ID { - perm, branches, err := getBranchesForRepo(ctx.User, rootRepo) + perm, branches, tags, err := getBranchesAndTagsForRepo(ctx.User, rootRepo) if err != nil { ctx.ServerError("GetBranchesForRepo", err) return nil, nil, nil, nil, "", "" @@ -399,19 +399,20 @@ func ParseCompareInfo(ctx *context.Context) (*models.User, *models.Repository, * if perm { ctx.Data["RootRepo"] = rootRepo ctx.Data["RootRepoBranches"] = branches + ctx.Data["RootRepoTags"] = tags } } // If we have a ownForkRepo and it's different from: // 1. The computed base - // 2. The computed hea + // 2. The computed head // 3. The rootRepo (if we have one) // then get the branches from it. if ownForkRepo != nil && ownForkRepo.ID != headRepo.ID && ownForkRepo.ID != baseRepo.ID && (rootRepo == nil || ownForkRepo.ID != rootRepo.ID) { - perm, branches, err := getBranchesForRepo(ctx.User, ownForkRepo) + perm, branches, tags, err := getBranchesAndTagsForRepo(ctx.User, ownForkRepo) if err != nil { ctx.ServerError("GetBranchesForRepo", err) return nil, nil, nil, nil, "", "" @@ -419,6 +420,7 @@ func ParseCompareInfo(ctx *context.Context) (*models.User, *models.Repository, * if perm { ctx.Data["OwnForkRepo"] = ownForkRepo ctx.Data["OwnForkRepoBranches"] = branches + ctx.Data["OwnForkRepoTags"] = tags } } @@ -572,25 +574,29 @@ func PrepareCompareDiff( return false } -func getBranchesForRepo(user *models.User, repo *models.Repository) (bool, []string, error) { +func getBranchesAndTagsForRepo(user *models.User, repo *models.Repository) (bool, []string, []string, error) { perm, err := models.GetUserRepoPermission(repo, user) if err != nil { - return false, nil, err + return false, nil, nil, err } if !perm.CanRead(models.UnitTypeCode) { - return false, nil, nil + return false, nil, nil, nil } gitRepo, err := git.OpenRepository(repo.RepoPath()) if err != nil { - return false, nil, err + return false, nil, nil, err } defer gitRepo.Close() branches, _, err := gitRepo.GetBranches(0, 0) if err != nil { - return false, nil, err + return false, nil, nil, err } - return true, branches, nil + tags, err := gitRepo.GetTags() + if err != nil { + return false, nil, nil, err + } + return true, branches, tags, nil } // CompareDiff show different from one commit to another commit @@ -608,14 +614,29 @@ func CompareDiff(ctx *context.Context) { return } - if ctx.Data["PageIsComparePull"] == true { - headBranches, _, err := headGitRepo.GetBranches(0, 0) - if err != nil { - ctx.ServerError("GetBranches", err) - return - } - ctx.Data["HeadBranches"] = headBranches + baseGitRepo := ctx.Repo.GitRepo + baseTags, err := baseGitRepo.GetTags() + if err != nil { + ctx.ServerError("GetTags", err) + return + } + ctx.Data["Tags"] = baseTags + headBranches, _, err := headGitRepo.GetBranches(0, 0) + if err != nil { + ctx.ServerError("GetBranches", err) + return + } + ctx.Data["HeadBranches"] = headBranches + + headTags, err := headGitRepo.GetTags() + if err != nil { + ctx.ServerError("GetTags", err) + return + } + ctx.Data["HeadTags"] = headTags + + if ctx.Data["PageIsComparePull"] == true { pr, err := models.GetUnmergedPullRequest(headRepo.ID, ctx.Repo.Repository.ID, headBranch, baseBranch) if err != nil { if !models.IsErrPullRequestNotExist(err) { diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 124b4e5d1c..7959ef7bb5 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -3,105 +3,175 @@ {{template "repo/header" .}}
- {{if .PageIsComparePull}} -

- {{if and $.IsSigned (not .Repository.IsArchived)}} - {{.i18n.Tr "repo.pulls.compare_changes"}} -
{{.i18n.Tr "repo.pulls.compare_changes_desc"}}
- {{ else }} - {{.i18n.Tr "action.compare_commits_general"}} - {{ end }} -

- {{ $BaseCompareName := $.BaseName -}} - {{- $HeadCompareName := $.HeadRepo.OwnerName -}} - {{- if and (eq $.BaseName $.HeadRepo.OwnerName) (ne $.Repository.Name $.HeadRepo.Name) -}} +

+ {{if and $.PageIsComparePull $.IsSigned (not .Repository.IsArchived)}} + {{.i18n.Tr "repo.pulls.compare_changes"}} +
{{.i18n.Tr "repo.pulls.compare_changes_desc"}}
+ {{ else }} + {{.i18n.Tr "action.compare_commits_general"}} + {{ 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 -}} - {{- $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 -}} + {{- if eq $.OwnForkRepo.OwnerName .RootRepo.OwnerName -}} + {{- $OwnForkRepoCompareName = printf "%s/%s" $.OwnForkRepo.OwnerName $.OwnForkRepo.Name -}} {{- end -}} {{- end -}} -
- {{svg "octicon-git-compare"}} -
-
- {{.i18n.Tr "repo.pulls.compare_base"}}: {{$BaseCompareName}}:{{$.BaseBranch}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
-
-
- {{svg "octicon-filter" 16}} - -
-
- {{range .Branches}} -
{{$BaseCompareName}}:{{.}}
- {{end}} - {{if not .PullRequestCtx.SameRepo}} - {{range .HeadBranches}} -
{{$HeadCompareName}}:{{.}}
- {{end}} - {{end}} - {{if .OwnForkRepo}} - {{range .OwnForkRepoBranches}} -
{{$OwnForkCompareName}}:{{.}}
- {{end}} - {{end}} - {{if .RootRepo}} - {{range .RootRepoBranches}} -
{{$RootRepoCompareName}}:{{.}}
- {{end}} - {{end}} -
-
+ {{- end -}} +
+ {{svg "octicon-git-compare"}} +
+
+ {{if $.PageIsComparePull}}{{.i18n.Tr "repo.pulls.compare_base"}}{{else}}{{.i18n.Tr "repo.compare.compare_base"}}{{end}}: {{$BaseCompareName}}:{{$.BaseBranch}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- ... -
-
- {{.i18n.Tr "repo.pulls.compare_compare"}}: {{$HeadCompareName}}:{{$.HeadBranch}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+
+ {{svg "octicon-filter" 16}} +
-
-
- {{svg "octicon-filter" 16}} - +
+
+
+ + + {{svg "octicon-git-branch" 16 "mr-2"}}{{.i18n.Tr "repo.branches"}} + + + + + {{svg "octicon-tag" 16 "mr-2"}}{{.i18n.Tr "repo.tags"}} + + +
-
+
+
+ {{range .Branches}} +
{{$BaseCompareName}}:{{.}}
+ {{end}} + {{if not .PullRequestCtx.SameRepo}} {{range .HeadBranches}} -
{{$HeadCompareName}}:{{.}}
+
{{$HeadCompareName}}:{{.}}
{{end}} - {{if not .PullRequestCtx.SameRepo}} - {{range .Branches}} -
{{$BaseCompareName}}:{{.}}
- {{end}} + {{end}} + {{if .OwnForkRepo}} + {{range .OwnForkRepoBranches}} +
{{$OwnForkCompareName}}:{{.}}
{{end}} - {{if .OwnForkRepo}} - {{range .OwnForkRepoBranches}} -
{{$OwnForkCompareName}}:{{.}}
- {{end}} + {{end}} + {{if .RootRepo}} + {{range .RootRepoBranches}} +
{{$RootRepoCompareName}}:{{.}}
{{end}} - {{if .RootRepo}} - {{range .RootRepoBranches}} -
{{$RootRepoCompareName}}:{{.}}
- {{end}} + {{end}} +
+ + {{end}} + {{if .OwnForkRepo}} + {{range .OwnForkRepoTags}} +
{{$OwnForkCompareName}}:{{.}}
+ {{end}} + {{end}} + {{if .RootRepo}} + {{range .RootRepoTags}} +
{{$RootRepoCompareName}}:{{.}}
+ {{end}} + {{end}}
- {{end}} + ... +
+
+ {{if $.PageIsComparePull}}{{.i18n.Tr "repo.pulls.compare_compare"}}{{else}}{{.i18n.Tr "repo.compare.compare_head"}}{{end}}: {{$HeadCompareName}}:{{$.HeadBranch}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+
+
+ {{svg "octicon-filter" 16}} + +
+
+
+
+ + + {{svg "octicon-git-branch" 16 "mr-2"}}{{.i18n.Tr "repo.branches"}} + + + + + {{svg "octicon-tag" 16 "mr-2"}}{{.i18n.Tr "repo.tags"}} + + +
+
+
+
+ {{range .HeadBranches}} +
{{$HeadCompareName}}:{{.}}
+ {{end}} + {{if not .PullRequestCtx.SameRepo}} + {{range .Branches}} +
{{$BaseCompareName}}:{{.}}
+ {{end}} + {{end}} + {{if .OwnForkRepo}} + {{range .OwnForkRepoBranches}} +
{{$OwnForkCompareName}}:{{.}}
+ {{end}} + {{end}} + {{if .RootRepo}} + {{range .RootRepoBranches}} +
{{$RootRepoCompareName}}:{{.}}
+ {{end}} + {{end}} +
+ +
+
+
{{if .IsNothingToCompare}} {{if and $.IsSigned $.AllowEmptyPr (not .Repository.IsArchived) }} diff --git a/web_src/js/index.js b/web_src/js/index.js index 2d9f7f4caf..6ffff9cb19 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1241,10 +1241,16 @@ async function initRepository() { $(this).select(); }); + // Compare or pull request + const $repoDiff = $('.repository.diff'); + if ($repoDiff.length) { + initBranchOrTagDropdown('.choose.branch .dropdown'); + initFilterSearchDropdown('.choose.branch .dropdown'); + } + // Pull request const $repoComparePull = $('.repository.compare.pull'); if ($repoComparePull.length > 0) { - initFilterSearchDropdown('.choose.branch .dropdown'); // show pull request form $repoComparePull.find('button.show-form').on('click', function (e) { e.preventDefault(); @@ -3447,6 +3453,17 @@ function initIssueTimetracking() { }); } +function initBranchOrTagDropdown(selector) { + $(selector).each(function() { + const $dropdown = $(this); + $dropdown.find('.reference.column').on('click', function () { + $dropdown.find('.scrolling.reference-list-menu').hide(); + $($(this).data('target')).show(); + return false; + }); + }); +} + function initFilterBranchTagDropdown(selector) { $(selector).each(function () { const $dropdown = $(this);