Merge pull request #3060 from carapace-sh/jj-updates-v0.35.0

rsteube · web-flow · commit d5757db0f01f · 2025-11-06T11:57:58.000+01:00
jj: updates from v0.35.0
diff --git a/completers/common/jj_completer/cmd/bisect_run.go b/completers/common/jj_completer/cmd/bisect_run.go
@@ -15,17 +15,19 @@ var bisect_runCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(bisect_runCmd).Standalone()
+	bisect_runCmd.Flags().SetInterspersed(false)
 
-	bisect_runCmd.Flags().String("command", "", "Command to run to determine whether the bug is present")
 	bisect_runCmd.Flags().Bool("find-good", false, "Whether to find the first good revision instead")
 	bisect_runCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
 	bisect_runCmd.Flags().StringSliceP("range", "r", nil, "Range of revisions to bisect")
-	bisect_runCmd.MarkFlagRequired("command")
 	bisect_runCmd.MarkFlagRequired("range")
 	bisectCmd.AddCommand(bisect_runCmd)
 
 	carapace.Gen(bisect_runCmd).FlagCompletion(carapace.ActionMap{
-		"command": bridge.ActionCarapaceBin().Split(),
-		"range":   jj.ActionRevSets(jj.RevOption{}.Default()),
+		"range": jj.ActionRevSets(jj.RevOption{}.Default()),
 	})
+
+	carapace.Gen(bisect_runCmd).PositionalAnyCompletion(
+		bridge.ActionCarapaceBin(),
+	)
 }
diff --git a/completers/common/jj_completer/cmd/config_edit.go b/completers/common/jj_completer/cmd/config_edit.go
@@ -18,5 +18,6 @@ func init() {
 	config_editCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
 	config_editCmd.Flags().Bool("repo", false, "Target the repo-level config")
 	config_editCmd.Flags().Bool("user", false, "Target the user-level config")
+	config_editCmd.Flags().Bool("workspace", false, "Target the workspace-level config")
 	configCmd.AddCommand(config_editCmd)
 }
