Update make_mercurial_completions.fish to also handle cvs. Correct bug causing issues in darcs completions.

darcs-hash:20070126012321-ac50b-caa9749f5e844ce5d06d84f2c38e282049369ed1.gz

1 files changed, 124 insertions, 55 deletions

diff --git a/make_mercurial_completions.fish b/make_mercurial_completions.fish
index 4a9aaf8d..a0768bca 100755
--- a/make_mercurial_completions.fish
+++ b/make_mercurial_completions.fish
@@ -14,6 +14,77 @@ function esc
 end
 
 
+#
+# This function formats a list of completion information into a set of fish completions
+# 
+# The first argument is the condition string, which will be copied to
+# the resulting commandline verbatim
+#
+# Remaining arguments are tab separated lists of completion
+# information. Each list contains four elements, the short switch, the
+# long switch, the argument and the description.
+#
+
+function complete_from_list
+
+	set condition $argv[1]
+	set -e argv[1]
+
+	for j in $argv
+		set exploded (echo $j|tr \t \n)
+		set short $exploded[1]
+		set long $exploded[2]
+		set arg $exploded[3]
+		set desc (cap (esc $exploded[4]))
+
+		set str 
+
+		switch $short
+			case '-?'
+				set str $str -s (printf "%s\n" $short|cut -c 2)
+		end
+
+		switch $long
+			case '--?*'
+				set str $str -l (printf "%s\n" $long|cut -c 3-)
+		end
+
+		switch $arg
+			case '=DIRECTORY' ' dir'
+				set str $str -x -a "'(__fish_complete_directories (commandline -ct))'"
+
+			case '=COMMAND'
+				set str $str -x -a "'(__fish_complete_command)'"
+
+			case '=USERNAME' ' <user>'
+				set str $str -x -a "'(__fish_complete_users)'"
+
+			case '=FILENAME' '=FILE' ' <file>'
+				set str $str -r 
+
+			case ' arg'
+				set str $str -x
+
+			case ' (*):'
+				 set str $str -x -a \'(echo $arg| sed -e "s/ (\(.*\)):/\1/" |tr '/' ' ')\'
+
+			case '?*'
+				set str $str -x
+				echo "Don't know how to handle arguments of type '$arg'" >&2
+		end
+
+		switch $desc
+			case '?*'
+				set str $str --description \'$desc\'
+		end
+
+		echo complete -c $cmd $condition $str 
+
+	end
+
+end
+
+
 set cmd $argv[1]; or exit 1
 
 echo '
@@ -35,12 +106,6 @@ while count $argv >/dev/null
 end
 
 
-echo '
-#
-# subcommands
-#
-'
-
 eval "function cmd; $cmd \$argv; end"
 
 set -l cmd_str
@@ -56,6 +121,15 @@ switch $cmd
 			cmd help|sed -ne 's/'$svn_re'/\1\n\3\n\5\n\7/p'| grep .
 		end
 
+		function list_subcommand_help
+			set short_exp '\(-.\|\)'
+			set long_exp '\(--[^ =,]*\)'
+			set arg_exp '\(\|[= ][^ ][^ ]*\)'
+			set desc_exp '\([\t ]*:[\t ]*\|\)\([^ ].*\)'
+			set re "^ *$short_exp  *$long_exp$arg_exp  *$desc_exp\$"
+			cmd help $argv | sed -n -e 's/'$re'/\1\t\2\t\3\t\5/p'
+		end
+
 
 		for i in (list_subcommand)
 			set desc (cmd help $i|head -n 1|sed -e 's/[^:]*: *\(.*\)$/\1/')
@@ -63,81 +137,76 @@ switch $cmd
 			set cmd_str $cmd_str "-a $i --description '$desc'"
 		end
 
-	case '*'
+	case cvs
 
 		function list_subcommand 
-		 	cmd help | sed -n -e 's/^  *\([^ ][^ ]*\) .*$/\1/p'
+		 	cmd --help-commands 2>| sed -n -e 's/^  *\([^ ][^ ]*\) .*$/\1/p'
 		end
-		set cmd_str (cmd help | sed -n -e 's/^  *\([^ ][^ ]*\)[\t ] *\([^ ].*\)$/-a \1 --description \'\2\'/p')
 
