Merge pull request #1994 from rsteube/jj-next

jj: next

completers/jj_completer/cmd/next.go

@@ -2,11 +2,12 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/jj"
 	"github.com/spf13/cobra"
 )
 
 var nextCmd = &cobra.Command{
-	Use:   "next",
+	Use:   "next [OPTIONS] [AMOUNT]",
 	Short: "Move the current working copy commit to the next child revision in the repository.",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
@@ -17,4 +18,8 @@ func init() {
 	nextCmd.Flags().Bool("edit", false, "Instead of creating a new working-copy commit on top of the target commit (like `jj new`), edit the target commit directly (like `jj edit`)")
 	nextCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
 	rootCmd.AddCommand(nextCmd)
+
+	carapace.Gen(nextCmd).PositionalCompletion(
+		jj.ActionNextCommits(100),
+	)
 }

pkg/actions/tools/jj/commit.go

@@ -45,6 +45,20 @@ func ActionPrevCommits(limit int) carapace.Action {
 	}).Tag("previous commits")
 }
 
+func ActionNextCommits(limit int) carapace.Action {
+	return carapace.ActionExecCommand("jj", "log", "--no-graph", "--template", `commit_id.short() ++ "\t" ++ description.first_line() ++ "\n"`, "--revisions", "@-::", "--limit", strconv.Itoa(limit))(func(output []byte) carapace.Action {
+		lines := strings.Split(string(output), "\n")
+		format := "%0" + strconv.Itoa(len(strconv.Itoa(limit-1))) + "d"
+
+		vals := make([]string, 0)
+		for index, line := range lines[1 : len(lines)-1] {
+			splitted := strings.SplitN(line, "\t", 2)
+			vals = append(vals, fmt.Sprintf(format, len(lines)-3-index), splitted[1])
+		}
+		return carapace.ActionValuesDescribed(vals...).Style(styles.Git.HeadCommit)
+	}).Tag("previous commits")
+}
+
 // ActionRecentCommits completes recent commits
 //
 //	3b61f0a729f7 (compat: added cobra bridge)