diff --git a/completers/common/jj_completer/cmd/config_list.go b/completers/common/jj_completer/cmd/config_list.go
@@ -22,6 +22,7 @@ func init() {
 	config_listCmd.Flags().Bool("repo", false, "Target the repo-level config")
 	config_listCmd.Flags().StringP("template", "T", "", "Render each variable using the given template")
 	config_listCmd.Flags().Bool("user", false, "Target the user-level config")
+	config_listCmd.Flags().Bool("workspace", false, "Target the workspace-level config")
 	configCmd.AddCommand(config_listCmd)
 
 	carapace.Gen(config_listCmd).PositionalCompletion(
diff --git a/completers/common/jj_completer/cmd/config_path.go b/completers/common/jj_completer/cmd/config_path.go
@@ -18,5 +18,6 @@ func init() {
 	config_pathCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
 	config_pathCmd.Flags().Bool("repo", false, "Target the repo-level config")
 	config_pathCmd.Flags().Bool("user", false, "Target the user-level config")
+	config_pathCmd.Flags().Bool("workspace", false, "Target the workspace-level config")
 	configCmd.AddCommand(config_pathCmd)
 }
diff --git a/completers/common/jj_completer/cmd/config_set.go b/completers/common/jj_completer/cmd/config_set.go
@@ -19,6 +19,7 @@ func init() {
 	config_setCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
 	config_setCmd.Flags().Bool("repo", false, "Target the repo-level config")
 	config_setCmd.Flags().Bool("user", false, "Target the user-level config")
+	config_setCmd.Flags().Bool("workspace", false, "Target the workspace-level config")
 	configCmd.AddCommand(config_setCmd)
 
 	carapace.Gen(config_setCmd).PositionalCompletion(
diff --git a/completers/common/jj_completer/cmd/config_unset.go b/completers/common/jj_completer/cmd/config_unset.go
@@ -19,6 +19,7 @@ func init() {
 	config_unsetCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
 	config_unsetCmd.Flags().Bool("repo", false, "Target the repo-level config")
 	config_unsetCmd.Flags().Bool("user", false, "Target the user-level config")
+	config_unsetCmd.Flags().Bool("workspace", false, "Target the workspace-level config")
 	configCmd.AddCommand(config_unsetCmd)
 
 	carapace.Gen(config_unsetCmd).PositionalCompletion(
diff --git a/completers/common/jj_completer/cmd/evolog.go b/completers/common/jj_completer/cmd/evolog.go
@@ -25,7 +25,7 @@ func init() {
 	evologCmd.Flags().Bool("ignore-space-change", false, "Ignore changes in amount of whitespace when comparing lines")
 	evologCmd.Flags().StringP("limit", "n", "", "Limit number of revisions to show")
 	evologCmd.Flags().Bool("name-only", false, "For each path, show only its path")
-	evologCmd.Flags().Bool("no-graph", false, "Don't show the graph, show a flat list of revisions")
+	evologCmd.Flags().BoolP("no-graph", "G", false, "Don't show the graph, show a flat list of revisions")
 	evologCmd.Flags().BoolP("patch", "p", false, "Show patch compared to the previous version of this change")
 	evologCmd.Flags().Bool("reversed", false, "Show revisions in the opposite order (older revisions first)")
 	evologCmd.Flags().StringSlice("revision", nil, "Follow changes from these revisions")
diff --git a/completers/common/jj_completer/cmd/git_clone.go b/completers/common/jj_completer/cmd/git_clone.go
@@ -16,15 +16,30 @@ var git_cloneCmd = &cobra.Command{
 func init() {
 	carapace.Gen(git_cloneCmd).Standalone()
 
-	git_cloneCmd.Flags().Bool("colocate", false, "Whether or not to colocate the Jujutsu repo with the git repo")
+	git_cloneCmd.Flags().StringSlice("bookmark", nil, "Name of the branch to fetch and use as the parent of the working-copy change")
+	git_cloneCmd.Flags().StringSliceP("branch", "b", nil, "Name of the branch to fetch and use as the parent of the working-copy change")
+	git_cloneCmd.Flags().Bool("colocate", false, "Colocate the Jujutsu repo with the git repo")
 	git_cloneCmd.Flags().String("depth", "", "Create a shallow clone of the given depth")
 	git_cloneCmd.Flags().String("fetch-tags", "", "Configure when to fetch tags")
 	git_cloneCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
 	git_cloneCmd.Flags().Bool("no-colocate", false, "Disable colocation of the Jujutsu repo with the git repo")
 	git_cloneCmd.Flags().String("remote", "", "Name of the newly created remote")
+	git_cloneCmd.Flag("bookmark").Hidden = true
 	gitCmd.AddCommand(git_cloneCmd)
 
 	carapace.Gen(git_cloneCmd).FlagCompletion(carapace.ActionMap{
+		"bookmark": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			if len(c.Args) == 0 {
+				return carapace.ActionValues()
+			}
+			return git.ActionLsRemoteRefs(git.LsRemoteRefOption{Url: c.Args[0], Branches: true})
+		}),
+		"branch": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			if len(c.Args) == 0 {
+				return carapace.ActionValues()
+			}
+			return git.ActionLsRemoteRefs(git.LsRemoteRefOption{Url: c.Args[0], Branches: true})
+		}),
 		"fetch-tags": carapace.ActionValues("all", "included", "none").StyleF(style.ForKeyword),
 	})
 
diff --git a/completers/common/jj_completer/cmd/git_colocation.go b/completers/common/jj_completer/cmd/git_colocation.go
@@ -0,0 +1,19 @@
+package cmd
+
+import (
+	"github.com/carapace-sh/carapace"
+	"github.com/spf13/cobra"
+)
+
+var git_colocationCmd = &cobra.Command{
+	Use:   "colocation",
+	Short: "Manage Jujutsu repository colocation with Git",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(git_colocationCmd).Standalone()
+
+	git_colocationCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
+	gitCmd.AddCommand(git_colocationCmd)
+}
diff --git a/completers/common/jj_completer/cmd/git_colocation_disable.go b/completers/common/jj_completer/cmd/git_colocation_disable.go
@@ -0,0 +1,19 @@
+package cmd
+
+import (
+	"github.com/carapace-sh/carapace"
+	"github.com/spf13/cobra"
+)
+
+var git_colocation_disableCmd = &cobra.Command{
+	Use:   "disable",
+	Short: "Convert into a non-colocated Jujutsu/Git repository",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(git_colocation_disableCmd).Standalone()
+
+	git_colocation_disableCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
+	git_colocationCmd.AddCommand(git_colocation_disableCmd)
+}
diff --git a/completers/common/jj_completer/cmd/git_colocation_enable.go b/completers/common/jj_completer/cmd/git_colocation_enable.go
@@ -0,0 +1,19 @@
+package cmd
+
+import (
+	"github.com/carapace-sh/carapace"
+	"github.com/spf13/cobra"
+)
+
+var git_colocation_enableCmd = &cobra.Command{
+	Use:   "enable",
+	Short: "Convert into a colocated Jujutsu/Git repository",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(git_colocation_enableCmd).Standalone()
+
+	git_colocation_enableCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
+	git_colocationCmd.AddCommand(git_colocation_enableCmd)
+}
diff --git a/completers/common/jj_completer/cmd/git_colocation_status.go b/completers/common/jj_completer/cmd/git_colocation_status.go
@@ -0,0 +1,19 @@
+package cmd
+
+import (
+	"github.com/carapace-sh/carapace"
+	"github.com/spf13/cobra"
+)
+
+var git_colocation_statusCmd = &cobra.Command{
+	Use:   "status",
+	Short: "Show the current colocation status",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(git_colocation_statusCmd).Standalone()
+
+	git_colocation_statusCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
+	git_colocationCmd.AddCommand(git_colocation_statusCmd)
+}
diff --git a/completers/common/jj_completer/cmd/git_init.go b/completers/common/jj_completer/cmd/git_init.go
@@ -14,7 +14,7 @@ var git_initCmd = &cobra.Command{
 func init() {
 	carapace.Gen(git_initCmd).Standalone()
 
-	git_initCmd.Flags().Bool("colocate", false, "Specifies that the `jj` repo should also be a valid `git` repo, allowing the use of both `jj` and `git` commands in the same directory")
+	git_initCmd.Flags().Bool("colocate", false, "Colocate the Jujutsu repo with the git repo")
 	git_initCmd.Flags().String("git-repo", "", "Specifies a path to an **existing** git repository to be used as the backing git repo for the newly created `jj` repo")
 	git_initCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
 	git_initCmd.Flags().Bool("no-colocate", false, "Disable colocation of the Jujutsu repo with the git repo")
diff --git a/completers/common/jj_completer/cmd/log.go b/completers/common/jj_completer/cmd/log.go
@@ -24,7 +24,7 @@ func init() {
 	logCmd.Flags().Bool("ignore-space-change", false, "Ignore changes in amount of whitespace when comparing lines")
 	logCmd.Flags().StringP("limit", "n", "", "Limit number of revisions to show")
 	logCmd.Flags().Bool("name-only", false, "For each path, show only its path")
-	logCmd.Flags().Bool("no-graph", false, "Don't show the graph, show a flat list of revisions")
+	logCmd.Flags().BoolP("no-graph", "G", false, "Don't show the graph, show a flat list of revisions")
 	logCmd.Flags().BoolP("patch", "p", false, "Show patch")
 	logCmd.Flags().Bool("reversed", false, "Show revisions in the opposite order (older revisions first)")
 	logCmd.Flags().StringSliceP("revisions", "r", []string{"@ | ancestors(immutable_heads().., 2) | heads(immutable_heads())"}, "Which revisions to show")
diff --git a/completers/common/jj_completer/cmd/metaedit.go b/completers/common/jj_completer/cmd/metaedit.go
@@ -17,11 +17,12 @@ func init() {
 
 	metaeditCmd.Flags().String("author", "", "Set author to the provided string")
 	metaeditCmd.Flags().String("author-timestamp", "", "Set the author date to the given date either human readable, eg Sun, 23 Jan 2000 01:23:45 JST) or as a time stamp, eg 2000-01-23T01:23:45+09:00)")
+	metaeditCmd.Flags().Bool("force-rewrite", false, "Rewrite the commit, even if no other metadata changed")
 	metaeditCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
+	metaeditCmd.Flags().StringSliceP("message", "m", nil, "Update the change description")
 	metaeditCmd.Flags().Bool("update-author", false, "Update the author to the configured user")
 	metaeditCmd.Flags().Bool("update-author-timestamp", false, "Update the author timestamp")
 	metaeditCmd.Flags().Bool("update-change-id", false, "Generate a new change-id")
-	metaeditCmd.Flags().Bool("update-committer-timestamp", false, "Update the committer timestamp")
 	rootCmd.AddCommand(metaeditCmd)
 
 	carapace.Gen(metaeditCmd).PositionalAnyCompletion(
diff --git a/completers/common/jj_completer/cmd/operation_diff.go b/completers/common/jj_completer/cmd/operation_diff.go
@@ -24,7 +24,7 @@ func init() {
 	operation_diffCmd.Flags().Bool("ignore-all-space", false, "Ignore whitespace when comparing lines")
 	operation_diffCmd.Flags().Bool("ignore-space-change", false, "Ignore changes in amount of whitespace when comparing lines")
 	operation_diffCmd.Flags().Bool("name-only", false, "For each path, show only its path")
-	operation_diffCmd.Flags().Bool("no-graph", false, "Don't show the graph, show a flat list of modified changes")
+	operation_diffCmd.Flags().BoolP("no-graph", "G", false, "Don't show the graph, show a flat list of modified changes")
 	operation_diffCmd.Flags().String("op", "", "Show repository changes in this operation, compared to its parent")
 	operation_diffCmd.Flags().String("operation", "", "Show repository changes in this operation, compared to its parent")
 	operation_diffCmd.Flags().BoolP("patch", "p", false, "Show patch of modifications to changes")
diff --git a/completers/common/jj_completer/cmd/operation_log.go b/completers/common/jj_completer/cmd/operation_log.go
@@ -22,7 +22,7 @@ func init() {
 	operation_logCmd.Flags().Bool("ignore-space-change", false, "Ignore changes in amount of whitespace when comparing lines")
 	operation_logCmd.Flags().StringP("limit", "n", "", "Limit number of operations to show")
 	operation_logCmd.Flags().Bool("name-only", false, "For each path, show only its path")
-	operation_logCmd.Flags().Bool("no-graph", false, "Don't show the graph, show a flat list of operations")
+	operation_logCmd.Flags().BoolP("no-graph", "G", false, "Don't show the graph, show a flat list of operations")
 	operation_logCmd.Flags().BoolP("op-diff", "d", false, "Show changes to the repository at each operation")
 	operation_logCmd.Flags().BoolP("patch", "p", false, "Show patch of modifications to changes (implies --op-diff)")
 	operation_logCmd.Flags().Bool("reversed", false, "Show operations in the opposite order (older operations first)")
diff --git a/completers/common/jj_completer/cmd/operation_show.go b/completers/common/jj_completer/cmd/operation_show.go
@@ -22,7 +22,7 @@ func init() {
 	operation_showCmd.Flags().Bool("ignore-all-space", false, "Ignore whitespace when comparing lines")
 	operation_showCmd.Flags().Bool("ignore-space-change", false, "Ignore changes in amount of whitespace when comparing lines")
 	operation_showCmd.Flags().Bool("name-only", false, "For each path, show only its path")
-	operation_showCmd.Flags().Bool("no-graph", false, "Don't show the graph, show a flat list of modified changes")
+	operation_showCmd.Flags().BoolP("no-graph", "G", false, "Don't show the graph, show a flat list of modified changes")
 	operation_showCmd.Flags().Bool("no-op-diff", false, "Do not show operation diff")
 	operation_showCmd.Flags().BoolP("patch", "p", false, "Show patch of modifications to changes")
 	operation_showCmd.Flags().Bool("stat", false, "Show a histogram of the changes")
diff --git a/completers/common/jj_completer/cmd/tag_delete.go b/completers/common/jj_completer/cmd/tag_delete.go
@@ -0,0 +1,25 @@
+package cmd
+
+import (
+	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/jj"
+	"github.com/spf13/cobra"
+)
+
+var tag_deleteCmd = &cobra.Command{
+	Use:     "delete",
+	Short:   "Delete existing tags",
+	Aliases: []string{"d"},
+	Run:     func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(tag_deleteCmd).Standalone()
+
+	tag_deleteCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
+	tagCmd.AddCommand(tag_deleteCmd)
+
+	carapace.Gen(tag_deleteCmd).PositionalAnyCompletion(
+		jj.ActionTags().FilterArgs(),
+	)
+}
diff --git a/completers/common/jj_completer/cmd/tag_set.go b/completers/common/jj_completer/cmd/tag_set.go
@@ -0,0 +1,32 @@
+package cmd
+
+import (
+	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/jj"
+	"github.com/spf13/cobra"
+)
+
+var tag_setCmd = &cobra.Command{
+	Use:     "set",
+	Short:   "Create or update tags",
+	Aliases: []string{"s"},
+	Run:     func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(tag_setCmd).Standalone()
+
+	tag_setCmd.Flags().Bool("allow-move", false, "Allow moving existing tags")
+	tag_setCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
+	tag_setCmd.Flags().StringP("revision", "r", "", "Target revision to point to")
+	tag_setCmd.Flags().String("to", "", "Target revision to point to")
+	tagCmd.AddCommand(tag_setCmd)
+
+	carapace.Gen(tag_setCmd).FlagCompletion(carapace.ActionMap{
+		"revision": jj.ActionRevs(jj.RevOption{}.Default()),
+	})
+
+	carapace.Gen(tag_setCmd).PositionalAnyCompletion(
+		jj.ActionTags().FilterArgs(),
+	)
+}

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,6 @@ func init() {`
`18`	`18`	`config_editCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")`
`19`	`19`	`config_editCmd.Flags().Bool("repo", false, "Target the repo-level config")`
`20`	`20`	`config_editCmd.Flags().Bool("user", false, "Target the user-level config")`
	`21`	`+ config_editCmd.Flags().Bool("workspace", false, "Target the workspace-level config")`
`21`	`22`	`configCmd.AddCommand(config_editCmd)`
`22`	`23`	`}`