cvs completions

Better completions for cvs. Covers most flags in the manual, except for some for history that I couldn't write good descriptions for. Descriptions could probably use some tweaking, but the basic structure should be much better than what we had before.

darcs-hash:20060208023146-494f2-bea009421c161257f09c0f53c52ab1ee116fc3dc.gz

1 files changed, 266 insertions, 51 deletions

diff --git a/init/completions/cvs.fish b/init/completions/cvs.fish
index 5d47b36f..5678638a 100644
--- a/init/completions/cvs.fish
+++ b/init/completions/cvs.fish
@@ -1,53 +1,268 @@
 #
-# I don't use CVS, so these completions are probably not all that good.
-#
-
-complete -c cvs -x -a 'add' -d (_ "Add a new file/directory to the repository")
-complete -c cvs -x -a 'admin' -d (_ "Administration front end for rcs")
-complete -c cvs -x -a 'annotate' -d (_ "Show last revision where each line was modified")
-complete -c cvs -x -a 'checkout' -d (_ "Checkout sources for editing")
-complete -c cvs -x -a 'commit' -d (_ "Check files into the repository")
-complete -c cvs -x -a 'diff' -d (_ "Show differences between revisions")
-complete -c cvs -x -a 'edit' -d (_ "Get ready to edit a watched file")
-complete -c cvs -x -a 'editors' -d (_ "See who is editing a watched file")
-complete -c cvs -x -a 'export' -d (_ "Export sources from CVS, similar to checkout")
-complete -c cvs -x -a 'history' -d (_ "Show repository access history")
-complete -c cvs -x -a 'import' -d (_ "Import sources into CVS, using vendor branches")
-complete -c cvs -x -a 'init' -d (_ "Create a CVS repository if it doesnt exist")
-complete -c cvs -x -a 'kserver' -d (_ "Kerberos server mode")
-complete -c cvs -x -a 'log' -d (_ "Print out history information for files")
-complete -c cvs -x -a 'login' -d (_ "Prompt for password for authenticating server")
-complete -c cvs -x -a 'logout' -d (_ "Removes entry in .cvspass for remote repository")
-complete -c cvs -x -a 'pserver' -d (_ "Password server mode")
-complete -c cvs -x -a 'rannotate' -d (_ "Show last revision where each line of module was modified")
-complete -c cvs -x -a 'rdiff' -d (_ "Create "patch" format diffs between releases")
-complete -c cvs -x -a 'release' -d (_ "Indicate that a Module is no longer in use")
-complete -c cvs -x -a 'remove' -d (_ "Remove an entry from the repository")
-complete -c cvs -x -a 'rlog' -d (_ "Print out history information for a module")
-complete -c cvs -x -a 'rtag' -d (_ "Add a symbolic tag to a module")
-complete -c cvs -x -a 'server' -d (_ "Server mode")
-complete -c cvs -x -a 'status' -d (_ "Display status information on checked out files")
-complete -c cvs -x -a 'tag' -d (_ "Add a symbolic tag to checked out version of files")
-complete -c cvs -x -a 'unedit' -d (_ "Undo an edit command")
-complete -c cvs -x -a 'update' -d (_ "Bring work tree in sync with repository")
-complete -c cvs -x -a 'version' -d (_ "Display version and exit")
-complete -c cvs -x -a 'watch' -d (_ "Set watches")
-complete -c cvs -x -a 'watchers' -d (_ "See who is watching a file")
-
-complete -c cvs -x -s H -d (_ "Displays usage information for command")
-complete -c cvs -x -s Q -d (_ "Cause CVS to be really quiet")
-complete -c cvs -x -s q -d (_ "Cause CVS to be somewhat quiet")
-complete -c cvs -x -s r -d (_ "Make checked-out files read-only")
-complete -c cvs -x -s w -d (_ "Make checked-out files read-write (default)")
-complete -c cvs -x -s n -d (_ "Do not change any files")
-complete -c cvs -x -s t -d (_ "Show trace of program execution -- try with -n")
-complete -c cvs -x -s v -d (_ "Display version and exit")
-complete -c cvs -x -s T -r -d (_ "Use "tmpdir" for temporary files")
-complete -c cvs -x -s e -r -d (_ "Use "editor" for editing log information")
-complete -c cvs -x -s d -r -d (_ "Overrides $CVSROOT as the root of the CVS tree")
-complete -c cvs -x -s f -d (_ "Do not use the ~/.cvsrc file")
-complete -c cvs -x -s z -d (_ "Compression level for net traffic") -x -a '1 2 3 4 5 6 7 8 9'
-complete -c cvs -x -s x -d (_ "Encrypt all net traffic")
-complete -c cvs -x -s a -d (_ "Authenticate all net traffic")
-complete -c cvs -x -s s -d (_ "Set CVS user variable") -x
+# Completions for the cvs VCS command
+#
+# Incomplete, the number of switches for cvs is _huge_
+#
+
+function __fish_no_cvs_subcommand
+	set -l cvscommands add admin annotate checkout commit diff edit editors export history import init kserver log login logout pserver rannotate rdiff release remove rlog rtag server status tag unedit update version watch watchers
+	set -l -- cmd (commandline -poc)
+	set -e cmd[1]
+	for i in $cmd
+		if contains -- $i $cvscommands
+			return 1
+		end
+	end
+	return 0
+end
+
+#
+# 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 __fish_seen_cvs_subcommand_from
+	set -l -- cmd (commandline -poc)
+	set -e cmd[1]
+	for i in $cmd
+		if contains -- $i $argv
+			return 0
+		end
+	end
+	return 1
+end
+
+#
+# If no subcommand has been specified, complete using all available subcommands
+#
+
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'add\t"'(_ "Add a new file/directory to the repository")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'admin\t"'(_ "Administration front end for rcs")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'annotate\t"'(_ "Show last revision where each line was modified")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'checkout\t"'(_ "Checkout sources for editing")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'commit\t"'(_ "Check files into the repository")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'diff\t"'(_ "Show differences between revisions")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'edit\t"'(_ "Get ready to edit a watched file")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'editors\t"'(_ "See who is editing a watched file")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'export\t"'(_ "Export sources from CVS, similar to checkout")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'history\t"'(_ "Show repository access history")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'import\t"'(_ "Import sources into CVS, using vendor branches")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'init\t"'(_ "Create a CVS repository if it doesnt exist")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'kserver\t"'(_ "Kerberos server mode")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'log\t"'(_ "Print out history information for files")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'login\t"'(_ "Prompt for password for authenticating server")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'logout\t"'(_ "Removes entry in .cvspass for remote repository")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'pserver\t"'(_ "Password server mode")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'rannotate\t"'(_ "Show last revision where each line of module was modified")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'rdiff\t"'(_ "Create "patch" format diffs between releases")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'release\t"'(_ "Indicate that a Module is no longer in use")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'remove\t"'(_ "Remove an entry from the repository")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'rlog\t"'(_ "Print out history information for a module")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'rtag\t"'(_ "Add a symbolic tag to a module")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'server\t"'(_ "Server mode")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'status\t"'(_ "Display status information on checked out files")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'tag\t"'(_ "Add a symbolic tag to checked out version of files")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'unedit\t"'(_ "Undo an edit command")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'update\t"'(_ "Bring work tree in sync with repository")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'version\t"'(_ "Display version and exit")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'watch\t"'(_ "Set watches")'"'
+complete -c cvs -n '__fish_no_cvs_subcommand' -xa 'watchers\t"'(_ "See who is watching a file")'"'
+
+#
+# cvs_options switches, which must be specified before a command.
+# 
+
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -l allow-root -d (_ "Specify legal cvsroot directory." )
+complete -c cvs -n '__fish_no_cvs_subcommand' -s a -d (_ "Authenticate all net traffic")
+complete -c cvs -n '__fish_no_cvs_subcommand' -r -s T -d (_ "Use "tmpdir" for temporary files")
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s d -d (_ "Overrides $CVSROOT as the root of the CVS tree")
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s e -d (_ "Use "editor" for editing log information")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s f -d (_ "Do not use the ~/.cvsrc file")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s H -d (_ "Displays usage information for command")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s n -d (_ "Do not change any files")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s Q -d (_ "Cause CVS to be really quiet")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s R -d (_ "Read-only repository mode.")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s q -d (_ "Cause CVS to be somewhat quiet")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s r -d (_ "Make checked-out files read-only")
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s s -d (_ "Set CVS user variable")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s t -d (_ "Show trace of program execution -- try with -n")
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s v -d (_ "Display version and exit")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s w -d (_ "Make checked-out files read-write (default)")
+complete -c cvs -n '__fish_no_cvs_subcommand' -s x -d (_ "Encrypt all net traffic")
+complete -c cvs -n '__fish_no_cvs_subcommand' -x -s z -d (_ "Compression level for net traffic") -a '1 2 3 4 5 6 7 8 9'
+
+#
+# Universal cvs options, which can be applied to any cvs command.
+#
+
+complete -c cvs -n '__fish_seen_cvs_subcommand_from checkout diff export history rdiff rtag update' -x -s D -d (_ "Use the most recent revision no later than date.")
+complete -c cvs -n '__fish_seen_cvs_subcommand_from annotate export rdiff rtag update' -s f -d (_ "Retrieve files even when no match for tag/date.")
+complete -c cvs -n '__fish_seen_cvs_subcommand_from add checkout diff import update' -x -s k -d (_ "Alter default keyword processing.")
+complete -c cvs -n '__fish_seen_cvs_subcommand_from annotate checkout commit diff edit editors export log rdiff remove rtag status tag unedit update watch watchers' -s l -d (_ "Don't recurse.")
+complete -c cvs -n '__fish_seen_cvs_subcommand_from add commit import' -x -s m -d (_ "Specify log message instead of invoking editor.")
+complete -c cvs -n '__fish_seen_cvs_subcommand_from checkout commit export rtag' -s n -d (_ "Don't run any tag programs.")
+complete -c cvs -n 'not __fish_no_cvs_subcommand' -s P -d (_ "Prune empty directories.")
+complete -c cvs -n '__fish_seen_cvs_subcommand_from checkout update' -s p -d (_ "Pipe files to stdout.")
+complete -c cvs -n '__fish_seen_cvs_subcommand_from annotate checkout commit diff edit editors export rdiff remove rtag status tag unedit update watch watchers' -s R -d (_ "Process directories recursively.")
+complete -c cvs -n '__fish_seen_cvs_subcommand_from annotate checkout commit diff history export rdiff rtag update' -x -s r -d (_ "Use a specified tag.")
+complete -c cvs -n '__fish_seen_cvs_subcommand_from import update' -r -s W -d (_ "Specify filenames to be filtered.")
+
+#
+# cvs options for admin. Note that all options marked as "useless", "might not
+#  work", "excessively dangerous" or "does nothing" are not included!
+#
+
+set -l admin_opt -c cvs -n 'contains admin (commandline -poc)'
+complete $admin_opt -x -s k -d (_ "Set the default keyword substitution.")
+complete $admin_opt    -s l -d (_ "Lock a revision.")
+complete $admin_opt -x -s m -d (_ "Replace a log message.")
+complete $admin_opt -x -s n -d (_ "Force name/rev association.")
+complete $admin_opt -x -s N -d (_ "Make a name/rev association.")
+complete $admin_opt    -s q -d (_ "Run quietly.")
+complete $admin_opt -x -s s -d (_ "Set a state attribute for a revision.")
+complete $admin_opt    -s t -d (_ "Write descriptive text from a file into RCS.")
+complete $admin_opt -x -o t- -d (_ "Write descriptive text into RCS.")
+complete $admin_opt -x -s l -d (_ "Unlock a revision.")
+
+#
+# cvs options for annotate.
+#
+
+set -l annotate_opt -c cvs -n 'contains annotate (commandline -poc)'
+complete $annotate_opt -s f -d (_ "Annotate binary files.")
+
+#
+# cvs options for checkout.
+#
+
+set -l checkout_opt -c cvs -n 'contains checkout (commandline -poc)'
+complete $checkout_opt    -s A -d (_ "Reset sticky tags/dates/k-opts.")
+complete $checkout_opt    -s c -d (_ "Copy module file to stdout.")
+complete $checkout_opt -x -s d -d (_ "Name directory for working files.")
+complete $checkout_opt -x -s j -d (_ "Merge revisions.")
+complete $checkout_opt    -s N -d (_ "For -d. Don't shorten paths.")
+
+#
+# cvs options for commit.
+#
+
+set -l commit_opt -c cvs -n 'contains commit (commandline -poc)'
+complete $commit_opt -r -s F -d (_ "Read log message from file.")
+complete $commit_opt    -s f -d (_ "Force new revision.")
+
+#
+# cvs options for diff.
+#
+
+set -l diff_opt -c cvs -n 'contains diff (commandline -poc)'
+complete $diff_opt    -s a -l text -d (_ "Treat all files as text.")
+complete $diff_opt    -s b -l ignore-space-change -d (_ "Treat all whitespace as one space.")
+complete $diff_opt    -s B -l ignore-blank-lines -d (_ "Ignore blank line only changes.")
+complete $diff_opt    -l binary -d (_ "Binary mode.")
+complete $diff_opt    -l brief -d (_ "Report only whether files differ.")
+complete $diff_opt    -s c -d (_ "Use context format.")
+complete $diff_opt -r -s C -d (_ "Set context size.")
+complete $diff_opt    -l context -d (_ "Set context format and, optionally, size.")
+complete $diff_opt    -l changed-group-format -d (_ "Set line group format.")
+complete $diff_opt    -s d -l minimal -d (_ "Try to find a smaller set of changes.")
+complete $diff_opt    -s e -l ed -d (_ "Make output a valid ed script.")
+complete $diff_opt    -s t -l expand-tabs -d (_ "Expand tabs to spaces.")
+complete $diff_opt    -s f -l forward-ed -d (_ "Output that looks like an ed script.")
+complete $diff_opt -x -s F -d (_ "Set regexp for context, unified formats.")
+complete $diff_opt    -s H -l speed-large-files -d (_ "Speed handling of large files with small changes.")
+complete $diff_opt -x -l horizon-lines -d (_ "Set horizon lines.")
+complete $diff_opt    -s i -l ignore-case -d (_ "Ignore changes in case.")
+complete $diff_opt -x -s I -l ignore-matching-lines -d (_ "Ignore changes matching regexp.")
+complete $diff_opt -x -l ifdef -d (_ "Make ifdef from diff.")
+complete $diff_opt    -s w -l ignore-all-space -d (_ "Ignore whitespace.")
+complete $diff_opt    -s T -l initial-tab -d (_ "Start lines with a tab.")
+complete $diff_opt -x -s L -l label -d (_ "Use label instead of filename in output.")
+complete $diff_opt    -l left-column -d (_ "Print only left column.")
+complete $diff_opt -x -l line-format -d (_ "Use format to produce if-then-else output.")
+complete $diff_opt    -s n -l rcs -d (_ "Produce RCS-style diffs.")
+complete $diff_opt    -s N -l new-file -d (_ "Treat files absent from one dir as empty.")
+complete $diff_opt -l new-group-format -l new-line-format -l old-group-format -l old-line-format -d (_ "Specifies line formatting.")
+complete $diff_opt    -s p -l show-c-function -d (_ "Identify the C function each change is in.")
+complete $diff_opt    -s s -l report-identical-files -d (_ "Report identical files.")
+complete $diff_opt    -s y -l side-by-side -d (_ "Use side-by-side format.")
+complete $diff_opt    -l suppress-common-lines -d (_ "Suppress common lines in side-by-side.")
+complete $diff_opt    -s u -l unified -d (_ "Use unified format.")
+complete $diff_opt -x -s U -d (_ "Set context size in unified.")
+complete $diff_opt -x -s W -l width -d (_ "Set column width for side-by-side format.")
+
+#
+# cvs export options.
+#
+
+set -l export_opt -c cvs -n 'contains export (commandline -poc)'
+complete $export_opt -x -s d -d (_ "Name directory for working files.")
+complete $export_opt    -s N -d (_ "For -d. Don't shorten paths.")
+
+#
+# cvs history options.
+# Incomplete - many are a pain to describe.
+#
+
+set -l history_opt -c cvs -n 'contains history (commandline -poc)'
+complete $history_opt -s c -d (_ "Report on each commit.")
+complete $history_opt -s e -d (_ "Report on everything.")
+complete $history_opt -x -s m -d (_ "Report on a module.")
+complete $history_opt -s o -d (_ "Report on checked-out modules.")
+complete $history_opt -s T -d (_ "Report on all tags.")
+complete $history_opt -x -s x -d (_ "Specify record type.") -a "F\trelease O\tcheckout E\texport T\trtag C\tcollisions G\tmerge U\t'Working file copied from repository' P\t'Working file patched to repository' W\t'Working copy deleted during update' A\t'New file added' M\t'File modified' R\t'File removed.'"
+complete $history_opt -s a -d (_ "Show history for all users.")
+complete $history_opt -s l -d (_ "Show last modification only.")
+complete $history_opt -s w -d (_ "Show only records for this directory.")
+
+#
+# cvs import options.
+#
+
+set -l import_opt -c cvs -n 'contains import (commandline -poc)'
+complete $import_opt -x -s b -d (_ "Multiple vendor branch.")
+complete $import_opt -r -s I -d (_ "Files to ignore during import.")
+
+#
+# cvs log options.
+#
+
+set -l log_opt -c cvs -n 'contains log (commandline -poc)'
+complete $log_opt -s b -d (_ "Print info about revision on default branch.")
+complete $log_opt -x -s d -d (_ "Specify date range for query.")
+complete $log_opt -s h -d (_ "Print only file info.")
+complete $log_opt -s N -d (_ "Do not print tags.")
+complete $log_opt -s R -d (_ "Print only rcs filename.")
+complete $log_opt -x -s r -d (_ "Print only given revisions.")
+complete $log_opt -s S -d (_ "Suppress header if no revisions found.")
+complete $log_opt -x -s s -d (_ "Specify revision states.")
+complete $log_opt -s t -d (_ "Same as -h, plus descriptive text.")
+complete $log_opt -x -s w -d (_ "Specify users for query.")
+
+#
+# cvs rdiff options.
+#
+
+set -l rdiff_opt -c cvs -n 'contains rdiff (commandline -poc)'
+complete $rdiff_opt -s c -d (_ "Use context diff format.")
+complete $rdiff_opt -s s -d (_ "Create summary change report.")
+complete $rdiff_opt -s t -d (_ "diff top two revisions.")
+complete $rdiff_opt -s u -d (_ "Use unidiff format.")
+
+#
+# cvs release options.
+#
+
+complete -c cvs -n 'contains release (commandline -poc)' -s d -d (_ "Delete working copy if release succeeds.")
+
+#
+# cvs update options.
+#
+
+set -l update_opt -c cvs -n 'contains update (commandline -poc)'
+complete $update_opt -s A -d (_ "Reset sticky tags, dates, and k-opts.")
+complete $update_opt -s C -d (_ "Overwrite modified files with clean copies.")
+complete $update_opt -s d -d (_ "Create any missing directories.")
+complete $update_opt -x -s I -d (_ "Specify files to ignore.")
+complete $update_opt -x -s j -d (_ "Merge revisions.")