From 48baf50b8e07178325a1ac1961707d571f104877 Mon Sep 17 00:00:00 2001
From: meiji163 <mysatellite99@gmail.com>
Date: Sun, 31 Oct 2021 14:22:43 -0700
Subject: [PATCH] add base repo resolution to archive

---
 pkg/cmd/repo/archive/archive.go | 67 ++++++++++++++++++++++++++-------
 1 file changed, 53 insertions(+), 14 deletions(-)

diff --git a/pkg/cmd/repo/archive/archive.go b/pkg/cmd/repo/archive/archive.go
index eb2af2175..56b13ee3a 100644
--- a/pkg/cmd/repo/archive/archive.go
+++ b/pkg/cmd/repo/archive/archive.go
@@ -5,20 +5,26 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/MakeNowJust/heredoc"
 	"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/cmdutil"
+	"github.com/cli/cli/v2/pkg/prompt"
 
 	"github.com/cli/cli/v2/pkg/iostreams"
 	"github.com/spf13/cobra"
 )
 
 type ArchiveOptions struct {
-	HttpClient func() (*http.Client, error)
-	IO         *iostreams.IOStreams
-	Config     func() (config.Config, error)
-	RepoArg    string
+	HttpClient      func() (*http.Client, error)
+	IO              *iostreams.IOStreams
+	Config          func() (config.Config, error)
+	BaseRepo        func() (ghrepo.Interface, error)
+	RepoArg         string
+	HasRepoOverride bool
+	Confirmed       bool
 }
 
 func NewCmdArchive(f *cmdutil.Factory, runF func(*ArchiveOptions) error) *cobra.Command {
@@ -29,14 +35,23 @@ func NewCmdArchive(f *cmdutil.Factory, runF func(*ArchiveOptions) error) *cobra.
 	}
 
 	cmd := &cobra.Command{
-		DisableFlagsInUseLine: true,
-
-		Use:   "archive <repository>",
+		Use:   "archive [<repository>]",
 		Short: "Archive a repository",
-		Long:  "Archive a GitHub repository.",
-		Args:  cmdutil.ExactArgs(1, "cannot archive: repository argument required"),
+		Long: heredoc.Doc(`Archive a GitHub repository.
+
+With no argument, archives the current repository.`),
+		Args: cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.RepoArg = args[0]
+			if len(args) > 0 {
+				opts.RepoArg = args[0]
+			}
+			opts.BaseRepo = f.BaseRepo
+			opts.HasRepoOverride = cmd.Flags().Changed("repo")
+
+			if !opts.Confirmed && !opts.IO.CanPrompt() {
+				return cmdutil.FlagErrorf("could not prompt: confirmation with prompt or --confirm flag required")
+			}
+
 			if runF != nil {
 				return runF(opts)
 			}
@@ -44,6 +59,8 @@ func NewCmdArchive(f *cmdutil.Factory, runF func(*ArchiveOptions) error) *cobra.
 		},
 	}
 
+	cmdutil.EnableRepoOverride(cmd, f)
+	cmd.Flags().BoolVarP(&opts.Confirmed, "confirm", "y", false, "skip confirmation prompt")
 	return cmd
 }
 
@@ -57,8 +74,16 @@ func archiveRun(opts *ArchiveOptions) error {
 
 	var toArchive ghrepo.Interface
 
-	archiveURL := opts.RepoArg
-	if !strings.Contains(archiveURL, "/") {
+	repoSelector := opts.RepoArg
+	if repoSelector == "" {
+		currRepo, err := opts.BaseRepo()
+		if err != nil {
+			return err
+		}
+		repoSelector = ghrepo.FullName(currRepo)
+	}
+
+	if !strings.Contains(repoSelector, "/") {
 		cfg, err := opts.Config()
 		if err != nil {
 			return err
@@ -72,9 +97,9 @@ func archiveRun(opts *ArchiveOptions) error {
 		if err != nil {
 			return err
 		}
-		archiveURL = currentUser + "/" + archiveURL
+		repoSelector = currentUser + "/" + repoSelector
 	}
-	toArchive, err = ghrepo.FromFullName(archiveURL)
+	toArchive, err = ghrepo.FromFullName(repoSelector)
 	if err != nil {
 		return fmt.Errorf("argument error: %w", err)
 	}
@@ -94,6 +119,20 @@ func archiveRun(opts *ArchiveOptions) error {
 		return nil
 	}
 
+	if !opts.Confirmed {
+		p := &survey.Confirm{
+			Message: fmt.Sprintf("Archive %s?", fullName),
+			Default: false,
+		}
+		err = prompt.SurveyAskOne(p, &opts.Confirmed)
+		if err != nil {
+			return fmt.Errorf("failed to prompt: %w", err)
+		}
+		if !opts.Confirmed {
+			return nil
+		}
+	}
+
 	err = archiveRepo(httpClient, repo)
 	if err != nil {
 		return fmt.Errorf("API called failed: %w", err)