Merge pull request #3264 from carapace-sh/git-skipto

git: moved `skip-to` and `rotate-to`

Author: rsteube

completers/common/git_completer/cmd/common/diff.go

@@ -85,7 +85,9 @@ func AddDiffFlags(cmd *cobra.Command) {
 	cmd.Flags().Bool("raw", false, "Generate the diff in raw format")
 	cmd.Flags().String("relative", "", "exclude changes outside the directory")
 	cmd.Flags().Bool("rename-empty", false, "Whether to use empty blobs as rename source")
+	cmd.Flags().String("rotate-to", "", "Move the files before the named <file> to the end")
 	cmd.Flags().Bool("shortstat", false, "Output only the last line of the --stat format")
+	cmd.Flags().String("skip-to", "", "Discard the files before the named <file> from the output")
 	cmd.Flags().String("src-prefix", "", "Show the given source prefix instead of \"a/\"")
 	cmd.Flags().String("stat", "", "Generate a diffstat")
 	cmd.Flags().String("stat-count", "", "Generate diffstat with limited lines")
@@ -126,6 +128,8 @@ func AddDiffFlags(cmd *cobra.Command) {
 		"follow":             carapace.ActionFiles(), // TODO complete files of specific revision/modified between commits?
 		"ignore-submodules":  carapace.ActionValues("none", "untracked", "dirty", "all"),
 		"output":             carapace.ActionFiles(),
+		"rotate-to":          carapace.ActionFiles(), // TODO complete files of specific revision/modified between commits?
+		"skip-to":            carapace.ActionFiles(), // TODO complete files of specific revision/modified between commits?
 		"submodule":          carapace.ActionValues("short", "long", "log"),
 		"word-diff":          git.ActionWordDiffModes(),
 		"ws-error-highlight": git.ActionWsErrorHighlightModes().UniqueList(","),

completers/common/git_completer/cmd/diff.go

@@ -23,16 +23,10 @@ func init() {
 	// TODO move into common flag groups
 	diffCmd.Flags().StringS("G", "G", "", "Look for differences whose patch text contains added/removed lines that match <regex>")
 	diffCmd.Flags().Bool("quiet", false, "Disable all output of the program")
-	diffCmd.Flags().String("rotate-to", "", "Move the files before the named <file> to the end")
-	diffCmd.Flags().String("skip-to", "", "Discard the files before the named <file> from the output")
 	diffCmd.Flags().Bool("staged", false, "Show diff between index and named commit")
 	common.AddDiffFlags(diffCmd)
 	rootCmd.AddCommand(diffCmd)
 
-	carapace.Gen(diffCmd).FlagCompletion(carapace.ActionMap{
-		"skip-to": carapace.ActionFiles(), // TODO complete files of specific revision/modified between commits?
-	})
-
 	carapace.Gen(diffCmd).PositionalAnyCompletion(
 		actionDiffArgs(diffCmd),
 	)

completers/common/git_completer/cmd/diffFiles.go

@@ -25,8 +25,6 @@ func init() {
 	diffFilesCmd.Flags().Bool("mailmap", false, "Use mailmap file to map author and committer name")
 	diffFilesCmd.Flags().Bool("no-relative", false, "Do not show relative pathnames")
 	diffFilesCmd.Flags().BoolS("q", "q", false, "Remain silent even for nonexistent files")
-	diffFilesCmd.Flags().String("rotate-to", "", "Move the files before the named <file> to the end")
-	diffFilesCmd.Flags().String("skip-to", "", "Discard the files before the named <file> from the output")
 	diffFilesCmd.Flags().Bool("use-mailmap", false, "Use mailmap file to map author and committer name")
 	common.AddDiffFlags(diffFilesCmd)
 	common.AddPrettyFlags(diffFilesCmd)

completers/common/git_completer/cmd/diffIndex.go

@@ -22,8 +22,6 @@ func init() {
 	diffIndexCmd.Flags().Bool("merge-base", false, "use the merge base between <tree-ish> and HEAD")
 	diffIndexCmd.Flags().Bool("no-relative", false, "do not make the output relative")
 	diffIndexCmd.Flags().Bool("quiet", false, "disable all output of the program")
-	diffIndexCmd.Flags().String("rotate-to", "", "move files before the named <file> to the end")
-	diffIndexCmd.Flags().String("skip-to", "", "discard the files before the named <file> from the output ")
 	common.AddDiffFlags(diffIndexCmd)
 	rootCmd.AddCommand(diffIndexCmd)
 

completers/common/git_completer/cmd/diffTree.go

@@ -29,9 +29,7 @@ func init() {
 	diffTreeCmd.Flags().Bool("quiet", false, "disable all output of the program")
 	diffTreeCmd.Flags().BoolS("r", "r", false, "recurse into sub-trees")
 	diffTreeCmd.Flags().Bool("root", false, "show the initial commit as a big creation event")
-	diffTreeCmd.Flags().String("rotate-to", "", "move the files before the named <file> to end")
 	diffTreeCmd.Flags().Bool("show-notes-by-default", false, "show the default notes unless options for displaying specific notes are given")
-	diffTreeCmd.Flags().String("skip-to", "", "discard the files before the named <file> from the output")
 	diffTreeCmd.Flags().Bool("stdin", false, "read from standard input")
 	diffTreeCmd.Flags().BoolS("t", "t", false, "show tree entry itself as well as subtrees")
 	diffTreeCmd.Flags().BoolS("v", "v", false, "also show the commit message before the differences")

completers/common/git_completer/cmd/log.go

@@ -45,11 +45,9 @@ func init() {
 	logCmd.Flags().Bool("no-use-mailmap", false, "Do not use mailmap file to map author and committer names and email addresses to canonical real names and email addresses.")
 	logCmd.Flags().String("notes", "", "Show the notes that annotate the commit")
 	logCmd.Flags().Bool("reverse", false, "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with --walk-reflogs.")
-	logCmd.Flags().String("rotate-to", "", "Discard the files before the named <file> from the output (i.e.  skip to), or move them to the end of the output (i.e.  rotate to).")
 	logCmd.Flags().Bool("show-pulls", false, "Include all commits from the default mode, but also any merge commits that are not TREESAME to the first parent but are TREESAME to a later parent.")
 	logCmd.Flags().Bool("simplify-by-decoration", false, "Commits that are referred by some branch or tag are selected.")
 	logCmd.Flags().Bool("simplify-merges", false, "First, build a history graph in the same way that --full-history with parent rewriting does.")
-	logCmd.Flags().String("skip-to", "", "Discard the files before the named <file> from the output (i.e.  skip to), or move them to the end of the output (i.e.  rotate to).")
 	logCmd.Flags().Bool("source", false, "Print out the ref name given on the command line by which each commit was reached.")
 	logCmd.Flags().Bool("sparse", false, "All commits that are walked are included.")
 	logCmd.Flags().BoolS("t", "t", false, "Show the tree objects in the diff output.")