Remove convertRepoInterfaceToRepository

probablycorey · probablycorey · commit 46a1e3cd53e5 · 2020-05-20T11:19:31.000-07:00
diff --git a/api/queries_repo.go b/api/queries_repo.go
@@ -84,6 +84,9 @@ func GitHubRepo(client *Client, repo ghrepo.Interface) (*Repository, error) {
 			hasIssuesEnabled
 			description
 			viewerPermission
+			defaultBranchRef {
+				name
+			}
 		}
 	}`
 	variables := map[string]interface{}{
diff --git a/command/pr.go b/command/pr.go
@@ -526,7 +526,6 @@ func prMerge(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return nil
 		}
-
 	}
 
 	var action string
@@ -551,7 +550,7 @@ func prMerge(cmd *cobra.Command, args []string) error {
 	fmt.Fprintf(colorableOut(cmd), "%s %s pull request #%d\n", utils.Magenta("✔"), action, pr.Number)
 
 	if deleteBranch {
-		repo, err := convertRepoInterfaceToRepository(ctx, baseRepo)
+		repo, err := api.GitHubRepo(apiClient, baseRepo)
 		if err != nil {
 			return err
 		}
diff --git a/command/root.go b/command/root.go
@@ -249,30 +249,6 @@ func determineBaseRepo(apiClient *api.Client, cmd *cobra.Command, ctx context.Co
 	return baseRepo, nil
 }
 
-func convertRepoInterfaceToRepository(ctx context.Context, repo ghrepo.Interface) (*api.Repository, error) {
-	apiClient, err := apiClientForContext(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	remotes, err := ctx.Remotes()
-	if err != nil {
-		return nil, err
-	}
-
-	repoContext, err := context.ResolveRemotesToRepos(remotes, apiClient, "")
-	if err != nil {
-		return nil, err
-	}
-
-	baseRepo, err := repoContext.BaseRepo()
-	if err != nil {
-		return nil, err
-	}
-
-	return baseRepo, nil
-}
-
 func rootHelpFunc(command *cobra.Command, s []string) {
 	if command != RootCmd {
 		cobraDefaultHelpFunc(command, s)

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,6 @@ func prMerge(cmd *cobra.Command, args []string) error {`
`526`	`526`	`if err != nil {`
`527`	`527`	`return nil`
`528`	`528`	`}`
`529`		`-`
`530`	`529`	`}`
`531`	`530`
`532`	`531`	`var action string`
`@@ -551,7 +550,7 @@ func prMerge(cmd *cobra.Command, args []string) error {`
`551`	`550`	`fmt.Fprintf(colorableOut(cmd), "%s %s pull request #%d\n", utils.Magenta("✔"), action, pr.Number)`
`552`	`551`
`553`	`552`	`if deleteBranch {`
`554`		`- repo, err := convertRepoInterfaceToRepository(ctx, baseRepo)`
	`553`	`+ repo, err := api.GitHubRepo(apiClient, baseRepo)`
`555`	`554`	`if err != nil {`
`556`	`555`	`return err`
`557`	`556`	`}`