Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jj_completer: Updated jujutsu completer to version 0.21.0 . #2523

Merged
merged 1 commit into from
Sep 5, 2024
Merged

jj_completer: Updated jujutsu completer to version 0.21.0 . #2523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions completers/jj_completer/cmd/untrack.go → completers/jj_completer/cmd/file_untrack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ import (
"github.com/spf13/cobra"
)

var untrackCmd = &cobra.Command{
var file_untrackCmd = &cobra.Command{
Use: "untrack [OPTIONS] <PATHS>...",
Short: "Stop tracking specified paths in the working copy",
Run: func(cmd *cobra.Command, args []string) {},
}

func init() {
carapace.Gen(untrackCmd).Standalone()
carapace.Gen(file_untrackCmd).Standalone()

untrackCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
rootCmd.AddCommand(untrackCmd)
file_untrackCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
fileCmd.AddCommand(file_untrackCmd)

carapace.Gen(untrackCmd).PositionalAnyCompletion(
carapace.Gen(file_untrackCmd).PositionalAnyCompletion(
carapace.ActionFiles().FilterArgs(),
)
}
5 changes: 4 additions & 1 deletion completers/jj_completer/cmd/next.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@ func init() {
carapace.Gen(nextCmd).Standalone()

nextCmd.Flags().Bool("conflict", false, "Jump to the next conflicted descendant")
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("edit", "e", 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')")
nextCmd.Flags().Bool("no-edit", false, "Instead of editing the target commit directly (like `jj edit`), create a new working-copy commit on top of the target commit (like `jj new`)")
rootCmd.AddCommand(nextCmd)

nextCmd.MarkFlagsMutuallyExclusive("edit", "no-edit")

carapace.Gen(nextCmd).PositionalCompletion(
jj.ActionNextCommits(100),
)
Expand Down
5 changes: 4 additions & 1 deletion completers/jj_completer/cmd/prev.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@ func init() {
carapace.Gen(prevCmd).Standalone()

prevCmd.Flags().Bool("conflict", false, "Jump to the next conflicted descendant")
prevCmd.Flags().Bool("edit", false, "Edit the parent directly, instead of moving the working-copy commit")
prevCmd.Flags().BoolP("edit", "e", false, "Edit the parent directly, instead of moving the working-copy commit")
prevCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
prevCmd.Flags().Bool("no-edit", false, "Instead of editing the target commit directly (like `jj edit`), create a new working-copy commit on top of the target commit (like `jj new`)")
rootCmd.AddCommand(prevCmd)

prevCmd.MarkFlagsMutuallyExclusive("edit", "no-edit")

carapace.Gen(prevCmd).PositionalCompletion(
jj.ActionPrevCommits(100),
)
Expand Down