From 9ecc9029599841c7b2503366679f6fc5e0752836 Mon Sep 17 00:00:00 2001 From: Alisson Santos Date: Fri, 13 Nov 2020 10:20:30 +0100 Subject: [PATCH 1/2] Generate correct URL when branch option is passed in --- pkg/cmd/repo/view/view.go | 10 +++++++++- pkg/cmd/repo/view/view_test.go | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/cmd/repo/view/view.go b/pkg/cmd/repo/view/view.go index 94dc9a526..db6880af3 100644 --- a/pkg/cmd/repo/view/view.go +++ b/pkg/cmd/repo/view/view.go @@ -4,6 +4,7 @@ import ( "errors" "fmt" "net/http" + "net/url" "strings" "syscall" "text/template" @@ -100,7 +101,7 @@ func viewRun(opts *ViewOptions) error { return err } - openURL := ghrepo.GenerateRepoURL(toView, "") + openURL := generateBranchURL(toView, opts.Branch) if opts.Web { if opts.IO.IsStdoutTTY() { fmt.Fprintf(opts.IO.ErrOut, "Opening %s in your browser.\n", utils.DisplayURL(openURL)) @@ -201,3 +202,10 @@ func isMarkdownFile(filename string) bool { strings.HasSuffix(filename, ".mdown") || strings.HasSuffix(filename, ".mkdown") } +func generateBranchURL(r ghrepo.Interface, branch string) string { + if branch == "" { + return ghrepo.GenerateRepoURL(r, "") + } + + return ghrepo.GenerateRepoURL(r, "tree/%s", url.QueryEscape(branch)) +} diff --git a/pkg/cmd/repo/view/view_test.go b/pkg/cmd/repo/view/view_test.go index aeb8ae9b7..945fab965 100644 --- a/pkg/cmd/repo/view/view_test.go +++ b/pkg/cmd/repo/view/view_test.go @@ -222,7 +222,7 @@ func Test_ViewRun(t *testing.T) { - View this repository on GitHub: https://github.com/OWNER/REPO + View this repository on GitHub: https://github.com/OWNER/REPO/tree/feat%2Fawesome `), }, { From 62e560d6ee2220d0ea4d8e4a1a6c6e2be03a97f6 Mon Sep 17 00:00:00 2001 From: Alisson Santos Date: Fri, 13 Nov 2020 10:24:17 +0100 Subject: [PATCH 2/2] add empty line between functions --- pkg/cmd/repo/view/view.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/cmd/repo/view/view.go b/pkg/cmd/repo/view/view.go index db6880af3..77a343f38 100644 --- a/pkg/cmd/repo/view/view.go +++ b/pkg/cmd/repo/view/view.go @@ -202,6 +202,7 @@ func isMarkdownFile(filename string) bool { strings.HasSuffix(filename, ".mdown") || strings.HasSuffix(filename, ".mkdown") } + func generateBranchURL(r ghrepo.Interface, branch string) string { if branch == "" { return ghrepo.GenerateRepoURL(r, "")