Skip to content

Instantly share code, notes, and snippets.

@bnjmnt4n
Last active May 22, 2024 11:45
Show Gist options
  • Save bnjmnt4n/9f47082b8b6e6ed2b2a805a1516090c8 to your computer and use it in GitHub Desktop.
Save bnjmnt4n/9f47082b8b6e6ed2b2a805a1516090c8 to your computer and use it in GitHub Desktop.
Fish completions for Jujutsu

Fish completions for Jujutsu

This Gist contains an additional Fish file which can be used along with jj's default completion Fish files (jj util completion fish).

Features

  • Completion of aliases
  • Completion of revisions for all commands
    • Short change IDs will be used as candidates for completion.
    • Revisions completed are customized based on the given command. Commands which mutate the repository will use the revset ~ ::immutable_heads() to get the list of completed revisions, while commands which do not mutate the repository will use the revset all().
    • There is a limit of 1000 changes shown.
    • Local and remote branches are also completed (they appear at the end of the list of completions).
  • Completion of files for certain commands
    • If the command uses a -r or --from flag, the list of files is read from the given revision.
    • Otherwise, the list of files are read from the given working copy.
    • cat, chmod, interdiff: List of files in revision
    • commit: List of modified files in working copy
    • split, squash: List of modified files in revision
    • resolve: List of conflicted files in revision
    • restore, untrack: List of files in revision, or modified files if in working copy
    • TODO: Should we allow snapshotting of the working copy, so that e.g. jj commit/squash/split <TAB> works without having to run another jj command first?
  • Completion of branch names for jj branch and jj git
  • Completion of remote names for jj remote and jj git push
  • Completion of operation IDs for jj undo and jj operation

Support

Tested with Jujutsu v0.17.1 and Fish v3.7.1.

