From 7a2807ea78c068a74d9dca345fb11d27fffaf0c5 Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 4 May 2021 14:39:39 -0400 Subject: [PATCH 1/5] Add selecting tags on the compare page --- options/locale/locale_en-US.ini | 3 ++ routers/repo/compare.go | 53 +++++++++++++------ templates/repo/diff/compare.tmpl | 88 +++++++++++++++++++++++++++++--- web_src/js/index.js | 19 ++++++- 4 files changed, 138 insertions(+), 25 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 40e4e0c0ba84..51fa3160221f 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 a658374d9b12..d02ea0b1606b 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 124b4e5d1c74..4f5db348994e 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -3,9 +3,9 @@ {{template "repo/header" .}}
- {{if .PageIsComparePull}} + {{if true}}

- {{if and $.IsSigned (not .Repository.IsArchived)}} + {{if and $.PageIsComparePull $.IsSigned (not .Repository.IsArchived)}} {{.i18n.Tr "repo.pulls.compare_changes"}}
{{.i18n.Tr "repo.pulls.compare_changes_desc"}}
{{ else }} @@ -37,15 +37,31 @@ {{svg "octicon-git-compare"}}
- {{.i18n.Tr "repo.pulls.compare_base"}}: {{$BaseCompareName}}:{{$.BaseBranch}} + {{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"}}
{{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}} @@ -65,20 +81,56 @@ {{end}} {{end}}
+
...
- {{.i18n.Tr "repo.pulls.compare_compare"}}: {{$HeadCompareName}}:{{$.HeadBranch}} + {{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}} @@ -98,6 +150,26 @@ {{end}} {{end}}
+
diff --git a/web_src/js/index.js b/web_src/js/index.js index 89cc0aa11c13..69a8a794a185 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1243,10 +1243,16 @@ async function initRepository() { $(this).select(); }); + // Compare or pull request + const $repoDiff = $('.repository.diff'); + if ($repoDiff.length > 0) { + 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(); @@ -3433,6 +3439,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').css('display', 'none'); + $($(this).data('target')).css('display', 'block'); + return false; + }); + }); +} + function initFilterBranchTagDropdown(selector) { $(selector).each(function () { const $dropdown = $(this); From 8bc6499e40107fc6ebd7963733fe28933bbbebd6 Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 4 May 2021 15:01:44 -0400 Subject: [PATCH 2/5] Remove unused condition and change indentation --- templates/repo/diff/compare.tmpl | 284 +++++++++++++++---------------- 1 file changed, 141 insertions(+), 143 deletions(-) diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 4f5db348994e..a5e3251ff4b4 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -3,177 +3,175 @@ {{template "repo/header" .}}
- {{if true}} -

- {{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) -}} +

+ {{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"}} -
-
- {{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"}} + {{- 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"}} +
+
+
+ {{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"}} - - -
+
+
+
+ + + {{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}}:{{.}}
- {{end}} - {{end}} - {{if .OwnForkRepo}} - {{range .OwnForkRepoBranches}} -
{{$OwnForkCompareName}}:{{.}}
- {{end}} +
+
+ {{range .Branches}} +
{{$BaseCompareName}}:{{.}}
+ {{end}} + {{if not .PullRequestCtx.SameRepo}} + {{range .HeadBranches}} +
{{$HeadCompareName}}:{{.}}
{{end}} - {{if .RootRepo}} - {{range .RootRepoBranches}} -
{{$RootRepoCompareName}}:{{.}}
- {{end}} + {{end}} + {{if .OwnForkRepo}} + {{range .OwnForkRepoBranches}} +
{{$OwnForkCompareName}}:{{.}}
{{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"}} +
+ ... +
+
+ {{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-filter" 16}} - -
-
-
-
- - - {{svg "octicon-git-branch" 16 "mr-2"}}{{.i18n.Tr "repo.branches"}} - - - - - {{svg "octicon-tag" 16 "mr-2"}}{{.i18n.Tr "repo.tags"}} - - -
+
+
+
+ + + {{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}} +
+
+ {{range .HeadBranches}} +
{{$HeadCompareName}}:{{.}}
+ {{end}} + {{if not .PullRequestCtx.SameRepo}} + {{range .Branches}} +
{{$BaseCompareName}}:{{.}}
{{end}} - {{if .RootRepo}} - {{range .RootRepoBranches}} -
{{$RootRepoCompareName}}:{{.}}
- {{end}} + {{end}} + {{if .OwnForkRepo}} + {{range .OwnForkRepoBranches}} +
{{$OwnForkCompareName}}:{{.}}
{{end}} -
- + + {{end}}
- {{end}} +
{{if .IsNothingToCompare}} {{if and $.IsSigned $.AllowEmptyPr (not .Repository.IsArchived) }} From af6765cbfa352ae6f8c83bb0665edc589405204d Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Tue, 4 May 2021 17:30:03 -0400 Subject: [PATCH 3/5] Fix tag tab in dropdown to be black --- templates/repo/diff/compare.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index a5e3251ff4b4..7959ef7bb517 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -53,7 +53,7 @@ - + {{svg "octicon-tag" 16 "mr-2"}}{{.i18n.Tr "repo.tags"}} @@ -122,7 +122,7 @@ - + {{svg "octicon-tag" 16 "mr-2"}}{{.i18n.Tr "repo.tags"}} From 1ed8e7a293a36aa1213778ee3988a73fef52771c Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Thu, 6 May 2021 15:50:12 -0400 Subject: [PATCH 4/5] Add compare tag integration test --- integrations/compare_test.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 integrations/compare_test.go diff --git a/integrations/compare_test.go b/integrations/compare_test.go new file mode 100644 index 000000000000..f273118e862c --- /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(".ui.choose.branch .filter.dropdown") + // A dropdown for both base and head. + assert.Lenf(t, selection.Nodes, 2, "The template has changed") +} From 429bc911ceb192760a0ffae98947e9cbe156dd09 Mon Sep 17 00:00:00 2001 From: Jonathan Tran Date: Fri, 7 May 2021 13:58:07 -0400 Subject: [PATCH 5/5] Pull request feedback --- integrations/compare_test.go | 2 +- web_src/js/index.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integrations/compare_test.go b/integrations/compare_test.go index f273118e862c..08468cbfd6e9 100644 --- a/integrations/compare_test.go +++ b/integrations/compare_test.go @@ -18,7 +18,7 @@ func TestCompareTag(t *testing.T) { 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(".ui.choose.branch .filter.dropdown") + 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/web_src/js/index.js b/web_src/js/index.js index d7726a3542ff..d1d8590ea4f5 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1243,7 +1243,7 @@ async function initRepository() { // Compare or pull request const $repoDiff = $('.repository.diff'); - if ($repoDiff.length > 0) { + if ($repoDiff.length) { initBranchOrTagDropdown('.choose.branch .dropdown'); initFilterSearchDropdown('.choose.branch .dropdown'); } @@ -3443,8 +3443,8 @@ function initBranchOrTagDropdown(selector) { $(selector).each(function() { const $dropdown = $(this); $dropdown.find('.reference.column').on('click', function () { - $dropdown.find('.scrolling.reference-list-menu').css('display', 'none'); - $($(this).data('target')).css('display', 'block'); + $dropdown.find('.scrolling.reference-list-menu').hide(); + $($(this).data('target')).show(); return false; }); });