https-github-com-bit
diff --git a/‎pkg/cmd/factory/default.go‎
Lines changed: 94 additions & 41 deletions b/‎pkg/cmd/factory/default.go‎
Lines changed: 94 additions & 41 deletions
@@ -6,6 +6,8 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/cli/cli/api"
+	"github.com/cli/cli/context"
 	"github.com/cli/cli/git"
 	"github.com/cli/cli/internal/config"
 	"github.com/cli/cli/internal/ghrepo"
@@ -14,11 +16,93 @@ import (
 )
 
 func New(appVersion string) *cmdutil.Factory {
-	io := iostreams.System()
+	f := &cmdutil.Factory{
+		IOStreams:  iostreams.System(), // No factory dependencies
+		Config:     configFunc(),       // No factory dependencies
+		Branch:     branchFunc(),       // No factory dependencies
+		Executable: executable(),       // No factory dependencies
+	}
+
+	f.HttpClient = httpClientFunc(f, appVersion) // Depends on Config, IOStreams, and appVersion
+	f.Remotes = remotesFunc(f)                   // Depends on Config
+	f.BaseRepo = BaseRepoFunc(f)                 // Depends on Remotes
+	f.Browser = browser(f)                       // Depends on IOStreams
+
+	return f
+}
+
+func BaseRepoFunc(f *cmdutil.Factory) func() (ghrepo.Interface, error) {
+	return func() (ghrepo.Interface, error) {
+		remotes, err := f.Remotes()
+		if err != nil {
+			return nil, err
+		}
+		return remotes[0], nil
+	}
+}
+
+func SmartBaseRepoFunc(f *cmdutil.Factory) func() (ghrepo.Interface, error) {
+	return func() (ghrepo.Interface, error) {
+		httpClient, err := f.HttpClient()
+		if err != nil {
+			return nil, err
+		}
+
+		apiClient := api.NewClientFromHTTP(httpClient)
+
+		remotes, err := f.Remotes()
+		if err != nil {
+			return nil, err
+		}
+		repoContext, err := context.ResolveRemotesToRepos(remotes, apiClient, "")
+		if err != nil {
+			return nil, err
+		}
+		baseRepo, err := repoContext.BaseRepo(f.IOStreams)
+		if err != nil {
+			return nil, err
+		}
+
+		return baseRepo, nil
+	}
+}
+
+func remotesFunc(f *cmdutil.Factory) func() (context.Remotes, error) {
+	rr := &remoteResolver{
+		readRemotes: git.Remotes,
+		getConfig:   f.Config,
+	}
+	return rr.Resolver()
+}
+
+func httpClientFunc(f *cmdutil.Factory, appVersion string) func() (*http.Client, error) {
+	return func() (*http.Client, error) {
+		io := f.IOStreams
+		cfg, err := f.Config()
+		if err != nil {
+			return nil, err
+		}
+		return NewHTTPClient(io, cfg, appVersion, true), nil
+	}
+}
 
+func browser(f *cmdutil.Factory) cmdutil.Browser {
+	io := f.IOStreams
+	return cmdutil.NewBrowser(os.Getenv("BROWSER"), io.Out, io.ErrOut)
+}
+
+func executable() string {
+	gh := "gh"
+	if exe, err := os.Executable(); err == nil {
+		gh = exe
+	}
+	return gh
+}
+
+func configFunc() func() (config.Config, error) {
 	var cachedConfig config.Config
 	var configError error
-	configFunc := func() (config.Config, error) {
+	return func() (config.Config, error) {
 		if cachedConfig != nil || configError != nil {
 			return cachedConfig, configError
 		}
@@ -30,45 +114,14 @@ func New(appVersion string) *cmdutil.Factory {
 		cachedConfig = config.InheritEnv(cachedConfig)
 		return cachedConfig, configError
 	}
+}
 
-	rr := &remoteResolver{
-		readRemotes: git.Remotes,
-		getConfig:   configFunc,
-	}
-	remotesFunc := rr.Resolver()
-
-	ghExecutable := "gh"
-	if exe, err := os.Executable(); err == nil {
-		ghExecutable = exe
-	}
-
-	return &cmdutil.Factory{
-		IOStreams: io,
-		Config:    configFunc,
-		Remotes:   remotesFunc,
-		HttpClient: func() (*http.Client, error) {
-			cfg, err := configFunc()
-			if err != nil {
-				return nil, err
-			}
-
-			return NewHTTPClient(io, cfg, appVersion, true), nil
-		},
-		BaseRepo: func() (ghrepo.Interface, error) {
-			remotes, err := remotesFunc()
-			if err != nil {
-				return nil, err
-			}
-			return remotes[0], nil
-		},
-		Branch: func() (string, error) {
-			currentBranch, err := git.CurrentBranch()
-			if err != nil {
-				return "", fmt.Errorf("could not determine current branch: %w", err)
-			}
-			return currentBranch, nil
-		},
-		Executable: ghExecutable,
-		Browser:    cmdutil.NewBrowser(os.Getenv("BROWSER"), io.Out, io.ErrOut),
+func branchFunc() func() (string, error) {
+	return func() (string, error) {
+		currentBranch, err := git.CurrentBranch()
+		if err != nil {
+			return "", fmt.Errorf("could not determine current branch: %w", err)
+		}
+		return currentBranch, nil
 	}
 }