# Additional Fish completions for Jujutsu
# https://gist.github.com/bnjmnt4n/9f47082b8b6e6ed2b2a805a1516090c8
# TODO: passthru other args? E.g.. --at-operation, --repository
function __jj
command jj --ignore-working-copy --color=never --quiet $argv 2> /dev/null
end
# Aliases
# Based on https://github.com/fish-shell/fish-shell/blob/cd71359c42f633d9d71a63591ae16d150407a2b2/share/completions/git.fish#L625.
#
# Aliases are stored in global variables.
# `__jj_aliases` is a list of all aliases and `__jj_alias_$alias` is the command line for the alias.
function __jj_add_alias
set -l alias $argv[1]
set -l alias_escaped (string escape --style=var -- $alias)
set -g __jj_alias_$alias_escaped $argv
set --append -g __jj_aliases $alias
end
__jj config list aliases -T 'concat(name, "\t", value, "\n")' --include-defaults | while read -l config_alias
set -l parsed (string match --regex '^aliases\.(.+)\t(.*)$' --groups-only -- $config_alias)
set -l alias $parsed[1]
set -l command $parsed[2]
set -l args $alias
# Replace wrapping `[]` if any
set -l command (string replace -r --all '^\[|]$' "" -- $command)
while test (string length -- $command) -gt 0
set -l parsed (string match -r '^"((?:\\\"|[^"])*?)"(?:,\s)?(.*)$' --groups-only -- $command)
set --append args $parsed[1]
set command $parsed[2]
end
__jj_add_alias $args
end
__jj_add_alias "ci" "commit"
__jj_add_alias "desc" "describe"
__jj_add_alias "op" "operation"
__jj_add_alias "st" "status"
# Resolve aliases that call another alias.
for alias in $__jj_aliases
set -l handled $alias
while true
set -l alias_escaped (string escape --style=var -- $alias)
set -l alias_varname __jj_alias_$alias_escaped
set -l aliased_command $$alias_varname[1][2]
set -l aliased_escaped (string escape --style=var -- $aliased_command)
set -l aliased_varname __jj_alias_$aliased_escaped
set -q $aliased_varname
or break
# Prevent infinite recursion
contains $aliased_escaped $handled
and break
# Expand alias in cmdline
set -l aliased_cmdline $$aliased_varname[1][2..-1]
set --append aliased_cmdline $$alias_varname[1][3..-1]
set -g $alias_varname $$alias_varname[1][1] $aliased_cmdline
set --append handled $aliased_escaped
end
end
function __jj_aliases_with_descriptions
for alias in $__jj_aliases
set -l alias_escaped (string escape --style=var -- $alias)
set -l alias_varname __jj_alias_$alias_escaped
set -l aliased_cmdline (string join " " -- $$alias_varname[1][2..-1] | string replace -r --all '\\\"' '"')
printf "%s\talias: %s\n" $alias $aliased_cmdline
end
end
# Based on https://github.com/fish-shell/fish-shell/blob/2d4e42ee93327b9cfd554a0d809f85e3d371e70e/share/functions/__fish_seen_subcommand_from.fish.
# Test to see if we've seen a subcommand from a list.
# This logic may seem backwards, but the commandline will often be much shorter than the list.
function __jj_seen_subcommand_from
set -l cmd (commandline -opc)
set -e cmd[1]
# Check command line arguments first.
for i in $cmd
if contains -- $i $argv
return 0
end
end
# Check aliases.
set -l alias $cmd[1]
set -l alias_escaped (string escape --style=var -- $alias)
set -l varname __jj_alias_$alias_escaped
set -q $varname
or return 1
for i in $$varname[1][2..-1]
if contains -- $i $argv
return 0
end
end
return 1
end
function __jj_changes
__jj log --no-graph --limit 1000 -r $argv[1] \
-T 'separate("\t", change_id.shortest(), if(description, description.first_line(), "empty")) ++ "\n"'
end
function __jj_local_branches
if string length --quiet -- $argv[1]
set -f rev "branches() & ($argv[1])"
else
set -f rev "branches()"
end
__jj log --no-graph -r $rev \
-T 'local_branches.map(|branch| separate("\t", branch.name(), if(description, description.first_line(), "empty"))).join("\n") ++ "\n"'
end
function __jj_remote_branches
if string length --quiet -- $argv[1]
set -f rev "remote_branches() & ($argv[1])"
else
set -f rev "remote_branches()"
end
__jj log --no-graph -r $rev \
-T 'remote_branches.map(|branch| separate("\t", concat(branch.name(), "@", branch.remote()), if(description, description.first_line(), "empty"))).join("\n") ++ "\n"'
end
function __jj_all_changes
if string length --quiet -- $argv[1]
set -f REV $argv[1]
else
set -f REV "all()"
end
__jj_changes $REV; __jj_local_branches $REV; __jj_remote_branches $REV
end
function __jj_mutable_changes
set -f REV "~::immutable_heads()"
__jj_changes $REV; __jj_local_branches $REV; __jj_remote_branches $REV
end
function __jj_revision_modified_files
if test $argv[1] = "@"
set -f suffix ""
else
set -l change_id (__jj log --no-graph --limit 1 -T 'change_id.shortest()')
set -f suffix " in $change_id"
end
__jj diff -r $argv[1] --summary | while read -l line
set -l file (string split " " -m 1 -- $line)
switch $file[1]
case M
set -f change "Modified"
case D
set -f change "Deleted"
case A
set -f change "Added"
end
printf "%s\t%s%s\n" $file[2] $change $suffix
end
end
function __jj_remotes
__jj git remote list | while read -l remote
printf "%s\t%s\n" (string split " " -m 1 -- $remote)
end
end
function __jj_operations
__jj operation log --no-graph --limit 1000 -T 'separate("\t", id.short(), description) ++ "\n"'
end
function __jj_parse_revision
set -l cmd (commandline -opc)
set -e cmd[1]
set -l return_next false
set -l return_value 1
# Check aliases.
set -l alias $cmd[1]
set -l alias_escaped (string escape --style=var -- $alias)
set -l varname __jj_alias_$alias_escaped
if set -q $varname
set cmd $$varname[1][2..-1] $cmd[2..-1]
end
# Check command line arguments first.
for i in $cmd
if $return_next
echo $i
set return_value 0
else if contains -- $i -r --revision --from
set return_next true
else
set -l match (string match --regex '^(?:-r=?|--revision=|--from=)(.+)\s*$' --groups-only -- $i)
if set -q match[1]
echo $match[1]
set return_value 0
end
end
end
return $return_value
end
function __jj_revision_files
set -l description (__jj log --no-graph --limit 1 -r $argv[1] -T 'change_id.shortest() ++ ": " ++ coalesce(description.first_line().substr(0, 30), "empty")')
__jj files -r $argv[1] | while read -l file
printf "%s\t%s\n" $file $description
end
end
function __jj_revision_conflicted_files
__jj resolve --list -r $argv[1] | while read -l line
set -l file (string split " " -m 1 -- $line)
printf "%s\t%s\n" $file[1] $file[2]
end
end
function __jj_parse_revision_files
set -l rev (__jj_parse_revision)
if test $status -eq 1
set rev "@"
end
__jj_revision_files $rev
end
function __jj_parse_revision_conflicted_files
set -l rev (__jj_parse_revision)
if test $status -eq 1
set rev "@"
end
__jj_revision_conflicted_files $rev
end
function __jj_parse_revision_files_or_wc_modified_files
set -l revs (__jj_parse_revision)
if test $status -eq 1
__jj_revision_modified_files "@"
else
for rev in $revs
__jj_revision_files $rev
end
end
end
function __jj_parse_revision_modified_files_or_wc_modified_files
set -l revs (__jj_parse_revision)
if test $status -eq 1
__jj_revision_modified_files "@"
else
for rev in $revs
__jj_revision_modified_files $rev
end
end
end
# Aliases.
complete -f -c jj -n '__fish_use_subcommand' -a '(__jj_aliases_with_descriptions)'
# Files.
complete -c jj -n '__jj_seen_subcommand_from cat' -ka '(__jj_parse_revision_files)'
complete -c jj -n '__jj_seen_subcommand_from chmod' -ka '(__jj_parse_revision_files)'
complete -f -c jj -n '__jj_seen_subcommand_from commit' -ka '(__jj_revision_modified_files "@")'
complete -c jj -n '__jj_seen_subcommand_from diff' -ka '(__jj_parse_revision_files_or_wc_modified_files)'
complete -c jj -n '__jj_seen_subcommand_from interdiff' -ka '(__jj_parse_revision_files)'
complete -c jj -n '__jj_seen_subcommand_from move' -ka '(__jj_parse_revision_modified_files_or_wc_modified_files)' # Deprecated
complete -c jj -n '__jj_seen_subcommand_from resolve' -ka '(__jj_parse_revision_conflicted_files)'
complete -c jj -n '__jj_seen_subcommand_from restore' -ka '(__jj_parse_revision_files_or_wc_modified_files)'
complete -c jj -n '__jj_seen_subcommand_from split' -ka '(__jj_parse_revision_modified_files_or_wc_modified_files)'
complete -c jj -n '__jj_seen_subcommand_from squash' -ka '(__jj_parse_revision_modified_files_or_wc_modified_files)'
complete -c jj -n '__jj_seen_subcommand_from untrack' -ka '(__jj_parse_revision_files_or_wc_modified_files)'
# Revisions.
complete -f -c jj -n '__jj_seen_subcommand_from abandon' -ka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from backout' -s r -l revision -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from backout' -s d -l destination -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from cat' -s r -l revision -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from chmod' -s r -l revision -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from describe' -ka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from diff' -s r -l revision -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from diff' -l from -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from diff' -l to -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from diffedit' -s r -l revision -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from diffedit' -l from -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from diffedit' -l to -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from duplicate' -ka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from edit' -ka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from files' -s r -l revision -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from interdiff' -l from -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from interdiff' -l to -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from log' -s r -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from move' -l from -rka '(__jj_mutable_changes)' # Deprecated
complete -f -c jj -n '__jj_seen_subcommand_from move' -l to -l into -rka '(__jj_mutable_changes)' # Deprecated
complete -f -c jj -n '__jj_seen_subcommand_from new' -ka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from new' -s A -l after -l insert-after -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from new' -s B -l before -l insert-before -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from obslog' -s r -l revision -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from parallelize' -ka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from rebase' -s r -l revisions -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from rebase' -s s -l source -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from rebase' -s b -l branch -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from rebase' -s d -l destination -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from rebase' -s A -l after -l insert-after -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from rebase' -s B -l before -l insert-before -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from resolve' -s r -l revision -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from restore' -l from -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from restore' -l to -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from restore' -s c -l changes-in -rka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from show' -ka '(__jj_all_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from split' -s r -l revision -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from squash' -s r -l revision -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from squash' -l from -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from squash' -l to -l into -rka '(__jj_mutable_changes)'
complete -f -c jj -n '__jj_seen_subcommand_from unsquash' -s r -l revision -rka '(__jj_mutable_changes)'
# Branches.
complete -f -c jj -n '__jj_seen_subcommand_from branch; and __jj_seen_subcommand_from delete forget rename set' -ka '(__jj_local_branches)'
complete -f -c jj -n '__jj_seen_subcommand_from branch; and __jj_seen_subcommand_from track untrack' -ka '(__jj_remote_branches)'
complete -f -c jj -n '__jj_seen_subcommand_from branch; and __jj_seen_subcommand_from create set' -s r -l revision -kra '(__jj_all_changes)'
# Git.
complete -f -c jj -n '__jj_seen_subcommand_from git; and __jj_seen_subcommand_from push' -s c -l change -kra '(__jj_changes "all()")'
complete -f -c jj -n '__jj_seen_subcommand_from git; and __jj_seen_subcommand_from push' -s r -l revisions -kra '(__jj_changes "all()")'
complete -f -c jj -n '__jj_seen_subcommand_from git; and __jj_seen_subcommand_from fetch push' -s b -l branch -rka '(__jj_local_branches)'
complete -f -c jj -n '__jj_seen_subcommand_from git; and __jj_seen_subcommand_from fetch push' -l remote -rka '(__jj_remotes)'
complete -f -c jj -n '__jj_seen_subcommand_from git; and __jj_seen_subcommand_from remote; and __jj_seen_subcommand_from rename remove' -ka '(__jj_remotes)'
# Operations.
complete -f -c jj -l at-op -l at-operation -rka '(__jj_operations)'
complete -f -c jj -n '__jj_seen_subcommand_from undo' -ka '(__jj_operations)'
complete -f -c jj -n '__jj_seen_subcommand_from operation; and __jj_seen_subcommand_from abandon undo restore' -ka '(__jj_operations)'
@ilyagr
Copy link

ilyagr commented May 8, 2024

Update 2: Seems to be fixed in the latest version.

Update: @bnjmnt4n narrowed this down to me having a complicated alias that the fish script couldn't parse for the "completion of aliases" feature.


I haven't fully debugged it, but I currently get the following error with fish 3.7.1 and a recent master branch jj:

fish> . jj-dynamic.fish
test: Missing argument at index 3
-gt 0
      ^
jj-dynamic.fish (line 26):
  while test (string length -- $command) -gt 0
        ^
in function '__jj_aliased_command' with arguments 'aliases.eachcommit\t\[\"log\",\ \"--no-graph\",\ \"--color=never\",\ \"--ignore-working-copy\",\ \"-T\",\ \"commit_id.shortest\(8\)\ ++\ \\\"\\\\n\\\"\",\ \"-r\"\]'
        called on line 38 of file jj-dynamic.fish
from sourcing file jj-dynamic.fish

(Aside: my line numbers are slightly off, I added two or three extra lines of comments in the beginning with a link to the gist. I also renamed the file to jj-dynamic.fish)

I did a tiny bit of debugging by adding some print statements:

diff --git a/.config/fish/conf.d/jj-dynamic.fish b/.config/fish/conf.d/jj-dynamic.fish
index 1b7d5a9..66d6b85 100644
--- a/.config/fish/conf.d/jj-dynamic.fish
+++ b/.config/fish/conf.d/jj-dynamic.fish
@@ -20,10 +20,15 @@ function __jj_aliased_command
   set --append -f cmdline $alias
   # Replace wrapping `[]` if any
   set -f command (string replace -r --all '^\[|]$' ""  -- $command)
+  echo ====== ENTERING LOOP ====
+      echo $command
+      echo (string length -- $command)
   while test (string length -- $command) -gt 0
     set -f parsed (string match -r '"((?:[^"]|\\\\")+)"(?:,\s)?(.*)' --groups-only  -- $command)
     set --append -f cmdline $parsed[1]
     set -f command $parsed[2]
+      echo $command
+      echo (string length -- $command)
   end
   set -g __jj_alias_$alias_escaped $cmdline
   set --append -g __jj_aliases $alias

The relevant loop interation looks as follows:

====== ENTERING LOOP ====
"log", "--no-graph", "--color=never", "--ignore-working-copy", "-T", "commit_id.shortest(8) ++ \"\\n\"", "-r"
109
"--no-graph", "--color=never", "--ignore-working-copy", "-T", "commit_id.shortest(8) ++ \"\\n\"", "-r"
102
"--color=never", "--ignore-working-copy", "-T", "commit_id.shortest(8) ++ \"\\n\"", "-r"
88
"--ignore-working-copy", "-T", "commit_id.shortest(8) ++ \"\\n\"", "-r"
71
"-T", "commit_id.shortest(8) ++ \"\\n\"", "-r"
46
"commit_id.shortest(8) ++ \"\\n\"", "-r"
40
\\n\"", "-r"
12
-r"
3


test: Missing argument at index 3
-gt 0
      ^
jj-dynamic.fish (line 26):
  while test (string length -- $command) -gt 0
        ^
in function '__jj_aliased_command' with arguments 'aliases.eachcommit\t\[\"log\",\ \"--no-graph\",\ \"--color=never\",\ \"--ignore-working-copy\",\ \"-T\",\ \"commit_id.shortest\(8\)\ ++\ \\\"\\\\n\\\"\",\ \"-r\"\]'
        called on line 38 of file jj-dynamic.fish
from sourcing file jj-dynamic.fish

This error doesn't make a lot of sense to me, to be honest.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment