jj: udates from v0.37.0

Author: rsteube

completers/common/jj_completer/cmd/bookmark_list.go

@@ -16,15 +16,15 @@ var bookmark_listCmd = &cobra.Command{
 func init() {
 	carapace.Gen(bookmark_listCmd).Standalone()
 
-	bookmark_listCmd.Flags().Bool("all", false, "Show all tracking and non-tracking remote bookmarks including the ones whose targets are synchronized with the local bookmarks")
-	bookmark_listCmd.Flags().BoolP("all-remotes", "a", false, "Show all tracking and non-tracking remote bookmarks including the ones whose targets are synchronized with the local bookmarks")
+	bookmark_listCmd.Flags().Bool("all", false, "Show all tracked and untracked remote bookmarks including the ones whose targets are synchronized with the local bookmarks")
+	bookmark_listCmd.Flags().BoolP("all-remotes", "a", false, "Show all tracked and untracked remote bookmarks including the ones whose targets are synchronized with the local bookmarks")
 	bookmark_listCmd.Flags().BoolP("conflicted", "c", false, "Show conflicted bookmarks only")
 	bookmark_listCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
-	bookmark_listCmd.Flags().StringSlice("remote", nil, "Show all tracking and non-tracking remote bookmarks belonging to this remote")
+	bookmark_listCmd.Flags().StringSlice("remote", nil, "Show all tracked and untracked remote bookmarks belonging to this remote")
 	bookmark_listCmd.Flags().StringSliceP("revisions", "r", nil, "Show bookmarks whose local targets are in the given revisions")
 	bookmark_listCmd.Flags().StringSlice("sort", nil, "Sort bookmarks based on the given key (or multiple keys)")
 	bookmark_listCmd.Flags().StringP("template", "T", "", "Render each bookmark using the given template")
-	bookmark_listCmd.Flags().BoolP("tracked", "t", false, "Show remote tracked bookmarks only. Omits local Git-tracking bookmarks by default")
+	bookmark_listCmd.Flags().BoolP("tracked", "t", false, "Show tracked remote bookmarks only")
 	bookmark_listCmd.Flag("all").Hidden = true
 	bookmarkCmd.AddCommand(bookmark_listCmd)
 

completers/common/jj_completer/cmd/bookmark_track.go

@@ -17,8 +17,13 @@ func init() {
 	carapace.Gen(bookmark_trackCmd).Standalone()
 
 	bookmark_trackCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
+	bookmark_trackCmd.Flags().StringSlice("remote", nil, "Remote names to track")
 	bookmarkCmd.AddCommand(bookmark_trackCmd)
 
+	carapace.Gen(bookmark_trackCmd).FlagCompletion(carapace.ActionMap{
+		"remote": jj.ActionRemotes(),
+	})
+
 	carapace.Gen(bookmark_trackCmd).PositionalAnyCompletion(
 		jj.ActionRemoteBookmarks("").FilterArgs(),
 	)

completers/common/jj_completer/cmd/bookmark_untrack.go

@@ -16,8 +16,13 @@ func init() {
 	carapace.Gen(bookmark_untrackCmd).Standalone()
 
 	bookmark_untrackCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
+	bookmark_untrackCmd.Flags().StringSlice("remote", nil, "Remote names to untrack")
 	bookmarkCmd.AddCommand(bookmark_untrackCmd)
 
+	carapace.Gen(bookmark_untrackCmd).FlagCompletion(carapace.ActionMap{
+		"remote": jj.ActionRemotes(),
+	})
+
 	carapace.Gen(bookmark_untrackCmd).PositionalAnyCompletion(
 		jj.ActionRemoteBookmarks("").FilterArgs(), // TODO tracked bookmarks
 	)

completers/common/jj_completer/cmd/commit.go

@@ -17,7 +17,7 @@ func init() {
 
 	commitCmd.Flags().Bool("editor", false, "Open an editor to edit the change description")
 	commitCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
-	commitCmd.Flags().BoolP("interactive", "i", false, "Interactively choose which changes to include in the first commit")
+	commitCmd.Flags().BoolP("interactive", "i", false, "Interactively choose which changes to include in the current commit")
 	commitCmd.Flags().StringSliceP("message", "m", nil, "The change description to use (don't open editor)")
 	commitCmd.Flags().String("tool", "", "Specify diff editor to be used (implies --interactive)")
 	rootCmd.AddCommand(commitCmd)

completers/common/jj_completer/cmd/duplicate.go

@@ -23,8 +23,6 @@ func init() {
 	duplicateCmd.Flags().StringSliceP("insert-after", "A", nil, "The revision(s) to insert after (can be repeated to create a merge commit)")
 	duplicateCmd.Flags().StringSliceP("insert-before", "B", nil, "The revision(s) to insert before (can be repeated to create a merge commit)")
 	duplicateCmd.Flags().StringSliceP("onto", "o", nil, "The revision(s) to duplicate onto (can be repeated to create a merge commit)")
-	duplicateCmd.Flag("d").Hidden = true
-	duplicateCmd.Flag("destination").Hidden = true
 	rootCmd.AddCommand(duplicateCmd)
 
 	duplicateCmd.MarkFlagsMutuallyExclusive(

completers/common/jj_completer/cmd/file_search.go

@@ -0,0 +1,27 @@
+package cmd
+
+import (
+	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/jj"
+	"github.com/spf13/cobra"
+)
+
+var file_searchCmd = &cobra.Command{
+	Use:   "search",
+	Short: "Search for content in files",
+	Run:   func(cmd *cobra.Command, args []string) {},
+}
+
+func init() {
+	carapace.Gen(file_searchCmd).Standalone()
+
+	file_searchCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
+	file_searchCmd.Flags().StringP("pattern", "p", "", "The glob pattern to search for")
+	file_searchCmd.Flags().StringP("revision", "r", "", "The revision to search files in")
+	file_searchCmd.MarkFlagRequired("pattern")
+	fileCmd.AddCommand(file_searchCmd)
+
+	carapace.Gen(file_searchCmd).FlagCompletion(carapace.ActionMap{
+		"revision": jj.ActionRevSets(jj.RevOption{}.Default()),
+	})
+}

completers/common/jj_completer/cmd/git_remote_add.go

@@ -19,6 +19,7 @@ func init() {
 
 	git_remote_addCmd.Flags().String("fetch-tags", "", "Configure when to fetch tags")
 	git_remote_addCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
+	git_remote_addCmd.Flags().String("push-url", "", "The URL used for push")
 	git_remoteCmd.AddCommand(git_remote_addCmd)
 
 	carapace.Gen(git_remote_addCmd).FlagCompletion(carapace.ActionMap{

completers/common/jj_completer/cmd/git_remote_setUrl.go

@@ -16,7 +16,9 @@ var git_remote_setUrlCmd = &cobra.Command{
 func init() {
 	carapace.Gen(git_remote_setUrlCmd).Standalone()
 
+	git_remote_setUrlCmd.Flags().String("fetch", "", "The URL or path to fetch from")
 	git_remote_setUrlCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
+	git_remote_setUrlCmd.Flags().String("push", "", "The URL or path to push to")
 	git_remoteCmd.AddCommand(git_remote_setUrlCmd)
 
 	carapace.Gen(git_remote_setUrlCmd).PositionalCompletion(

completers/common/jj_completer/cmd/interdiff.go

@@ -18,15 +18,15 @@ func init() {
 
 	interdiffCmd.Flags().Bool("color-words", false, "Show a word-level diff with changes indicated only by color")
 	interdiffCmd.Flags().String("context", "", "Number of lines of context to show")
-	interdiffCmd.Flags().StringP("from", "f", "@", "Show changes from this revision")
+	interdiffCmd.Flags().StringP("from", "f", "@", "The first revision to compare (default: @)")
 	interdiffCmd.Flags().Bool("git", false, "Show a Git-format diff")
 	interdiffCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
 	interdiffCmd.Flags().BoolP("ignore-all-space", "w", false, "Ignore whitespace when comparing lines")
 	interdiffCmd.Flags().BoolP("ignore-space-change", "b", false, "Ignore changes in amount of whitespace when comparing lines")
 	interdiffCmd.Flags().Bool("name-only", false, "For each path, show only its path")
 	interdiffCmd.Flags().Bool("stat", false, "Show a histogram of the changes")
 	interdiffCmd.Flags().BoolP("summary", "s", false, "For each path, show only whether it was modified, added, or deleted")
-	interdiffCmd.Flags().StringP("to", "t", "@", "Show changes to this revision")
+	interdiffCmd.Flags().StringP("to", "t", "@", "The second revision to compare (default: @)")
 	interdiffCmd.Flags().String("tool", "", "Generate diff by external command")
 	interdiffCmd.Flags().Bool("types", false, "For each path, show only its type before and after")
 	rootCmd.AddCommand(interdiffCmd)

completers/common/jj_completer/cmd/metaedit.go

@@ -16,7 +16,7 @@ func init() {
 	carapace.Gen(metaeditCmd).Standalone()
 
 	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().String("author-timestamp", "", "Set the author date to the given date")
 	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")