Refactor code to live inside default pkg

Author: samcoe

context/context.go

@@ -4,6 +4,7 @@ package context
 import (
 	"errors"
 	"sort"
+	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/cli/cli/v2/api"
@@ -59,93 +60,6 @@ type ResolvedRemotes struct {
 	apiClient    *api.Client
 }
 
-func GetBaseRepo(remotes Remotes) (ghrepo.Interface, error) {
-	for _, r := range remotes {
-		if r.Resolved == "base" {
-			return r, nil
-		} else if r.Resolved != "" {
-			repo, err := ghrepo.FromFullName(r.Resolved)
-			if err != nil {
-				return nil, err
-			}
-			return ghrepo.NewWithHost(repo.RepoOwner(), repo.RepoName(), r.RepoHost()), nil
-		}
-	}
-	return nil, errors.New("a default repo has not been set, use `gh repo default` to set a default repo")
-}
-
-func (r *ResolvedRemotes) SetBaseRepo(io *iostreams.IOStreams) error {
-	resolution := "base"
-	if !io.CanPrompt() {
-		return git.SetRemoteResolution(r.remotes[0].Name, resolution)
-	}
-
-	// from here on, consult the API
-	if r.network == nil {
-		err := resolveNetwork(r)
-		if err != nil {
-			return err
-		}
-	}
-
-	var repoNames []string
-	repoMap := map[string]*api.Repository{}
-	add := func(r *api.Repository) {
-		fn := ghrepo.FullName(r)
-		if _, ok := repoMap[fn]; !ok {
-			repoMap[fn] = r
-			repoNames = append(repoNames, fn)
-		}
-	}
-
-	for _, repo := range r.network.Repositories {
-		if repo == nil {
-			continue
-		}
-		if repo.Parent != nil {
-			add(repo.Parent)
-		}
-		add(repo)
-	}
-
-	if len(repoNames) == 0 {
-		return git.SetRemoteResolution(r.remotes[0].Name, resolution)
-	}
-
-	baseName := repoNames[0]
-	if len(repoNames) > 1 {
-		err := prompt.SurveyAskOne(&survey.Select{
-			Message: "Which should be the base repository (used for e.g. querying issues) for this directory?",
-			Options: repoNames,
-		}, &baseName)
-		if err != nil {
-			return err
-		}
-	}
-
-	// determine corresponding git remote
-	selectedRepo := repoMap[baseName]
-	remote, _ := r.RemoteForRepo(selectedRepo)
-	if remote == nil {
-		remote = r.remotes[0]
-		resolution = ghrepo.FullName(selectedRepo)
-	}
-
-	// cache the result to git config
-	return git.SetRemoteResolution(remote.Name, resolution)
-}
-
-func RemoveBaseRepo(remotes Remotes) error {
-	for _, remote := range remotes {
-		if remote.Resolved == "base" {
-			if err := git.UnsetRemoteResolution(remote.Remote.Name); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
 func (r *ResolvedRemotes) BaseRepo(io *iostreams.IOStreams) (ghrepo.Interface, error) {
 	if r.baseOverride != nil {
 		return r.baseOverride, nil
@@ -169,36 +83,18 @@ func (r *ResolvedRemotes) BaseRepo(io *iostreams.IOStreams) (ghrepo.Interface, e
 		return r.remotes[0], nil
 	}
 
-	// from here on, consult the API
-	if r.network == nil {
-		err := resolveNetwork(r)
-		if err != nil {
-			return nil, err
-		}
+	repos, err := r.NetworkRepos()
+	if err != nil {
+		return nil, err
 	}
 
-	var repoNames []string
-	repoMap := map[string]*api.Repository{}
-	add := func(r *api.Repository) {
-		fn := ghrepo.FullName(r)
-		if _, ok := repoMap[fn]; !ok {
-			repoMap[fn] = r
-			repoNames = append(repoNames, fn)
-		}
-	}
-
-	for _, repo := range r.network.Repositories {
-		if repo == nil {
-			continue
-		}
-		if repo.Parent != nil {
-			add(repo.Parent)
-		}
-		add(repo)
+	if len(repos) == 0 {
+		return r.remotes[0], nil
 	}
 
-	if len(repoNames) == 0 {
-		return r.remotes[0], nil
+	var repoNames []string
+	for _, r := range repos {
+		repoNames = append(repoNames, ghrepo.FullName(r))
 	}
 
 	baseName := repoNames[0]
@@ -216,7 +112,8 @@ func (r *ResolvedRemotes) BaseRepo(io *iostreams.IOStreams) (ghrepo.Interface, e
 	}
 
 	// determine corresponding git remote
-	selectedRepo := repoMap[baseName]
+	owner, repo, _ := strings.Cut(baseName, "/")
+	selectedRepo := ghrepo.New(owner, repo)
 	resolution := "base"
 	remote, _ := r.RemoteForRepo(selectedRepo)
 	if remote == nil {
@@ -225,7 +122,7 @@ func (r *ResolvedRemotes) BaseRepo(io *iostreams.IOStreams) (ghrepo.Interface, e
 	}
 
 	// cache the result to git config
-	err := git.SetRemoteResolution(remote.Name, resolution)
+	err = git.SetRemoteResolution(remote.Name, resolution)
 	return selectedRepo, err
 }
 
@@ -246,6 +143,38 @@ func (r *ResolvedRemotes) HeadRepos() ([]*api.Repository, error) {
 	return results, nil
 }
 
+func (r *ResolvedRemotes) NetworkRepos() ([]*api.Repository, error) {
+	if r.network == nil {
+		err := resolveNetwork(r)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	var repos []*api.Repository
+	repoMap := map[string]bool{}
+
+	add := func(r *api.Repository) {
+		fn := ghrepo.FullName(r)
+		if _, ok := repoMap[fn]; !ok {
+			repoMap[fn] = true
+			repos = append(repos, r)
+		}
+	}
+
+	for _, repo := range r.network.Repositories {
+		if repo == nil {
+			continue
+		}
+		if repo.Parent != nil {
+			add(repo.Parent)
+		}
+		add(repo)
+	}
+
+	return repos, nil
+}
+
 // RemoteForRepo finds the git remote that points to a repository
 func (r *ResolvedRemotes) RemoteForRepo(repo ghrepo.Interface) (*Remote, error) {
 	for _, remote := range r.remotes {

context/remote.go

@@ -21,7 +21,7 @@ func (r Remotes) FindByName(names ...string) (*Remote, error) {
 			}
 		}
 	}
-	return nil, fmt.Errorf("no GitHub remotes found")
+	return nil, fmt.Errorf("no matching remote found")
 }
 
 // FindByRepo returns the first Remote that points to a specific GitHub repository
@@ -34,6 +34,29 @@ func (r Remotes) FindByRepo(owner, name string) (*Remote, error) {
 	return nil, fmt.Errorf("no matching remote found")
 }
 
+// Filter remotes by given hostnames, maintains original order
+func (r Remotes) FilterByHosts(hosts []string) Remotes {
+	filtered := make(Remotes, 0)
+	for _, rr := range r {
+		for _, host := range hosts {
+			if strings.EqualFold(rr.RepoHost(), host) {
+				filtered = append(filtered, rr)
+				break
+			}
+		}
+	}
+	return filtered
+}
+
+func (r Remotes) ResolvedRemote() (*Remote, error) {
+	for _, rr := range r {
+		if rr.Resolved != "" {
+			return rr, nil
+		}
+	}
+	return nil, fmt.Errorf("no resolved remote found")
+}
+
 func remoteNameSortScore(name string) int {
 	switch strings.ToLower(name) {
 	case "upstream":
@@ -54,20 +77,6 @@ func (r Remotes) Less(i, j int) bool {
 	return remoteNameSortScore(r[i].Name) > remoteNameSortScore(r[j].Name)
 }
 
-// Filter remotes by given hostnames, maintains original order
-func (r Remotes) FilterByHosts(hosts []string) Remotes {
-	filtered := make(Remotes, 0)
-	for _, rr := range r {
-		for _, host := range hosts {
-			if strings.EqualFold(rr.RepoHost(), host) {
-				filtered = append(filtered, rr)
-				break
-			}
-		}
-	}
-	return filtered
-}
-
 // Remote represents a git remote mapped to a GitHub repository
 type Remote struct {
 	*git.Remote

git/fixtures/simple.git/config

@@ -7,9 +7,3 @@
 [user]
 	name = Mona the Cat
 	email = monalisa@github.com
-[remote "origin"]
-	url = git@github.com:monathecat/cli.git
-	fetch = +refs/heads/*:refs/remotes/origin/*
-[remote "upstream"]
-	url = git@github.com:cli/cli.git
-	fetch = +refs/heads/trunk:refs/remotes/upstream/trunk

git/git.go

@@ -394,7 +394,6 @@ func ToplevelDir() (string, error) {
 	}
 	output, err := run.PrepareCmd(showCmd).Output()
 	return firstLine(output), err
-
 }
 
 // ToplevelDirFromPath returns the top-level given path of the current repository
@@ -439,3 +438,16 @@ func getBranchShortName(output []byte) string {
 	branch := firstLine(output)
 	return strings.TrimPrefix(branch, "refs/heads/")
 }
+
+func IsGitDirectory() bool {
+	showCmd, err := GitCommand("rev-parse", "--is-inside-work-tree")
+	if err != nil {
+		return false
+	}
+	output, err := run.PrepareCmd(showCmd).Output()
+	if err != nil {
+		return false
+	}
+	out := firstLine(output)
+	return out == "true"
+}

git/remote.go

@@ -169,7 +169,7 @@ func SetRemoteResolution(name, resolution string) error {
 }
 
 func UnsetRemoteResolution(name string) error {
-	unsetCmd, err := GitCommand("config", "--unset-all", fmt.Sprintf("remote.%s.gh-resolved", name))
+	unsetCmd, err := GitCommand("config", "--unset", fmt.Sprintf("remote.%s.gh-resolved", name))
 	if err != nil {
 		return err
 	}