rebase strife

nate smith · nate smith · commit 17eb2bbae5bf · 2021-11-17T16:14:49.000-06:00
diff --git a/pkg/cmd/issue/shared/frecent.go b/pkg/cmd/issue/shared/frecent.go
@@ -10,10 +10,10 @@ import (
 	"time"
 
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/cli/cli/api"
-	"github.com/cli/cli/internal/config"
-	"github.com/cli/cli/internal/ghrepo"
-	"github.com/cli/cli/pkg/prompt"
+	"github.com/cli/cli/v2/api"
+	"github.com/cli/cli/v2/internal/config"
+	"github.com/cli/cli/v2/internal/ghrepo"
+	"github.com/cli/cli/v2/pkg/prompt"
 	"gopkg.in/yaml.v3"
 )
 
diff --git a/pkg/cmd/issue/view/view.go b/pkg/cmd/issue/view/view.go
@@ -84,7 +84,7 @@ func viewRun(opts *ViewOptions) error {
 	}
 	if opts.IO.CanPrompt() && opts.SelectorArg == "" {
 		baseRepo, err := opts.BaseRepo()
-		issueNumber, err := shared.SelectFrecent(httpClient, baseRepo)
+		issueNumber, err := issueShared.SelectFrecent(httpClient, baseRepo)
 		if err != nil {
 			return err
 		}
@@ -105,7 +105,7 @@ func viewRun(opts *ViewOptions) error {
 		return err
 	}
 
-	err = shared.UpdateFrecent(issue.Number)
+	err = issueShared.UpdateFrecent(issue.Number)
 	if err != nil {
 		// TODO just warn or ignore or whatever
 		return err

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func viewRun(opts *ViewOptions) error {`
`84`	`84`	`}`
`85`	`85`	`if opts.IO.CanPrompt() && opts.SelectorArg == "" {`
`86`	`86`	`baseRepo, err := opts.BaseRepo()`
`87`		`- issueNumber, err := shared.SelectFrecent(httpClient, baseRepo)`
	`87`	`+ issueNumber, err := issueShared.SelectFrecent(httpClient, baseRepo)`
`88`	`88`	`if err != nil {`
`89`	`89`	`return err`
`90`	`90`	`}`
`@@ -105,7 +105,7 @@ func viewRun(opts *ViewOptions) error {`
`105`	`105`	`return err`
`106`	`106`	`}`
`107`	`107`
`108`		`- err = shared.UpdateFrecent(issue.Number)`
	`108`	`+ err = issueShared.UpdateFrecent(issue.Number)`
`109`	`109`	`if err != nil {`
`110`	`110`	`// TODO just warn or ignore or whatever`
`111`	`111`	`return err`