-end
+		set short_exp '\(-.\)'
+		set arg_exp '\(\| [^ \t][^ \t]*\)'
+		set desc_exp '\([\t ]*:[\t ]*\|\)\([^ ].*\)'
+		set re '^[ \t]*'$short_exp$arg_exp'[ \t]*'$desc_exp'$'
 
-printf "complete -c $cmd -n '__fish_use_subcommand' -x %s\n" $cmd_str
+		function list_subcommand_help
+#'s/^[ \t]*\(-.\)[ \t]\([^- \t][^ \t]*\)*[ \t]*\([^-].*\)$/\1\t\2\t\3/p'
 
-for i in (list_subcommand)
-
-	echo '
+			cmd -H $argv 2>| sed -n -e 's/'$re'/\1\t\t\2\t\4/p' 
+		end
 
+		echo '
 #
-# Completions for the \''$i'\' subcommand
+# Global switches
 #
 '
-	set -l cmd_str "complete -c $cmd -n 'contains $i (commandline -poc)' %s\n"
 
-	set short_exp '\(-.\|\)'
-	set long_exp '--\([^ =,]*\)'
-	set arg_exp '\(\|[= ][^ ][^ ]*\)'
-	set desc_exp '\([\t ]*:[\t ]*\|\)\([^ ].*\)'
-	set re "^ *$short_exp  *$long_exp$arg_exp  *$desc_exp\$"
+		complete_from_list "-n '__fish_use_subcommand'" (cmd --help-options 2>| sed -n -e 's/'$re'/\1\t\t\2\t\4/p')
 
-	for j in (cmd help $i | sed -n -e 's/'$re'/\1\t\2\t\3\t\5/p')
-		set exploded (echo $j|tr \t \n)
-		set short $exploded[1]
-		set long $exploded[2]
-		set arg $exploded[3]
-		set desc (cap (esc $exploded[4]))
+		set cmd_str_internal (cmd --help-commands 2>| sed -n -e 's/^  *\([^ ][^ ]*\)[\t ]*\([^ ].*\)$/\1\t\2/p')
+		for i in $cmd_str_internal
+			set exploded (echo $i|tr \t \n)
+			set cmd_str $cmd_str "-a $exploded[1] --description '"(esc $exploded[2])"'"		 
+		end
 
-		set str 
+	case '*'
 
-		switch $short
-			case '-?'
-				set str $str -s (echo $short|cut -c 2)
+		function list_subcommand 
+		 	cmd help | sed -n -e 's/^  *\([^ ][^ ]*\) .*$/\1/p'
 		end
 
-		switch $long
-			case '?*'
-				set str $str -l $long
+		function list_subcommand_help
+			set short_exp '\(-.\|\)'
+			set long_exp '\(--[^ =,]*\)'
+			set arg_exp '\(\|[= ][^ ][^ ]*\)'
+			set desc_exp '\([\t ]*:[\t ]*\|\)\([^ ].*\)'
+			set re "^ *$short_exp  *$long_exp$arg_exp  *$desc_exp\$"
+
+			cmd help $argv | sed -n -e 's/'$re'/\1\t\2\t\3\t\5/p'
 		end
 
-		switch $arg
-			case '=DIRECTORY'
-				set str $str -x -a "(__fish_complete_directories (commandline -ct))"
+		set cmd_str (cmd help | sed -n -e 's/^  *\([^ ][^ ]*\)[\t ]*\([^ ].*\)$/-a \1 --description \'\2\'/p')
 
-			case '=COMMAND'
-				set str $str -x -a "(__fish_complete_command)"
+end
 
-			case '=USERNAME'
-				set str $str -x -a "(__fish_complete_users)"
+echo '
+#
+# subcommands
+#
+'
 
-			case '=FILENAME' '=FILE'
-				set str $str -r 
+printf "complete -c $cmd -n '__fish_use_subcommand' -x %s\n" $cmd_str
 
-			case ' arg'
-				set str $str -x
+for i in (list_subcommand)
 
-			case '?*'
-				set str $str -x
-				echo "Don't know how to handle arguments of type $arg" >&2
-		end
+	echo '
 
-		switch $desc
-			case '?*'
-				set str $str --description \'$desc\'
-		end
+#
+# Completions for the \''$i'\' subcommand
+#
+'
 
-		echo complete -c $cmd -n "'contains $i (commandline -poc)'" $str
+	complete_from_list "-n 'contains $i (commandline -poc)'" (list_subcommand_help $i)
 
-	end
 
 end