Another batch of fixes for the VCS completions

darcs-hash:20070127020141-ac50b-e617fbabb234af668fa7ded7f838d66477605c8d.gz

4 files changed, 1407 insertions, 1379 deletions

diff --git a/share/completions/cvs.fish b/share/completions/cvs.fish
index dd1f9a87..19cc07e2 100644
--- a/share/completions/cvs.fish
+++ b/share/completions/cvs.fish
@@ -74,191 +74,191 @@ complete -c cvs -n '__fish_use_subcommand' -x -a watchers --description 'See who
 # Completions for the 'add' subcommand
 #
 
-complete -c cvs -n 'contains add (commandline -poc)' -s k -x --description 'Use "rcs-kflag" to add the file with the specified'
-complete -c cvs -n 'contains add (commandline -poc)' -s m -x --description 'Use "message" for the creation log.'
+complete -c cvs -n 'contains \'add\' (commandline -poc)' -s k -x --description 'Use "rcs-kflag" to add the file with the specified'
+complete -c cvs -n 'contains \'add\' (commandline -poc)' -s m -x --description 'Use "message" for the creation log.'
 
 
 #
 # Completions for the 'admin' subcommand
 #
 
-complete -c cvs -n 'contains admin (commandline -poc)' -s a -x --description 'Append (comma-separated) user names to access list.'
-complete -c cvs -n 'contains admin (commandline -poc)' -s A -x --description 'Append another file\'s access list.'
-complete -c cvs -n 'contains admin (commandline -poc)' -s b --description '[rev]    Set default branch (highest branch on trunk if omitted).'
-complete -c cvs -n 'contains admin (commandline -poc)' -s c -x --description 'Set comment leader.'
-complete -c cvs -n 'contains admin (commandline -poc)' -s e --description '[users]  Remove (comma-separated) user names from access list'
-complete -c cvs -n 'contains admin (commandline -poc)' -s I --description 'Run interactively.'
-complete -c cvs -n 'contains admin (commandline -poc)' -s k -x --description 'Set keyword substitution mode:'
-complete -c cvs -n 'contains admin (commandline -poc)' -s l --description '[rev]    Lock revision (latest revision on branch,'
-complete -c cvs -n 'contains admin (commandline -poc)' -s L --description 'Set strict locking.'
-complete -c cvs -n 'contains admin (commandline -poc)' -s m -x --description 'Replace revision\'s log message.'
-complete -c cvs -n 'contains admin (commandline -poc)' -s n -x --description 'Tag branch or revision.  If :rev is omitted,'
-complete -c cvs -n 'contains admin (commandline -poc)' -s N -x --description 'Same as -n except override existing tag.'
-complete -c cvs -n 'contains admin (commandline -poc)' -s o -x --description 'Delete (outdate) specified range of revisions:'
-complete -c cvs -n 'contains admin (commandline -poc)' -s q --description 'Run quietly.'
-complete -c cvs -n 'contains admin (commandline -poc)' -s s -x --description 'Set revision state (latest revision on branch,'
-complete -c cvs -n 'contains admin (commandline -poc)' -s t --description '[file]   Get descriptive text from file (stdin if omitted).'
-complete -c cvs -n 'contains admin (commandline -poc)' -s t --description '-string  Set descriptive text.'
-complete -c cvs -n 'contains admin (commandline -poc)' -s u --description '[rev]    Unlock the revision (latest revision on branch,'
-complete -c cvs -n 'contains admin (commandline -poc)' -s U --description 'Unset strict locking.'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s a -x --description 'Append (comma-separated) user names to access list.'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s A -x --description 'Append another file\'s access list.'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s b --description '[rev]    Set default branch (highest branch on trunk if omitted).'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s c -x --description 'Set comment leader.'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s e --description '[users]  Remove (comma-separated) user names from access list'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s I --description 'Run interactively.'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s k -x --description 'Set keyword substitution mode:'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s l --description '[rev]    Lock revision (latest revision on branch,'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s L --description 'Set strict locking.'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s m -x --description 'Replace revision\'s log message.'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s n -x --description 'Tag branch or revision.  If :rev is omitted,'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s N -x --description 'Same as -n except override existing tag.'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s o -x --description 'Delete (outdate) specified range of revisions:'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s q --description 'Run quietly.'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s s -x --description 'Set revision state (latest revision on branch,'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s t --description '[file]   Get descriptive text from file (stdin if omitted).'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s t --description '-string  Set descriptive text.'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s u --description '[rev]    Unlock the revision (latest revision on branch,'
+complete -c cvs -n 'contains \'admin\' (commandline -poc)' -s U --description 'Unset strict locking.'
 
 
 #
 # Completions for the 'annotate' subcommand
 #
 
-complete -c cvs -n 'contains annotate (commandline -poc)' -s l --description 'Local directory only, no recursion.'
-complete -c cvs -n 'contains annotate (commandline -poc)' -s R --description 'Process directories recursively.'
-complete -c cvs -n 'contains annotate (commandline -poc)' -s f --description 'Use head revision if tag/date not found.'
-complete -c cvs -n 'contains annotate (commandline -poc)' -s F --description 'Annotate binary files.'
-complete -c cvs -n 'contains annotate (commandline -poc)' -s r -x --description 'Annotate file as of specified revision/tag.'
-complete -c cvs -n 'contains annotate (commandline -poc)' -s D -x --description 'Annotate file as of specified date.'
+complete -c cvs -n 'contains \'annotate\' (commandline -poc)' -s l --description 'Local directory only, no recursion.'
+complete -c cvs -n 'contains \'annotate\' (commandline -poc)' -s R --description 'Process directories recursively.'
+complete -c cvs -n 'contains \'annotate\' (commandline -poc)' -s f --description 'Use head revision if tag/date not found.'
+complete -c cvs -n 'contains \'annotate\' (commandline -poc)' -s F --description 'Annotate binary files.'
+complete -c cvs -n 'contains \'annotate\' (commandline -poc)' -s r -x --description 'Annotate file as of specified revision/tag.'
+complete -c cvs -n 'contains \'annotate\' (commandline -poc)' -s D -x --description 'Annotate file as of specified date.'
 
 
 #
 # Completions for the 'checkout' subcommand
 #
 
-complete -c cvs -n 'contains checkout (commandline -poc)' -s A --description 'Reset any sticky tags/date/kopts.'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s N --description 'Don\'t shorten module paths if -d specified.'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s P --description 'Prune empty directories.'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s R --description 'Process directories recursively.'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s c --description '"cat" the module database.'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s f --description 'Force a head revision match if tag/date not found.'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s l --description 'Local directory only, not recursive'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s n --description 'Do not run module program (if any).'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s p --description 'Check out files to standard output (avoids stickiness).'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s s --description 'Like -c, but include module status.'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s r -x --description 'Check out revision or tag. (implies -P) (is sticky)'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s D -x --description 'Check out revisions as of date. (implies -P) (is sticky)'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s d -x -a '(__fish_complete_directories (commandline -ct))' --description 'Check out into dir instead of module name.'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s k -x --description 'Use RCS kopt -k option on checkout. (is sticky)'
-complete -c cvs -n 'contains checkout (commandline -poc)' -s j -x --description 'Merge in changes made between current revision and rev.'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s A --description 'Reset any sticky tags/date/kopts.'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s N --description 'Don\'t shorten module paths if -d specified.'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s P --description 'Prune empty directories.'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s R --description 'Process directories recursively.'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s c --description '"cat" the module database.'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s f --description 'Force a head revision match if tag/date not found.'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s l --description 'Local directory only, not recursive'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s n --description 'Do not run module program (if any).'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s p --description 'Check out files to standard output (avoids stickiness).'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s s --description 'Like -c, but include module status.'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s r -x --description 'Check out revision or tag. (implies -P) (is sticky)'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s D -x --description 'Check out revisions as of date. (implies -P) (is sticky)'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s d -x -a '(__fish_complete_directories (commandline -ct))' --description 'Check out into dir instead of module name.'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s k -x --description 'Use RCS kopt -k option on checkout. (is sticky)'
+complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s j -x --description 'Merge in changes made between current revision and rev.'
 
 
 #
 # Completions for the 'commit' subcommand
 #
 
-complete -c cvs -n 'contains commit (commandline -poc)' -s R --description 'Process directories recursively.'
-complete -c cvs -n 'contains commit (commandline -poc)' -s l --description 'Local directory only (not recursive).'
-complete -c cvs -n 'contains commit (commandline -poc)' -s f --description 'Force the file to be committed; disables recursion.'
-complete -c cvs -n 'contains commit (commandline -poc)' -s F -x --description 'Read the log message from file.'
-complete -c cvs -n 'contains commit (commandline -poc)' -s m -x --description 'Log message.'
-complete -c cvs -n 'contains commit (commandline -poc)' -s r -x --description 'Commit to this branch or trunk revision.'
+complete -c cvs -n 'contains \'commit\' (commandline -poc)' -s R --description 'Process directories recursively.'
+complete -c cvs -n 'contains \'commit\' (commandline -poc)' -s l --description 'Local directory only (not recursive).'
+complete -c cvs -n 'contains \'commit\' (commandline -poc)' -s f --description 'Force the file to be committed; disables recursion.'
+complete -c cvs -n 'contains \'commit\' (commandline -poc)' -s F -x --description 'Read the log message from file.'
+complete -c cvs -n 'contains \'commit\' (commandline -poc)' -s m -x --description 'Log message.'
+complete -c cvs -n 'contains \'commit\' (commandline -poc)' -s r -x --description 'Commit to this branch or trunk revision.'
 
 
 #
 # Completions for the 'diff' subcommand
 #
 
-complete -c cvs -n 'contains diff (commandline -poc)' -s l --description 'Local directory only, not recursive'
-complete -c cvs -n 'contains diff (commandline -poc)' -s R --description 'Process directories recursively.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s k -x --description 'Specify keyword expansion mode.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s D -x --description 'Diff revision for date against working file.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s D -x --description 'Diff rev1/date1 against date2.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s r -x --description 'Diff revision for rev1 against working file.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s r -x --description 'Diff rev1/date1 against rev2.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s i --description '--ignore-case  Consider upper- and lower-case to be the same.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s w --description '--ignore-all-space  Ignore all white space.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s b --description '--ignore-space-change  Ignore changes in the amount of white space.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s B --description '--ignore-blank-lines  Ignore changes whose lines are all blank.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s I -x --description '--ignore-matching-lines=RE  Ignore changes whose lines all match RE.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s - --description 'Binary  Read and write data in binary mode.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s a --description '--text  Treat all files as text.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s c --description '-C NUM  --context[=NUM]  Output NUM (default 2) lines of copied context.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s u --description '-U NUM  --unified[=NUM]  Output NUM (default 2) lines of unified context.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s N --description 'UM  Use NUM context lines.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s L -x --description '--label LABEL  Use LABEL instead of file name.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s p --description '--show-c-function  Show which C function each change is in.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s F -x --description '--show-function-line=RE  Show the most recent line matching RE.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s - --description 'Brief  Output only whether files differ.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s e --description '--ed  Output an ed script.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s f --description '--forward-ed  Output something like an ed script in forward order.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s n --description '--rcs  Output an RCS format diff.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s y --description '--side-by-side  Output in two columns.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s W -x --description '--width=NUM  Output at most NUM (default 130) characters per line.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s - --description 'Left-column  Output only the left column of common lines.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s - --description 'Suppress-common-lines  Do not output common lines.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s - --description 'Ifdef=NAME  Output merged file to show `#ifdef NAME\' diffs.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s - --description 'GTYPE-group-format=GFMT  Similar, but format GTYPE input groups with GFMT.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s - --description 'Line-format=LFMT  Similar, but format all input lines with LFMT.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s - --description 'LTYPE-line-format=LFMT  Similar, but format LTYPE input lines with LFMT.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s t --description '--expand-tabs  Expand tabs to spaces in output.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s T --description '--initial-tab  Make tabs line up by prepending a tab.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s N --description '--new-file  Treat absent files as empty.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s s --description '--report-identical-files  Report when two files are the same.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s - --description 'Horizon-lines=NUM  Keep NUM lines of the common prefix and suffix.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s d --description '--minimal  Try hard to find a smaller set of changes.'
-complete -c cvs -n 'contains diff (commandline -poc)' -s H --description '--speed-large-files  Assume large files and many scattered small changes.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s l --description 'Local directory only, not recursive'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s R --description 'Process directories recursively.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s k -x --description 'Specify keyword expansion mode.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s D -x --description 'Diff revision for date against working file.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s D -x --description 'Diff rev1/date1 against date2.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s r -x --description 'Diff revision for rev1 against working file.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s r -x --description 'Diff rev1/date1 against rev2.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s i --description '--ignore-case  Consider upper- and lower-case to be the same.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s w --description '--ignore-all-space  Ignore all white space.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s b --description '--ignore-space-change  Ignore changes in the amount of white space.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s B --description '--ignore-blank-lines  Ignore changes whose lines are all blank.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s I -x --description '--ignore-matching-lines=RE  Ignore changes whose lines all match RE.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s - --description 'Binary  Read and write data in binary mode.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s a --description '--text  Treat all files as text.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s c --description '-C NUM  --context[=NUM]  Output NUM (default 2) lines of copied context.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s u --description '-U NUM  --unified[=NUM]  Output NUM (default 2) lines of unified context.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s N --description 'UM  Use NUM context lines.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s L -x --description '--label LABEL  Use LABEL instead of file name.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s p --description '--show-c-function  Show which C function each change is in.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s F -x --description '--show-function-line=RE  Show the most recent line matching RE.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s - --description 'Brief  Output only whether files differ.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s e --description '--ed  Output an ed script.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s f --description '--forward-ed  Output something like an ed script in forward order.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s n --description '--rcs  Output an RCS format diff.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s y --description '--side-by-side  Output in two columns.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s W -x --description '--width=NUM  Output at most NUM (default 130) characters per line.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s - --description 'Left-column  Output only the left column of common lines.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s - --description 'Suppress-common-lines  Do not output common lines.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s - --description 'Ifdef=NAME  Output merged file to show `#ifdef NAME\' diffs.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s - --description 'GTYPE-group-format=GFMT  Similar, but format GTYPE input groups with GFMT.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s - --description 'Line-format=LFMT  Similar, but format all input lines with LFMT.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s - --description 'LTYPE-line-format=LFMT  Similar, but format LTYPE input lines with LFMT.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s t --description '--expand-tabs  Expand tabs to spaces in output.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s T --description '--initial-tab  Make tabs line up by prepending a tab.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s N --description '--new-file  Treat absent files as empty.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s s --description '--report-identical-files  Report when two files are the same.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s - --description 'Horizon-lines=NUM  Keep NUM lines of the common prefix and suffix.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s d --description '--minimal  Try hard to find a smaller set of changes.'
+complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s H --description '--speed-large-files  Assume large files and many scattered small changes.'
 
 
 #
 # Completions for the 'edit' subcommand
 #
 
-complete -c cvs -n 'contains edit (commandline -poc)' -s l --description 'Local directory only, not recursive.'
-complete -c cvs -n 'contains edit (commandline -poc)' -s R --description 'Process directories recursively (default).'
-complete -c cvs -n 'contains edit (commandline -poc)' -s a --description 'Specify action to register for temporary watch, one of:'
+complete -c cvs -n 'contains \'edit\' (commandline -poc)' -s l --description 'Local directory only, not recursive.'
+complete -c cvs -n 'contains \'edit\' (commandline -poc)' -s R --description 'Process directories recursively (default).'
+complete -c cvs -n 'contains \'edit\' (commandline -poc)' -s a --description 'Specify action to register for temporary watch, one of:'
 
 
 #
 # Completions for the 'editors' subcommand
 #
 
-complete -c cvs -n 'contains editors (commandline -poc)' -s l --description 'Process this directory only (not recursive).'
-complete -c cvs -n 'contains editors (commandline -poc)' -s R --description 'Process directories recursively (default).'
+complete -c cvs -n 'contains \'editors\' (commandline -poc)' -s l --description 'Process this directory only (not recursive).'
+complete -c cvs -n 'contains \'editors\' (commandline -poc)' -s R --description 'Process directories recursively (default).'
 
 
 #
 # Completions for the 'export' subcommand
 #
 
-complete -c cvs -n 'contains export (commandline -poc)' -s N --description 'Don\'t shorten module paths if -d specified.'
-complete -c cvs -n 'contains export (commandline -poc)' -s f --description 'Force a head revision match if tag/date not found.'
-complete -c cvs -n 'contains export (commandline -poc)' -s l --description 'Local directory only, not recursive'
-complete -c cvs -n 'contains export (commandline -poc)' -s R --description 'Process directories recursively (default).'
-complete -c cvs -n 'contains export (commandline -poc)' -s n --description 'Do not run module program (if any).'
-complete -c cvs -n 'contains export (commandline -poc)' -s r -x --description 'Export tagged revisions.'
-complete -c cvs -n 'contains export (commandline -poc)' -s D -x --description 'Export revisions as of date.'
-complete -c cvs -n 'contains export (commandline -poc)' -s d -x -a '(__fish_complete_directories (commandline -ct))' --description 'Export into dir instead of module name.'
-complete -c cvs -n 'contains export (commandline -poc)' -s k -x --description 'Use RCS kopt -k option on checkout.'
+complete -c cvs -n 'contains \'export\' (commandline -poc)' -s N --description 'Don\'t shorten module paths if -d specified.'
+complete -c cvs -n 'contains \'export\' (commandline -poc)' -s f --description 'Force a head revision match if tag/date not found.'
+complete -c cvs -n 'contains \'export\' (commandline -poc)' -s l --description 'Local directory only, not recursive'
+complete -c cvs -n 'contains \'export\' (commandline -poc)' -s R --description 'Process directories recursively (default).'
+complete -c cvs -n 'contains \'export\' (commandline -poc)' -s n --description 'Do not run module program (if any).'
+complete -c cvs -n 'contains \'export\' (commandline -poc)' -s r -x --description 'Export tagged revisions.'
+complete -c cvs -n 'contains \'export\' (commandline -poc)' -s D -x --description 'Export revisions as of date.'
+complete -c cvs -n 'contains \'export\' (commandline -poc)' -s d -x -a '(__fish_complete_directories (commandline -ct))' --description 'Export into dir instead of module name.'
+complete -c cvs -n 'contains \'export\' (commandline -poc)' -s k -x --description 'Use RCS kopt -k option on checkout.'
 
 
 #
 # Completions for the 'history' subcommand
 #
 
-complete -c cvs -n 'contains history (commandline -poc)' -s T --description 'Produce report on all TAGs'
-complete -c cvs -n 'contains history (commandline -poc)' -s c --description 'Committed (Modified) files'
-complete -c cvs -n 'contains history (commandline -poc)' -s o --description 'Checked out modules'
-complete -c cvs -n 'contains history (commandline -poc)' -s m -x --description 'Look for specified module (repeatable)'
-complete -c cvs -n 'contains history (commandline -poc)' -s x -x --description 'Extract by record type'
-complete -c cvs -n 'contains history (commandline -poc)' -s e --description 'Everything (same as -x, but all record types)'
-complete -c cvs -n 'contains history (commandline -poc)' -s a --description 'All users (Default is self)'
-complete -c cvs -n 'contains history (commandline -poc)' -s l --description 'Last modified (committed or modified report)'
-complete -c cvs -n 'contains history (commandline -poc)' -s w --description 'Working directory must match'
-complete -c cvs -n 'contains history (commandline -poc)' -s D -x --description 'Since date (Many formats)'
-complete -c cvs -n 'contains history (commandline -poc)' -s b -x --description 'Back to record with str in module/file/repos field'
-complete -c cvs -n 'contains history (commandline -poc)' -s f -r --description 'Specified file (same as command line) (repeatable)'
-complete -c cvs -n 'contains history (commandline -poc)' -s n -x --description 'In module (repeatable)'
-complete -c cvs -n 'contains history (commandline -poc)' -s p -x --description 'In repository (repeatable)'
-complete -c cvs -n 'contains history (commandline -poc)' -s r -x --description 'Since rev or tag (looks inside RCS files!)'
-complete -c cvs -n 'contains history (commandline -poc)' -s t -x --description 'Since tag record placed in history file (by anyone).'
-complete -c cvs -n 'contains history (commandline -poc)' -s u -x -a '(__fish_complete_users)' --description 'For user name (repeatable)'
-complete -c cvs -n 'contains history (commandline -poc)' -s z -x --description 'Output for time zone <tz> (e.g. -z -0700)'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s T --description 'Produce report on all TAGs'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s c --description 'Committed (Modified) files'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s o --description 'Checked out modules'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s m -x --description 'Look for specified module (repeatable)'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s x -x --description 'Extract by record type'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s e --description 'Everything (same as -x, but all record types)'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s a --description 'All users (Default is self)'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s l --description 'Last modified (committed or modified report)'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s w --description 'Working directory must match'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s D -x --description 'Since date (Many formats)'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s b -x --description 'Back to record with str in module/file/repos field'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s f -r --description 'Specified file (same as command line) (repeatable)'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s n -x --description 'In module (repeatable)'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s p -x --description 'In repository (repeatable)'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s r -x --description 'Since rev or tag (looks inside RCS files!)'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s t -x --description 'Since tag record placed in history file (by anyone).'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s u -x -a '(__fish_complete_users)' --description 'For user name (repeatable)'
+complete -c cvs -n 'contains \'history\' (commandline -poc)' -s z -x --description 'Output for time zone <tz> (e.g. -z -0700)'
 
 
 #
 # Completions for the 'import' subcommand
 #
 
-complete -c cvs -n 'contains import (commandline -poc)' -s d --description 'Use the file\'s modification time as the time of import.'
-complete -c cvs -n 'contains import (commandline -poc)' -s k -x --description 'Set default RCS keyword substitution mode.'
-complete -c cvs -n 'contains import (commandline -poc)' -s I -x --description 'More files to ignore (! to reset).'
-complete -c cvs -n 'contains import (commandline -poc)' -s b -x --description 'Vendor branch id.'
-complete -c cvs -n 'contains import (commandline -poc)' -s m -x --description 'Log message.'
-complete -c cvs -n 'contains import (commandline -poc)' -s W -x --description 'Wrappers specification line.'
+complete -c cvs -n 'contains \'import\' (commandline -poc)' -s d --description 'Use the file\'s modification time as the time of import.'
+complete -c cvs -n 'contains \'import\' (commandline -poc)' -s k -x --description 'Set default RCS keyword substitution mode.'
+complete -c cvs -n 'contains \'import\' (commandline -poc)' -s I -x --description 'More files to ignore (! to reset).'
+complete -c cvs -n 'contains \'import\' (commandline -poc)' -s b -x --description 'Vendor branch id.'
+complete -c cvs -n 'contains \'import\' (commandline -poc)' -s m -x --description 'Log message.'
+complete -c cvs -n 'contains \'import\' (commandline -poc)' -s W -x --description 'Wrappers specification line.'
 
 
 #
@@ -277,19 +277,19 @@ complete -c cvs -n 'contains import (commandline -poc)' -s W -x --description 'W
 # Completions for the 'log' subcommand
 #
 
-complete -c cvs -n 'contains log (commandline -poc)' -s l --description 'Local directory only, no recursion.'
-complete -c cvs -n 'contains log (commandline -poc)' -s b --description 'Only list revisions on the default branch.'
-complete -c cvs -n 'contains log (commandline -poc)' -s h --description 'Only print header.'
-complete -c cvs -n 'contains log (commandline -poc)' -s R --description 'Only print name of RCS file.'
-complete -c cvs -n 'contains log (commandline -poc)' -s t --description 'Only print header and descriptive text.'
-complete -c cvs -n 'contains log (commandline -poc)' -s N --description 'Do not list tags.'
-complete -c cvs -n 'contains log (commandline -poc)' -s S --description 'Do not print name/header if no revisions selected.  -d, -r,'
-complete -c cvs -n 'contains log (commandline -poc)' -s s --description ', & -w have little effect in conjunction with -b, -h, -R, and'
-complete -c cvs -n 'contains log (commandline -poc)' -s t -x --description 'This option.'
-complete -c cvs -n 'contains log (commandline -poc)' -s r --description '[revisions]'
-complete -c cvs -n 'contains log (commandline -poc)' -s d -x --description 'A semicolon-separated list of dates'
-complete -c cvs -n 'contains log (commandline -poc)' -s s -x --description 'Only list revisions with specified states.'
-complete -c cvs -n 'contains log (commandline -poc)' -s w --description '[logins]'
+complete -c cvs -n 'contains \'log\' (commandline -poc)' -s l --description 'Local directory only, no recursion.'
+complete -c cvs -n 'contains \'log\' (commandline -poc)' -s b --description 'Only list revisions on the default branch.'
+complete -c cvs -n 'contains \'log\' (commandline -poc)' -s h --description 'Only print header.'
+complete -c cvs -n 'contains \'log\' (commandline -poc)' -s R --description 'Only print name of RCS file.'
+complete -c cvs -n 'contains \'log\' (commandline -poc)' -s t --description 'Only print header and descriptive text.'
+complete -c cvs -n 'contains \'log\' (commandline -poc)' -s N --description 'Do not list tags.'
+complete -c cvs -n 'contains \'log\' (commandline -poc)' -s S --description 'Do not print name/header if no revisions selected.  -d, -r,'
+complete -c cvs -n 'contains \'log\' (commandline -poc)' -s s --description ', & -w have little effect in conjunction with -b, -h, -R, and'
+complete -c cvs -n 'contains \'log\' (commandline -poc)' -s t -x --description 'This option.'
+complete -c cvs -n 'contains \'log\' (commandline -poc)' -s r --description '[revisions]'
+complete -c cvs -n 'contains \'log\' (commandline -poc)' -s d -x --description 'A semicolon-separated list of dates'
+complete -c cvs -n 'contains \'log\' (commandline -poc)' -s s -x --description 'Only list revisions with specified states.'
+complete -c cvs -n 'contains \'log\' (commandline -poc)' -s w --description '[logins]'
 
 
 #
@@ -314,82 +314,82 @@ complete -c cvs -n 'contains log (commandline -poc)' -s w --description '[logins
 # Completions for the 'rannotate' subcommand
 #
 
-complete -c cvs -n 'contains rannotate (commandline -poc)' -s l --description 'Local directory only, no recursion.'
-complete -c cvs -n 'contains rannotate (commandline -poc)' -s R --description 'Process directories recursively.'
-complete -c cvs -n 'contains rannotate (commandline -poc)' -s f --description 'Use head revision if tag/date not found.'
-complete -c cvs -n 'contains rannotate (commandline -poc)' -s F --description 'Annotate binary files.'
-complete -c cvs -n 'contains rannotate (commandline -poc)' -s r -x --description 'Annotate file as of specified revision/tag.'
-complete -c cvs -n 'contains rannotate (commandline -poc)' -s D -x --description 'Annotate file as of specified date.'
+complete -c cvs -n 'contains \'rannotate\' (commandline -poc)' -s l --description 'Local directory only, no recursion.'
+complete -c cvs -n 'contains \'rannotate\' (commandline -poc)' -s R --description 'Process directories recursively.'
+complete -c cvs -n 'contains \'rannotate\' (commandline -poc)' -s f --description 'Use head revision if tag/date not found.'
+complete -c cvs -n 'contains \'rannotate\' (commandline -poc)' -s F --description 'Annotate binary files.'
+complete -c cvs -n 'contains \'rannotate\' (commandline -poc)' -s r -x --description 'Annotate file as of specified revision/tag.'
+complete -c cvs -n 'contains \'rannotate\' (commandline -poc)' -s D -x --description 'Annotate file as of specified date.'
 
 
 #
 # Completions for the 'rdiff' subcommand
 #
 
-complete -c cvs -n 'contains rdiff (commandline -poc)' -s r -x --description 'Date [-r rev2 | -D date2] modules...'
-complete -c cvs -n 'contains rdiff (commandline -poc)' -s f --description 'Force a head revision match if tag/date not found.'
-complete -c cvs -n 'contains rdiff (commandline -poc)' -s l --description 'Local directory only, not recursive'
-complete -c cvs -n 'contains rdiff (commandline -poc)' -s R --description 'Process directories recursively.'
-complete -c cvs -n 'contains rdiff (commandline -poc)' -s c --description 'Context diffs (default)'
-complete -c cvs -n 'contains rdiff (commandline -poc)' -s u --description 'Unidiff format.'
-complete -c cvs -n 'contains rdiff (commandline -poc)' -s s --description 'Short patch - one liner per file.'
-complete -c cvs -n 'contains rdiff (commandline -poc)' -s t --description 'Top two diffs - last change made to the file.'
-complete -c cvs -n 'contains rdiff (commandline -poc)' -s V -x --description 'Use RCS Version "vers" for keyword expansion.'
-complete -c cvs -n 'contains rdiff (commandline -poc)' -s k -x --description 'Specify keyword expansion mode.'
-complete -c cvs -n 'contains rdiff (commandline -poc)' -s D -x --description 'Date.'
-complete -c cvs -n 'contains rdiff (commandline -poc)' -s r -x --description 'Revision - symbolic or numeric.'
+complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s r -x --description 'Date [-r rev2 | -D date2] modules...'
+complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s f --description 'Force a head revision match if tag/date not found.'
+complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s l --description 'Local directory only, not recursive'
+complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s R --description 'Process directories recursively.'
+complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s c --description 'Context diffs (default)'
+complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s u --description 'Unidiff format.'
+complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s s --description 'Short patch - one liner per file.'
+complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s t --description 'Top two diffs - last change made to the file.'
+complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s V -x --description 'Use RCS Version "vers" for keyword expansion.'
+complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s k -x --description 'Specify keyword expansion mode.'
+complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s D -x --description 'Date.'
+complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s r -x --description 'Revision - symbolic or numeric.'
 
 
 #
 # Completions for the 'release' subcommand
 #
 
-complete -c cvs -n 'contains release (commandline -poc)' -s d --description 'Delete the given directory.'
+complete -c cvs -n 'contains \'release\' (commandline -poc)' -s d --description 'Delete the given directory.'
 
 
 #
 # Completions for the 'remove' subcommand
 #
 
-complete -c cvs -n 'contains remove (commandline -poc)' -s f --description 'Delete the file before removing it.'
-complete -c cvs -n 'contains remove (commandline -poc)' -s l --description 'Process this directory only (not recursive).'
-complete -c cvs -n 'contains remove (commandline -poc)' -s R --description 'Process directories recursively.'
+complete -c cvs -n 'contains \'remove\' (commandline -poc)' -s f --description 'Delete the file before removing it.'
+complete -c cvs -n 'contains \'remove\' (commandline -poc)' -s l --description 'Process this directory only (not recursive).'
+complete -c cvs -n 'contains \'remove\' (commandline -poc)' -s R --description 'Process directories recursively.'
 
 
 #
 # Completions for the 'rlog' subcommand
 #
 
-complete -c cvs -n 'contains rlog (commandline -poc)' -s l --description 'Local directory only, no recursion.'
-complete -c cvs -n 'contains rlog (commandline -poc)' -s b --description 'Only list revisions on the default branch.'
-complete -c cvs -n 'contains rlog (commandline -poc)' -s h --description 'Only print header.'
-complete -c cvs -n 'contains rlog (commandline -poc)' -s R --description 'Only print name of RCS file.'
-complete -c cvs -n 'contains rlog (commandline -poc)' -s t --description 'Only print header and descriptive text.'
-complete -c cvs -n 'contains rlog (commandline -poc)' -s N --description 'Do not list tags.'
-complete -c cvs -n 'contains rlog (commandline -poc)' -s S --description 'Do not print name/header if no revisions selected.  -d, -r,'
-complete -c cvs -n 'contains rlog (commandline -poc)' -s s --description ', & -w have little effect in conjunction with -b, -h, -R, and'
-complete -c cvs -n 'contains rlog (commandline -poc)' -s t -x --description 'This option.'
-complete -c cvs -n 'contains rlog (commandline -poc)' -s r --description '[revisions]'
-complete -c cvs -n 'contains rlog (commandline -poc)' -s d -x --description 'A semicolon-separated list of dates'
-complete -c cvs -n 'contains rlog (commandline -poc)' -s s -x --description 'Only list revisions with specified states.'
-complete -c cvs -n 'contains rlog (commandline -poc)' -s w --description '[logins]'
+complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s l --description 'Local directory only, no recursion.'
+complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s b --description 'Only list revisions on the default branch.'
+complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s h --description 'Only print header.'
+complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s R --description 'Only print name of RCS file.'
+complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s t --description 'Only print header and descriptive text.'
+complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s N --description 'Do not list tags.'
+complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s S --description 'Do not print name/header if no revisions selected.  -d, -r,'
+complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s s --description ', & -w have little effect in conjunction with -b, -h, -R, and'
+complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s t -x --description 'This option.'
+complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s r --description '[revisions]'
+complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s d -x --description 'A semicolon-separated list of dates'
+complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s s -x --description 'Only list revisions with specified states.'
+complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s w --description '[logins]'
 
 
 #
 # Completions for the 'rtag' subcommand
 #
 
-complete -c cvs -n 'contains rtag (commandline -poc)' -s a --description 'Clear tag from removed files that would not otherwise be tagged.'
-complete -c cvs -n 'contains rtag (commandline -poc)' -s b --description 'Make the tag a "branch" tag, allowing concurrent development.'
-complete -c cvs -n 'contains rtag (commandline -poc)' -s B --description 'Allows -F and -d to disturb branch tags.  Use with extreme care.'
-complete -c cvs -n 'contains rtag (commandline -poc)' -s d --description 'Delete the given tag.'
-complete -c cvs -n 'contains rtag (commandline -poc)' -s F --description 'Move tag if it already exists.'
-complete -c cvs -n 'contains rtag (commandline -poc)' -s f --description 'Force a head revision match if tag/date not found.'
-complete -c cvs -n 'contains rtag (commandline -poc)' -s l --description 'Local directory only, not recursive.'
-complete -c cvs -n 'contains rtag (commandline -poc)' -s n --description 'No execution of \'tag program\'.'
-complete -c cvs -n 'contains rtag (commandline -poc)' -s R --description 'Process directories recursively.'
-complete -c cvs -n 'contains rtag (commandline -poc)' -s r -x --description 'Existing revision/tag.'
-complete -c cvs -n 'contains rtag (commandline -poc)' -s D --description 'Existing date.'
+complete -c cvs -n 'contains \'rtag\' (commandline -poc)' -s a --description 'Clear tag from removed files that would not otherwise be tagged.'
+complete -c cvs -n 'contains \'rtag\' (commandline -poc)' -s b --description 'Make the tag a "branch" tag, allowing concurrent development.'
+complete -c cvs -n 'contains \'rtag\' (commandline -poc)' -s B --description 'Allows -F and -d to disturb branch tags.  Use with extreme care.'
+complete -c cvs -n 'contains \'rtag\' (commandline -poc)' -s d --description 'Delete the given tag.'
+complete -c cvs -n 'contains \'rtag\' (commandline -poc)' -s F --description 'Move tag if it already exists.'
+complete -c cvs -n 'contains \'rtag\' (commandline -poc)' -s f --description 'Force a head revision match if tag/date not found.'
+complete -c cvs -n 'contains \'rtag\' (commandline -poc)' -s l --description 'Local directory only, not recursive.'
+complete -c cvs -n 'contains \'rtag\' (commandline -poc)' -s n --description 'No execution of \'tag program\'.'
+complete -c cvs -n 'contains \'rtag\' (commandline -poc)' -s R --description 'Process directories recursively.'
+complete -c cvs -n 'contains \'rtag\' (commandline -poc)' -s r -x --description 'Existing revision/tag.'
+complete -c cvs -n 'contains \'rtag\' (commandline -poc)' -s D --description 'Existing date.'
 
 
 #
@@ -402,53 +402,53 @@ complete -c cvs -n 'contains rtag (commandline -poc)' -s D --description 'Existi
 # Completions for the 'status' subcommand
 #
 
-complete -c cvs -n 'contains status (commandline -poc)' -s v --description 'Verbose format; includes tag information for the file'
-complete -c cvs -n 'contains status (commandline -poc)' -s l --description 'Process this directory only (not recursive).'
-complete -c cvs -n 'contains status (commandline -poc)' -s R --description 'Process directories recursively.'
+complete -c cvs -n 'contains \'status\' (commandline -poc)' -s v --description 'Verbose format; includes tag information for the file'
+complete -c cvs -n 'contains \'status\' (commandline -poc)' -s l --description 'Process this directory only (not recursive).'
+complete -c cvs -n 'contains \'status\' (commandline -poc)' -s R --description 'Process directories recursively.'
 
 
 #
 # Completions for the 'tag' subcommand
 #
 
-complete -c cvs -n 'contains tag (commandline -poc)' -s b --description 'Make the tag a "branch" tag, allowing concurrent development.'
-complete -c cvs -n 'contains tag (commandline -poc)' -s B --description 'Allows -F and -d to disturb branch tags.  Use with extreme care.'
-complete -c cvs -n 'contains tag (commandline -poc)' -s c --description 'Check that working files are unmodified.'
-complete -c cvs -n 'contains tag (commandline -poc)' -s d --description 'Delete the given tag.'
-complete -c cvs -n 'contains tag (commandline -poc)' -s F --description 'Move tag if it already exists.'
-complete -c cvs -n 'contains tag (commandline -poc)' -s f --description 'Force a head revision match if tag/date not found.'
-complete -c cvs -n 'contains tag (commandline -poc)' -s l --description 'Local directory only, not recursive.'
-complete -c cvs -n 'contains tag (commandline -poc)' -s R --description 'Process directories recursively.'
-complete -c cvs -n 'contains tag (commandline -poc)' -s r -x --description 'Existing revision/tag.'
-complete -c cvs -n 'contains tag (commandline -poc)' -s D --description 'Existing date.'
+complete -c cvs -n 'contains \'tag\' (commandline -poc)' -s b --description 'Make the tag a "branch" tag, allowing concurrent development.'
+complete -c cvs -n 'contains \'tag\' (commandline -poc)' -s B --description 'Allows -F and -d to disturb branch tags.  Use with extreme care.'
+complete -c cvs -n 'contains \'tag\' (commandline -poc)' -s c --description 'Check that working files are unmodified.'
+complete -c cvs -n 'contains \'tag\' (commandline -poc)' -s d --description 'Delete the given tag.'
+complete -c cvs -n 'contains \'tag\' (commandline -poc)' -s F --description 'Move tag if it already exists.'
+complete -c cvs -n 'contains \'tag\' (commandline -poc)' -s f --description 'Force a head revision match if tag/date not found.'
+complete -c cvs -n 'contains \'tag\' (commandline -poc)' -s l --description 'Local directory only, not recursive.'
+complete -c cvs -n 'contains \'tag\' (commandline -poc)' -s R --description 'Process directories recursively.'
+complete -c cvs -n 'contains \'tag\' (commandline -poc)' -s r -x --description 'Existing revision/tag.'
+complete -c cvs -n 'contains \'tag\' (commandline -poc)' -s D --description 'Existing date.'
 
 
 #
 # Completions for the 'unedit' subcommand
 #
 
-complete -c cvs -n 'contains unedit (commandline -poc)' -s l --description 'Local directory only, not recursive.'
-complete -c cvs -n 'contains unedit (commandline -poc)' -s R --description 'Process directories recursively (default).'
+complete -c cvs -n 'contains \'unedit\' (commandline -poc)' -s l --description 'Local directory only, not recursive.'
+complete -c cvs -n 'contains \'unedit\' (commandline -poc)' -s R --description 'Process directories recursively (default).'
 
 
 #
 # Completions for the 'update' subcommand
 #
 
-complete -c cvs -n 'contains update (commandline -poc)' -s A --description 'Reset any sticky tags/date/kopts.'
-complete -c cvs -n 'contains update (commandline -poc)' -s P --description 'Prune empty directories.'
-complete -c cvs -n 'contains update (commandline -poc)' -s C --description 'Overwrite locally modified files with clean repository copies.'
-complete -c cvs -n 'contains update (commandline -poc)' -s d --description 'Build directories, like checkout does.'
-complete -c cvs -n 'contains update (commandline -poc)' -s f --description 'Force a head revision match if tag/date not found.'
-complete -c cvs -n 'contains update (commandline -poc)' -s l --description 'Local directory only, no recursion.'
-complete -c cvs -n 'contains update (commandline -poc)' -s R --description 'Process directories recursively.'
-complete -c cvs -n 'contains update (commandline -poc)' -s p --description 'Send updates to standard output (avoids stickiness).'
-complete -c cvs -n 'contains update (commandline -poc)' -s k -x --description 'Use RCS kopt -k option on checkout. (is sticky)'
-complete -c cvs -n 'contains update (commandline -poc)' -s r -x --description 'Update using specified revision/tag (is sticky).'
-complete -c cvs -n 'contains update (commandline -poc)' -s D -x --description 'Set date to update from (is sticky).'
-complete -c cvs -n 'contains update (commandline -poc)' -s j -x --description 'Merge in changes made between current revision and rev.'
-complete -c cvs -n 'contains update (commandline -poc)' -s I -x --description 'More files to ignore (! to reset).'
-complete -c cvs -n 'contains update (commandline -poc)' -s W -x --description 'Wrappers specification line.'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s A --description 'Reset any sticky tags/date/kopts.'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s P --description 'Prune empty directories.'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s C --description 'Overwrite locally modified files with clean repository copies.'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s d --description 'Build directories, like checkout does.'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s f --description 'Force a head revision match if tag/date not found.'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s l --description 'Local directory only, no recursion.'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s R --description 'Process directories recursively.'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s p --description 'Send updates to standard output (avoids stickiness).'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s k -x --description 'Use RCS kopt -k option on checkout. (is sticky)'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s r -x --description 'Update using specified revision/tag (is sticky).'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s D -x --description 'Set date to update from (is sticky).'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s j -x --description 'Merge in changes made between current revision and rev.'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s I -x --description 'More files to ignore (! to reset).'
+complete -c cvs -n 'contains \'update\' (commandline -poc)' -s W -x --description 'Wrappers specification line.'
 
 
 #
@@ -461,17 +461,17 @@ complete -c cvs -n 'contains update (commandline -poc)' -s W -x --description 'W
 # Completions for the 'watch' subcommand
 #
 
-complete -c cvs -n 'contains watch (commandline -poc)' -s l -x -a 'on off add remove' --description 'Local directory only, not recursive.'
-complete -c cvs -n 'contains watch (commandline -poc)' -s R -x -a 'on off add remove' --description 'Process directories recursively (default).'
-complete -c cvs -n 'contains watch (commandline -poc)' -s a -x -a 'add remove' --description 'Specify what actions, one of: `edit\', `unedit\','
+complete -c cvs -n 'contains \'watch\' (commandline -poc)' -s l -x -a 'on off add remove' --description 'Local directory only, not recursive.'
+complete -c cvs -n 'contains \'watch\' (commandline -poc)' -s R -x -a 'on off add remove' --description 'Process directories recursively (default).'
+complete -c cvs -n 'contains \'watch\' (commandline -poc)' -s a -x -a 'add remove' --description 'Specify what actions, one of: `edit\', `unedit\','
 
 
 #
 # Completions for the 'watchers' subcommand
 #
 
-complete -c cvs -n 'contains watchers (commandline -poc)' -s l --description 'Process this directory only (not recursive).'
-complete -c cvs -n 'contains watchers (commandline -poc)' -s R --description 'Process directories recursively (default).'
+complete -c cvs -n 'contains \'watchers\' (commandline -poc)' -s l --description 'Process this directory only (not recursive).'
+complete -c cvs -n 'contains \'watchers\' (commandline -poc)' -s R --description 'Process directories recursively (default).'
 
 
 
diff --git a/share/completions/darcs.fish b/share/completions/darcs.fish
index d9791e68..5ad71689 100644
--- a/share/completions/darcs.fish
+++ b/share/completions/darcs.fish
@@ -54,732 +54,759 @@ complete -c darcs -n '__fish_use_subcommand' -x -a repair --description 'Repair
 # Completions for the 'help' subcommand
 #
 
-complete -c darcs -n 'contains help (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains help (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains help (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains help (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains help (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains help (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains help (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains help (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'add' subcommand
 #
 
-complete -c darcs -n 'contains add (commandline -poc)' -l boring --description 'Don\'t skip boring files'
-complete -c darcs -n 'contains add (commandline -poc)' -l case-ok --description 'Don\'t refuse to add files differing only in case'
-complete -c darcs -n 'contains add (commandline -poc)' -s r -l recursive --description 'Add contents of subdirectories'
-complete -c darcs -n 'contains add (commandline -poc)' -l not-recursive --description 'Don\'t add contents of subdirectories'
-complete -c darcs -n 'contains add (commandline -poc)' -l date-trick --description 'Add files with date appended to avoid conflict. [EXPERIMENTAL] '
-complete -c darcs -n 'contains add (commandline -poc)' -l no-date-trick --description 'Don\'t use experimental date appending trick. [DEFAULT]'
-complete -c darcs -n 'contains add (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains add (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains add (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
-complete -c darcs -n 'contains add (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains add (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
-complete -c darcs -n 'contains add (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains add (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains add (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains add (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains add (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains add (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l boring --description 'Don\'t skip boring files'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l case-ok --description 'Don\'t refuse to add files differing only in case'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -s r -l recursive --description 'Add contents of subdirectories'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l not-recursive --description 'Don\'t add contents of subdirectories'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l date-trick --description 'Add files with date appended to avoid conflict. [EXPERIMENTAL] '
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-date-trick --description 'Don\'t use experimental date appending trick. [DEFAULT]'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'remove' subcommand
 #
 
-complete -c darcs -n 'contains remove (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains remove (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains remove (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains remove (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains remove (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains remove (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains remove (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains remove (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains remove (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'mv' subcommand
 #
 
-complete -c darcs -n 'contains mv (commandline -poc)' -l case-ok --description 'Don\'t refuse to add files differing only in case'
-complete -c darcs -n 'contains mv (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains mv (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains mv (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains mv (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains mv (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains mv (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains mv (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains mv (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains mv (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l case-ok --description 'Don\'t refuse to add files differing only in case'
+complete -c darcs -n 'contains \'mv\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'mv\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'replace' subcommand
 #
 
-complete -c darcs -n 'contains replace (commandline -poc)' -l token-chars -x --description 'Define token to contain these characters'
-complete -c darcs -n 'contains replace (commandline -poc)' -s f -l force --description 'Proceed with replace even if \'new\' token already exists'
-complete -c darcs -n 'contains replace (commandline -poc)' -l no-force --description 'Don\'t force the replace if it looks scary'
-complete -c darcs -n 'contains replace (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains replace (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains replace (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains replace (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains replace (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains replace (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains replace (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains replace (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains replace (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l token-chars -x --description 'Define token to contain these characters'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -s f -l force --description 'Proceed with replace even if \'new\' token already exists'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l no-force --description 'Don\'t force the replace if it looks scary'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'revert' subcommand
 #
 
-complete -c darcs -n 'contains revert (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains revert (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains revert (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains revert (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
-complete -c darcs -n 'contains revert (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains revert (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains revert (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains revert (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains revert (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains revert (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains revert (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains revert (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'unrevert' subcommand
 #
 
-complete -c darcs -n 'contains unrevert (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains unrevert (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains unrevert (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains unrevert (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
-complete -c darcs -n 'contains unrevert (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains unrevert (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains unrevert (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains unrevert (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains unrevert (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains unrevert (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains unrevert (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains unrevert (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'whatsnew' subcommand
 #
 
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -s s -l summary --description 'Summarize changes'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -s u -l unified --description 'Output patch in a darcs-specific format similar to diff -u'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -s l -l look-for-adds --description 'In addition to modifications, look for files that are not boring, and thus are potentially pending addition'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -l dont-look-for-adds --description 'Don\'t look for any files or directories that could be added, and don\'t add them automatically'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -l boring --description 'Don\'t skip boring files'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains whatsnew (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -s s -l summary --description 'Summarize changes'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -s u -l unified --description 'Output patch in a darcs-specific format similar to diff -u'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -s l -l look-for-adds --description 'In addition to modifications, look for files that are not boring, and thus are potentially pending addition'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l dont-look-for-adds --description 'Don\'t look for any files or directories that could be added, and don\'t add them automatically'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l boring --description 'Don\'t skip boring files'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'record' subcommand
 #
 
-complete -c darcs -n 'contains record (commandline -poc)' -l logfile -r --description 'Give patch name and comment in file'
-complete -c darcs -n 'contains record (commandline -poc)' -l delete-logfile --description 'Delete the logfile when done'
-complete -c darcs -n 'contains record (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains record (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains record (commandline -poc)' -l no-test --description 'Don\'t run the test script'
-complete -c darcs -n 'contains record (commandline -poc)' -l test --description 'Run the test script'
-complete -c darcs -n 'contains record (commandline -poc)' -l leave-test-directory --description 'Don\'t remove the test directory'
-complete -c darcs -n 'contains record (commandline -poc)' -l remove-test-directory --description 'Remove the test directory'
-complete -c darcs -n 'contains record (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains record (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains record (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
-complete -c darcs -n 'contains record (commandline -poc)' -l pipe --description 'Expect to receive input from a pipe'
-complete -c darcs -n 'contains record (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains record (commandline -poc)' -l ask-deps --description 'Ask for extra dependencies'
-complete -c darcs -n 'contains record (commandline -poc)' -l no-ask-deps --description 'Don\'t ask for extra dependencies'
-complete -c darcs -n 'contains record (commandline -poc)' -l edit-long-comment --description 'Edit the long comment by default'
-complete -c darcs -n 'contains record (commandline -poc)' -l skip-long-comment --description 'Don\'t give a long comment'
-complete -c darcs -n 'contains record (commandline -poc)' -l prompt-long-comment --description 'Prompt for whether to edit the long comment'
-complete -c darcs -n 'contains record (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains record (commandline -poc)' -s l -l look-for-adds --description 'In addition to modifications, look for files that are not boring, and thus are potentially pending addition'
-complete -c darcs -n 'contains record (commandline -poc)' -l dont-look-for-adds --description 'Don\'t look for any files or directories that could be added, and don\'t add them automatically'
-complete -c darcs -n 'contains record (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains record (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains record (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains record (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains record (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains record (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains record (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -s m -l patch-name -x --description 'Name of patch'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -s A -l author -x --description 'Specify author id'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l logfile -r --description 'Give patch name and comment in file'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l delete-logfile --description 'Delete the logfile when done'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-test --description 'Don\'t run the test script'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l test --description 'Run the test script'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l leave-test-directory --description 'Don\'t remove the test directory'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l remove-test-directory --description 'Remove the test directory'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l pipe --description 'Expect to receive input from a pipe'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l ask-deps --description 'Ask for extra dependencies'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-ask-deps --description 'Don\'t ask for extra dependencies'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l edit-long-comment --description 'Edit the long comment by default'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l skip-long-comment --description 'Don\'t give a long comment'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l prompt-long-comment --description 'Prompt for whether to edit the long comment'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -s l -l look-for-adds --description 'In addition to modifications, look for files that are not boring, and thus are potentially pending addition'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l dont-look-for-adds --description 'Don\'t look for any files or directories that could be added, and don\'t add them automatically'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'unrecord' subcommand
 #
 
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l from-match -x --description 'Select changes starting with a patch matching PATTERN'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l from-patch -x --description 'Select changes starting with a patch matching REGEXP'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l from-tag -x --description 'Select changes starting with a tag matching REGEXP'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains unrecord (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l from-match -x --description 'Select changes starting with a patch matching PATTERN'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l from-patch -x --description 'Select changes starting with a patch matching REGEXP'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l from-tag -x --description 'Select changes starting with a tag matching REGEXP'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'amend-record' subcommand
 #
 
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l match -x --description 'Select patch matching PATTERN'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l no-test --description 'Don\'t run the test script'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l test --description 'Run the test script'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l leave-test-directory --description 'Don\'t remove the test directory'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l remove-test-directory --description 'Remove the test directory'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -s l -l look-for-adds --description 'In addition to modifications, look for files that are not boring, and thus are potentially pending addition'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l dont-look-for-adds --description 'Don\'t look for any files or directories that could be added, and don\'t add them automatically'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains amend-record (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l match -x --description 'Select patch matching PATTERN'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s p -l patch -x --description 'Select patch matching REGEXP'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l no-test --description 'Don\'t run the test script'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l test --description 'Run the test script'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l leave-test-directory --description 'Don\'t remove the test directory'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l remove-test-directory --description 'Remove the test directory'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s l -l look-for-adds --description 'In addition to modifications, look for files that are not boring, and thus are potentially pending addition'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l dont-look-for-adds --description 'Don\'t look for any files or directories that could be added, and don\'t add them automatically'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'resolve' subcommand
 #
 
-complete -c darcs -n 'contains resolve (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains resolve (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains resolve (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains resolve (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains resolve (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains resolve (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains resolve (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains resolve (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains resolve (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains resolve (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'tag' subcommand
 #
 
-complete -c darcs -n 'contains tag (commandline -poc)' -l checkpoint --description 'Create a checkpoint file'
-complete -c darcs -n 'contains tag (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains tag (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains tag (commandline -poc)' -l pipe --description 'Expect to receive input from a pipe'
-complete -c darcs -n 'contains tag (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains tag (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains tag (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains tag (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains tag (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains tag (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains tag (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains tag (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains tag (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains tag (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -s m -l patch-name -x --description 'Name of patch'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -s A -l author -x --description 'Specify author id'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l checkpoint --description 'Create a checkpoint file'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l pipe --description 'Expect to receive input from a pipe'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'setpref' subcommand
 #
 
-complete -c darcs -n 'contains setpref (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains setpref (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains setpref (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains setpref (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains setpref (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains setpref (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains setpref (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'rollback' subcommand
 #
 
-complete -c darcs -n 'contains rollback (commandline -poc)' -l match -x --description 'Select patch matching PATTERN'
-complete -c darcs -n 'contains rollback (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains rollback (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains rollback (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains rollback (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains rollback (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains rollback (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains rollback (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains rollback (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains rollback (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains rollback (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains rollback (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l match -x --description 'Select patch matching PATTERN'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s p -l patch -x --description 'Select patch matching REGEXP'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'diff' subcommand
 #
 
-complete -c darcs -n 'contains diff (commandline -poc)' -l to-match -x --description 'Select changes up to a patch matching PATTERN'
-complete -c darcs -n 'contains diff (commandline -poc)' -l to-patch -x --description 'Select changes up to a patch matching REGEXP'
-complete -c darcs -n 'contains diff (commandline -poc)' -l to-tag -x --description 'Select changes up to a tag matching REGEXP'
-complete -c darcs -n 'contains diff (commandline -poc)' -l from-match -x --description 'Select changes starting with a patch matching PATTERN'
-complete -c darcs -n 'contains diff (commandline -poc)' -l from-patch -x --description 'Select changes starting with a patch matching REGEXP'
-complete -c darcs -n 'contains diff (commandline -poc)' -l from-tag -x --description 'Select changes starting with a tag matching REGEXP'
-complete -c darcs -n 'contains diff (commandline -poc)' -l match -x --description 'Select a single patch matching PATTERN'
-complete -c darcs -n 'contains diff (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
-complete -c darcs -n 'contains diff (commandline -poc)' -l diff-command -x -a '(__fish_complete_command)' --description 'Specify diff command (ignores --diff-opts)'
-complete -c darcs -n 'contains diff (commandline -poc)' -l diff-opts -x --description 'Options to pass to diff'
-complete -c darcs -n 'contains diff (commandline -poc)' -s u -l unified --description 'Pass -u option to diff'
-complete -c darcs -n 'contains diff (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains diff (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains diff (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains diff (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains diff (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains diff (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains diff (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l to-match -x --description 'Select changes up to a patch matching PATTERN'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l to-patch -x --description 'Select changes up to a patch matching REGEXP'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l to-tag -x --description 'Select changes up to a tag matching REGEXP'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l from-match -x --description 'Select changes starting with a patch matching PATTERN'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l from-patch -x --description 'Select changes starting with a patch matching REGEXP'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l from-tag -x --description 'Select changes starting with a tag matching REGEXP'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l match -x --description 'Select a single patch matching PATTERN'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -s p -l patch -x --description 'Select a single patch matching REGEXP'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l diff-command -x -a '(__fish_complete_command)' --description 'Specify diff command (ignores --diff-opts)'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l diff-opts -x --description 'Options to pass to diff'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -s u -l unified --description 'Pass -u option to diff'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'changes' subcommand
 #
 
-complete -c darcs -n 'contains changes (commandline -poc)' -l to-match -x --description 'Select changes up to a patch matching PATTERN'
-complete -c darcs -n 'contains changes (commandline -poc)' -l to-patch -x --description 'Select changes up to a patch matching REGEXP'
-complete -c darcs -n 'contains changes (commandline -poc)' -l to-tag -x --description 'Select changes up to a tag matching REGEXP'
-complete -c darcs -n 'contains changes (commandline -poc)' -l from-match -x --description 'Select changes starting with a patch matching PATTERN'
-complete -c darcs -n 'contains changes (commandline -poc)' -l from-patch -x --description 'Select changes starting with a patch matching REGEXP'
-complete -c darcs -n 'contains changes (commandline -poc)' -l from-tag -x --description 'Select changes starting with a tag matching REGEXP'
-complete -c darcs -n 'contains changes (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
-complete -c darcs -n 'contains changes (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
-complete -c darcs -n 'contains changes (commandline -poc)' -l context --description 'Give output suitable for get --context'
-complete -c darcs -n 'contains changes (commandline -poc)' -l xml-output --description 'Generate XML formatted output'
-complete -c darcs -n 'contains changes (commandline -poc)' -l human-readable --description 'Give human-readable output'
-complete -c darcs -n 'contains changes (commandline -poc)' -s s -l summary --description 'Summarize changes'
-complete -c darcs -n 'contains changes (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
-complete -c darcs -n 'contains changes (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains changes (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains changes (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
-complete -c darcs -n 'contains changes (commandline -poc)' -l reverse --description 'Show changes in reverse order'
-complete -c darcs -n 'contains changes (commandline -poc)' -l repo -x --description 'Specify the repository URL'
-complete -c darcs -n 'contains changes (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains changes (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
-complete -c darcs -n 'contains changes (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains changes (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains changes (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains changes (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains changes (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains changes (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains changes (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l to-match -x --description 'Select changes up to a patch matching PATTERN'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l to-patch -x --description 'Select changes up to a patch matching REGEXP'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l to-tag -x --description 'Select changes up to a tag matching REGEXP'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l from-match -x --description 'Select changes starting with a patch matching PATTERN'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l from-patch -x --description 'Select changes starting with a patch matching REGEXP'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l from-tag -x --description 'Select changes starting with a tag matching REGEXP'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l context --description 'Give output suitable for get --context'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l xml-output --description 'Generate XML formatted output'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l human-readable --description 'Give human-readable output'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s s -l summary --description 'Summarize changes'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l reverse --description 'Show changes in reverse order'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l repo -x --description 'Specify the repository URL'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'annotate' subcommand
 #
 
-complete -c darcs -n 'contains annotate (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains annotate (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains annotate (commandline -poc)' -s s -l summary --description 'Summarize changes'
-complete -c darcs -n 'contains annotate (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
-complete -c darcs -n 'contains annotate (commandline -poc)' -s u -l unified --description 'Output patch in a darcs-specific format similar to diff -u'
-complete -c darcs -n 'contains annotate (commandline -poc)' -l human-readable --description 'Give human-readable output'
-complete -c darcs -n 'contains annotate (commandline -poc)' -l xml-output --description 'Generate XML formatted output'
-complete -c darcs -n 'contains annotate (commandline -poc)' -l match -x --description 'Select patch matching PATTERN'
-complete -c darcs -n 'contains annotate (commandline -poc)' -l creator-hash -x --description 'Specify hash of creator patch (see docs)'
-complete -c darcs -n 'contains annotate (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains annotate (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains annotate (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains annotate (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains annotate (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains annotate (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains annotate (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s s -l summary --description 'Summarize changes'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s u -l unified --description 'Output patch in a darcs-specific format similar to diff -u'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l human-readable --description 'Give human-readable output'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l xml-output --description 'Generate XML formatted output'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l match -x --description 'Select patch matching PATTERN'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s p -l patch -x --description 'Select patch matching REGEXP'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s t -l tag -x --description 'Select tag matching REGEXP'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l creator-hash -x --description 'Specify hash of creator patch (see docs)'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'dist' subcommand
 #
 
-complete -c darcs -n 'contains dist (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains dist (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains dist (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains dist (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains dist (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains dist (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains dist (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains dist (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains dist (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -s d -l dist-name -x --description 'Name of version'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'trackdown' subcommand
 #
 
-complete -c darcs -n 'contains trackdown (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains trackdown (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains trackdown (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains trackdown (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains trackdown (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains trackdown (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains trackdown (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains trackdown (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains trackdown (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'query' subcommand
 #
 
-complete -c darcs -n 'contains query (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'query\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
 
 
 #
 # Completions for the 'pull' subcommand
 #
 
-complete -c darcs -n 'contains pull (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
-complete -c darcs -n 'contains pull (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
-complete -c darcs -n 'contains pull (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains pull (commandline -poc)' -l intersection --description 'Take intersection of all repositories'
-complete -c darcs -n 'contains pull (commandline -poc)' -l union --description 'Take union of all repositories [default]'
-complete -c darcs -n 'contains pull (commandline -poc)' -l external-merge -x -a '(__fish_complete_command)' --description 'Use external tool to merge conflicts'
-complete -c darcs -n 'contains pull (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains pull (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains pull (commandline -poc)' -l test --description 'Run the test script'
-complete -c darcs -n 'contains pull (commandline -poc)' -l no-test --description 'Don\'t run the test script'
-complete -c darcs -n 'contains pull (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
-complete -c darcs -n 'contains pull (commandline -poc)' -s s -l summary --description 'Summarize changes'
-complete -c darcs -n 'contains pull (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
-complete -c darcs -n 'contains pull (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains pull (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains pull (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
-complete -c darcs -n 'contains pull (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains pull (commandline -poc)' -l no-deps --description 'Don\'t automatically fulfill dependencies'
-complete -c darcs -n 'contains pull (commandline -poc)' -l set-default --description 'Set default repository [DEFAULT]'
-complete -c darcs -n 'contains pull (commandline -poc)' -l no-set-default --description 'Don\'t set default repository'
-complete -c darcs -n 'contains pull (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains pull (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
-complete -c darcs -n 'contains pull (commandline -poc)' -l dont-set-scripts-executable --description 'Don\'t make scripts executable'
-complete -c darcs -n 'contains pull (commandline -poc)' -l disable-ssh-cm --description 'Disable use of SSH ControlMaster feature'
-complete -c darcs -n 'contains pull (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains pull (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains pull (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains pull (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains pull (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains pull (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l intersection --description 'Take intersection of all repositories'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l union --description 'Take union of all repositories [default]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l external-merge -x -a '(__fish_complete_command)' --description 'Use external tool to merge conflicts'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l test --description 'Run the test script'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-test --description 'Don\'t run the test script'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s s -l summary --description 'Summarize changes'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-deps --description 'Don\'t automatically fulfill dependencies'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l set-default --description 'Set default repository [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-set-default --description 'Don\'t set default repository'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l dont-set-scripts-executable --description 'Don\'t make scripts executable'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l disable-ssh-cm --description 'Disable use of SSH ControlMaster feature'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'unpull' subcommand
 #
 
-complete -c darcs -n 'contains unpull (commandline -poc)' -l from-match -x --description 'Select changes starting with a patch matching PATTERN'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l from-patch -x --description 'Select changes starting with a patch matching REGEXP'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l from-tag -x --description 'Select changes starting with a tag matching REGEXP'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
-complete -c darcs -n 'contains unpull (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains unpull (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains unpull (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l from-match -x --description 'Select changes starting with a patch matching PATTERN'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l from-patch -x --description 'Select changes starting with a patch matching REGEXP'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l from-tag -x --description 'Select changes starting with a tag matching REGEXP'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'obliterate' subcommand
 #
 
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l from-match -x --description 'Select changes starting with a patch matching PATTERN'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l from-patch -x --description 'Select changes starting with a patch matching REGEXP'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l from-tag -x --description 'Select changes starting with a tag matching REGEXP'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains obliterate (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l from-match -x --description 'Select changes starting with a patch matching PATTERN'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l from-patch -x --description 'Select changes starting with a patch matching REGEXP'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l from-tag -x --description 'Select changes starting with a tag matching REGEXP'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'push' subcommand
 #
 
-complete -c darcs -n 'contains push (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains push (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains push (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
-complete -c darcs -n 'contains push (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
-complete -c darcs -n 'contains push (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
-complete -c darcs -n 'contains push (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains push (commandline -poc)' -l apply-as -x -a '(__fish_complete_users)' --description 'Apply patch as another user using sudo'
-complete -c darcs -n 'contains push (commandline -poc)' -l apply-as-myself --description 'Don\'t use sudo to apply as another user [DEFAULT]'
-complete -c darcs -n 'contains push (commandline -poc)' -l sign --description 'Sign the patch with your gpg key'
-complete -c darcs -n 'contains push (commandline -poc)' -l sign-as -x --description 'Sign the patch with a given keyid'
-complete -c darcs -n 'contains push (commandline -poc)' -l sign-ssl -x --description 'Sign the patch using openssl with a given private key'
-complete -c darcs -n 'contains push (commandline -poc)' -l dont-sign --description 'Do not sign the patch'
-complete -c darcs -n 'contains push (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
-complete -c darcs -n 'contains push (commandline -poc)' -s s -l summary --description 'Summarize changes'
-complete -c darcs -n 'contains push (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
-complete -c darcs -n 'contains push (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains push (commandline -poc)' -l disable-ssh-cm --description 'Disable use of SSH ControlMaster feature'
-complete -c darcs -n 'contains push (commandline -poc)' -l set-default --description 'Set default repository [DEFAULT]'
-complete -c darcs -n 'contains push (commandline -poc)' -l no-set-default --description 'Don\'t set default repository'
-complete -c darcs -n 'contains push (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains push (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains push (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains push (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains push (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains push (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l apply-as -x -a '(__fish_complete_users)' --description 'Apply patch as another user using sudo'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l apply-as-myself --description 'Don\'t use sudo to apply as another user [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l sign --description 'Sign the patch with your gpg key'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l sign-as -x --description 'Sign the patch with a given keyid'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l sign-ssl -x --description 'Sign the patch using openssl with a given private key'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l dont-sign --description 'Do not sign the patch'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -s s -l summary --description 'Summarize changes'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l disable-ssh-cm --description 'Disable use of SSH ControlMaster feature'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l set-default --description 'Set default repository [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-set-default --description 'Don\'t set default repository'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'send' subcommand
 #
 
-complete -c darcs -n 'contains send (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains send (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains send (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
-complete -c darcs -n 'contains send (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
-complete -c darcs -n 'contains send (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
-complete -c darcs -n 'contains send (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains send (commandline -poc)' -l from -x --description 'Specify email address'
-complete -c darcs -n 'contains send (commandline -poc)' -l to -x --description 'Specify destination email'
-complete -c darcs -n 'contains send (commandline -poc)' -l cc -x --description 'Mail results to additional EMAIL(s). Requires --reply'
-complete -c darcs -n 'contains send (commandline -poc)' -l subject -x --description 'Specify mail subject'
-complete -c darcs -n 'contains send (commandline -poc)' -l sign --description 'Sign the patch with your gpg key'
-complete -c darcs -n 'contains send (commandline -poc)' -l sign-as -x --description 'Sign the patch with a given keyid'
-complete -c darcs -n 'contains send (commandline -poc)' -l sign-ssl -x --description 'Sign the patch using openssl with a given private key'
-complete -c darcs -n 'contains send (commandline -poc)' -l dont-sign --description 'Do not sign the patch'
-complete -c darcs -n 'contains send (commandline -poc)' -s u -l unified --description 'Output patch in a darcs-specific format similar to diff -u'
-complete -c darcs -n 'contains send (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
-complete -c darcs -n 'contains send (commandline -poc)' -s s -l summary --description 'Summarize changes'
-complete -c darcs -n 'contains send (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
-complete -c darcs -n 'contains send (commandline -poc)' -l context -r --description 'Send to context stored in FILENAME'
-complete -c darcs -n 'contains send (commandline -poc)' -l edit-description --description 'Edit the patch bundle description'
-complete -c darcs -n 'contains send (commandline -poc)' -l dont-edit-description --description 'Don\'t edit the patch bundle description'
-complete -c darcs -n 'contains send (commandline -poc)' -l logfile -r --description 'Give patch name and comment in file'
-complete -c darcs -n 'contains send (commandline -poc)' -l delete-logfile --description 'Delete the logfile when done'
-complete -c darcs -n 'contains send (commandline -poc)' -l set-default --description 'Set default repository [DEFAULT]'
-complete -c darcs -n 'contains send (commandline -poc)' -l no-set-default --description 'Don\'t set default repository'
-complete -c darcs -n 'contains send (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains send (commandline -poc)' -l sendmail-command -x -a '(__fish_complete_command)' --description 'Specify sendmail command'
-complete -c darcs -n 'contains send (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains send (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains send (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains send (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains send (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains send (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l from -x --description 'Specify email address'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -s A -l author -x --description 'Specify author id'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l to -x --description 'Specify destination email'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l cc -x --description 'Mail results to additional EMAIL(s). Requires --reply'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l subject -x --description 'Specify mail subject'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -s o -l output -r --description 'Specify output filename'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l sign --description 'Sign the patch with your gpg key'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l sign-as -x --description 'Sign the patch with a given keyid'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l sign-ssl -x --description 'Sign the patch using openssl with a given private key'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l dont-sign --description 'Do not sign the patch'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -s u -l unified --description 'Output patch in a darcs-specific format similar to diff -u'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -s s -l summary --description 'Summarize changes'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l context -r --description 'Send to context stored in FILENAME'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l edit-description --description 'Edit the patch bundle description'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l dont-edit-description --description 'Don\'t edit the patch bundle description'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l logfile -r --description 'Give patch name and comment in file'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l delete-logfile --description 'Delete the logfile when done'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l set-default --description 'Set default repository [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-set-default --description 'Don\'t set default repository'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l sendmail-command -x -a '(__fish_complete_command)' --description 'Specify sendmail command'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'apply' subcommand
 #
 
-complete -c darcs -n 'contains apply (commandline -poc)' -l verify -x --description 'Verify that the patch was signed by a key in PUBRING'
-complete -c darcs -n 'contains apply (commandline -poc)' -l verify-ssl -x --description 'Verify using openSSL with authorized keys from file KEYS'
-complete -c darcs -n 'contains apply (commandline -poc)' -l no-verify --description 'Don\'t verify patch signature'
-complete -c darcs -n 'contains apply (commandline -poc)' -l reply -x --description 'Reply to email-based patch using FROM address'
-complete -c darcs -n 'contains apply (commandline -poc)' -l cc -x --description 'Mail results to additional EMAIL(s). Requires --reply'
-complete -c darcs -n 'contains apply (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains apply (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains apply (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains apply (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains apply (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains apply (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
-complete -c darcs -n 'contains apply (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains apply (commandline -poc)' -l mark-conflicts --description 'Mark conflicts'
-complete -c darcs -n 'contains apply (commandline -poc)' -l allow-conflicts --description 'Allow conflicts, but don\'t mark them'
-complete -c darcs -n 'contains apply (commandline -poc)' -l external-merge -x -a '(__fish_complete_command)' --description 'Use external tool to merge conflicts'
-complete -c darcs -n 'contains apply (commandline -poc)' -l no-resolve-conflicts --description 'Equivalent to --dont-allow-conflicts, for backwards compatibility'
-complete -c darcs -n 'contains apply (commandline -poc)' -l dont-allow-conflicts --description 'Fail on patches that create conflicts [DEFAULT]'
-complete -c darcs -n 'contains apply (commandline -poc)' -l no-test --description 'Don\'t run the test script'
-complete -c darcs -n 'contains apply (commandline -poc)' -l test --description 'Run the test script'
-complete -c darcs -n 'contains apply (commandline -poc)' -l happy-forwarding --description 'Forward unsigned messages without extra header'
-complete -c darcs -n 'contains apply (commandline -poc)' -l leave-test-directory --description 'Don\'t remove the test directory'
-complete -c darcs -n 'contains apply (commandline -poc)' -l remove-test-directory --description 'Remove the test directory'
-complete -c darcs -n 'contains apply (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains apply (commandline -poc)' -l sendmail-command -x -a '(__fish_complete_command)' --description 'Specify sendmail command'
-complete -c darcs -n 'contains apply (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
-complete -c darcs -n 'contains apply (commandline -poc)' -l dont-set-scripts-executable --description 'Don\'t make scripts executable'
-complete -c darcs -n 'contains apply (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains apply (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains apply (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains apply (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains apply (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains apply (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l verify -x --description 'Verify that the patch was signed by a key in PUBRING'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l verify-ssl -x --description 'Verify using openSSL with authorized keys from file KEYS'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-verify --description 'Don\'t verify patch signature'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l reply -x --description 'Reply to email-based patch using FROM address'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l cc -x --description 'Mail results to additional EMAIL(s). Requires --reply'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l mark-conflicts --description 'Mark conflicts'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l allow-conflicts --description 'Allow conflicts, but don\'t mark them'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l external-merge -x -a '(__fish_complete_command)' --description 'Use external tool to merge conflicts'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-resolve-conflicts --description 'Equivalent to --dont-allow-conflicts, for backwards compatibility'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l dont-allow-conflicts --description 'Fail on patches that create conflicts [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-test --description 'Don\'t run the test script'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l test --description 'Run the test script'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l happy-forwarding --description 'Forward unsigned messages without extra header'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l leave-test-directory --description 'Don\'t remove the test directory'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l remove-test-directory --description 'Remove the test directory'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l sendmail-command -x -a '(__fish_complete_command)' --description 'Specify sendmail command'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l dont-set-scripts-executable --description 'Don\'t make scripts executable'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'get' subcommand
 #
 
-complete -c darcs -n 'contains get (commandline -poc)' -l repo-name -x -a '(__fish_complete_directories (commandline -ct))' --description 'Path of output directory'
-complete -c darcs -n 'contains get (commandline -poc)' -l partial --description 'Get partial repository using checkpoint'
-complete -c darcs -n 'contains get (commandline -poc)' -l complete --description 'Get a complete copy of the repository'
-complete -c darcs -n 'contains get (commandline -poc)' -l to-match -x --description 'Select changes up to a patch matching PATTERN'
-complete -c darcs -n 'contains get (commandline -poc)' -l to-patch -x --description 'Select changes up to a patch matching REGEXP'
-complete -c darcs -n 'contains get (commandline -poc)' -l tag -x --description 'Select tag matching REGEXP'
-complete -c darcs -n 'contains get (commandline -poc)' -l context -r --description 'Version specified by the context in FILENAME'
-complete -c darcs -n 'contains get (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains get (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains get (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
-complete -c darcs -n 'contains get (commandline -poc)' -l set-default --description 'Set default repository [DEFAULT]'
-complete -c darcs -n 'contains get (commandline -poc)' -l no-set-default --description 'Don\'t set default repository'
-complete -c darcs -n 'contains get (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
-complete -c darcs -n 'contains get (commandline -poc)' -l dont-set-scripts-executable --description 'Don\'t make scripts executable'
-complete -c darcs -n 'contains get (commandline -poc)' -l plain-pristine-tree --description 'Use a plain pristine tree [DEFAULT]'
-complete -c darcs -n 'contains get (commandline -poc)' -l no-pristine-tree --description 'Use no pristine tree'
-complete -c darcs -n 'contains get (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains get (commandline -poc)' -l disable-ssh-cm --description 'Disable use of SSH ControlMaster feature'
-complete -c darcs -n 'contains get (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains get (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains get (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains get (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains get (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains get (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l repo-name -x -a '(__fish_complete_directories (commandline -ct))' --description 'Path of output directory'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l partial --description 'Get partial repository using checkpoint'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l complete --description 'Get a complete copy of the repository'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l to-match -x --description 'Select changes up to a patch matching PATTERN'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l to-patch -x --description 'Select changes up to a patch matching REGEXP'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l tag -x --description 'Select tag matching REGEXP'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l context -r --description 'Version specified by the context in FILENAME'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l set-default --description 'Set default repository [DEFAULT]'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l no-set-default --description 'Don\'t set default repository'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l dont-set-scripts-executable --description 'Don\'t make scripts executable'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l plain-pristine-tree --description 'Use a plain pristine tree [DEFAULT]'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l no-pristine-tree --description 'Use no pristine tree'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l disable-ssh-cm --description 'Disable use of SSH ControlMaster feature'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'put' subcommand
 #
 
-complete -c darcs -n 'contains put (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains put (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains put (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
-complete -c darcs -n 'contains put (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains put (commandline -poc)' -l to-match -x --description 'Select changes up to a patch matching PATTERN'
-complete -c darcs -n 'contains put (commandline -poc)' -l to-patch -x --description 'Select changes up to a patch matching REGEXP'
-complete -c darcs -n 'contains put (commandline -poc)' -l tag -x --description 'Select tag matching REGEXP'
-complete -c darcs -n 'contains put (commandline -poc)' -l context -r --description 'Version specified by the context in FILENAME'
-complete -c darcs -n 'contains put (commandline -poc)' -l apply-as -x -a '(__fish_complete_users)' --description 'Apply patch as another user using sudo'
-complete -c darcs -n 'contains put (commandline -poc)' -l apply-as-myself --description 'Don\'t use sudo to apply as another user [DEFAULT]'
-complete -c darcs -n 'contains put (commandline -poc)' -l plain-pristine-tree --description 'Use a plain pristine tree [DEFAULT]'
-complete -c darcs -n 'contains put (commandline -poc)' -l no-pristine-tree --description 'Use no pristine tree'
-complete -c darcs -n 'contains put (commandline -poc)' -l disable-ssh-cm --description 'Disable use of SSH ControlMaster feature'
-complete -c darcs -n 'contains put (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains put (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains put (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains put (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains put (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains put (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l to-match -x --description 'Select changes up to a patch matching PATTERN'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l to-patch -x --description 'Select changes up to a patch matching REGEXP'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l tag -x --description 'Select tag matching REGEXP'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l context -r --description 'Version specified by the context in FILENAME'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l apply-as -x -a '(__fish_complete_users)' --description 'Apply patch as another user using sudo'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l apply-as-myself --description 'Don\'t use sudo to apply as another user [DEFAULT]'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l plain-pristine-tree --description 'Use a plain pristine tree [DEFAULT]'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l no-pristine-tree --description 'Use no pristine tree'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l disable-ssh-cm --description 'Disable use of SSH ControlMaster feature'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'initialize' subcommand
 #
 
-complete -c darcs -n 'contains initialize (commandline -poc)' -l plain-pristine-tree --description 'Use a plain pristine tree [DEFAULT]'
-complete -c darcs -n 'contains initialize (commandline -poc)' -l no-pristine-tree --description 'Use no pristine tree'
-complete -c darcs -n 'contains initialize (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains initialize (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains initialize (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains initialize (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains initialize (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains initialize (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains initialize (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l plain-pristine-tree --description 'Use a plain pristine tree [DEFAULT]'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l no-pristine-tree --description 'Use no pristine tree'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'optimize' subcommand
 #
 
-complete -c darcs -n 'contains optimize (commandline -poc)' -l checkpoint --description 'Create a checkpoint file'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l uncompress --description 'Uncompress patches'
-complete -c darcs -n 'contains optimize (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l modernize-patches --description 'Rewrite all patches in current darcs format'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l reorder-patches --description 'Reorder the patches in the repository'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l sibling -x --description 'Specify a sibling directory'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l relink --description 'Relink random internal data to a sibling'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l relink-pristine --description 'Relink pristine tree (not recommended)'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains optimize (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains optimize (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l checkpoint --description 'Create a checkpoint file'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l uncompress --description 'Uncompress patches'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -s t -l tag -x --description 'Name of version to checkpoint'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l modernize-patches --description 'Rewrite all patches in current darcs format'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l reorder-patches --description 'Reorder the patches in the repository'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l sibling -x --description 'Specify a sibling directory'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l relink --description 'Relink random internal data to a sibling'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l relink-pristine --description 'Relink pristine tree (not recommended)'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'check' subcommand
 #
 
-complete -c darcs -n 'contains check (commandline -poc)' -l complete --description 'Check the entire repository'
-complete -c darcs -n 'contains check (commandline -poc)' -l partial --description 'Check patches since latest checkpoint'
-complete -c darcs -n 'contains check (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains check (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains check (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
-complete -c darcs -n 'contains check (commandline -poc)' -l no-test --description 'Don\'t run the test script'
-complete -c darcs -n 'contains check (commandline -poc)' -l test --description 'Run the test script'
-complete -c darcs -n 'contains check (commandline -poc)' -l leave-test-directory --description 'Don\'t remove the test directory'
-complete -c darcs -n 'contains check (commandline -poc)' -l remove-test-directory --description 'Remove the test directory'
-complete -c darcs -n 'contains check (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains check (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains check (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains check (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains check (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains check (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains check (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l complete --description 'Check the entire repository'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l partial --description 'Check patches since latest checkpoint'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l no-test --description 'Don\'t run the test script'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l test --description 'Run the test script'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l leave-test-directory --description 'Don\'t remove the test directory'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l remove-test-directory --description 'Remove the test directory'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 #
 # Completions for the 'repair' subcommand
 #
 
-complete -c darcs -n 'contains repair (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains repair (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains repair (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
-complete -c darcs -n 'contains repair (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains repair (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains repair (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains repair (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
-complete -c darcs -n 'contains repair (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
-complete -c darcs -n 'contains repair (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains repair (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command.'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command.'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting.'
 
 
 
diff --git a/share/completions/hg.fish b/share/completions/hg.fish
index a6dc6512..db1ae156 100644
--- a/share/completions/hg.fish
+++ b/share/completions/hg.fish
@@ -62,150 +62,151 @@ complete -c hg -n '__fish_use_subcommand' -x -a version --description 'output ve
 # Completions for the 'add' subcommand
 #
 
-complete -c hg -n 'contains add (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains add (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
-complete -c hg -n 'contains add (commandline -poc)' -s n -l dry-run --description 'Do not perform actions, just print output'
+complete -c hg -n 'contains \'add\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'add\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'add\' (commandline -poc)' -s n -l dry-run --description 'Do not perform actions, just print output'
 
 
 #
 # Completions for the 'annotate' subcommand
 #
 
-complete -c hg -n 'contains annotate (commandline -poc)' -s r -l rev --description 'Annotate the specified revision'
-complete -c hg -n 'contains annotate (commandline -poc)' -s a -l text --description 'Treat all files as text'
-complete -c hg -n 'contains annotate (commandline -poc)' -s u -l user --description 'List the author'
-complete -c hg -n 'contains annotate (commandline -poc)' -s d -l date --description 'List the date'
-complete -c hg -n 'contains annotate (commandline -poc)' -s n -l number --description 'List the revision number (default)'
-complete -c hg -n 'contains annotate (commandline -poc)' -s c -l changeset --description 'List the changeset'
-complete -c hg -n 'contains annotate (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains annotate (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'annotate\' (commandline -poc)' -s r -l rev --description 'Annotate the specified revision'
+complete -c hg -n 'contains \'annotate\' (commandline -poc)' -s a -l text --description 'Treat all files as text'
+complete -c hg -n 'contains \'annotate\' (commandline -poc)' -s u -l user --description 'List the author'
+complete -c hg -n 'contains \'annotate\' (commandline -poc)' -s d -l date --description 'List the date'
+complete -c hg -n 'contains \'annotate\' (commandline -poc)' -s n -l number --description 'List the revision number (default)'
+complete -c hg -n 'contains \'annotate\' (commandline -poc)' -s c -l changeset --description 'List the changeset'
+complete -c hg -n 'contains \'annotate\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'annotate\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
 
 
 #
 # Completions for the 'archive' subcommand
 #
 
-complete -c hg -n 'contains archive (commandline -poc)' -l no-decode --description 'Do not pass files through decoders'
-complete -c hg -n 'contains archive (commandline -poc)' -s p -l prefix --description 'Directory prefix for files in archive'
-complete -c hg -n 'contains archive (commandline -poc)' -s r -l rev --description 'Revision to distribute'
-complete -c hg -n 'contains archive (commandline -poc)' -s t -l type --description 'Type of distribution to create'
-complete -c hg -n 'contains archive (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains archive (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'archive\' (commandline -poc)' -l no-decode --description 'Do not pass files through decoders'
+complete -c hg -n 'contains \'archive\' (commandline -poc)' -s p -l prefix --description 'Directory prefix for files in archive'
+complete -c hg -n 'contains \'archive\' (commandline -poc)' -s r -l rev --description 'Revision to distribute'
+complete -c hg -n 'contains \'archive\' (commandline -poc)' -s t -l type --description 'Type of distribution to create'
+complete -c hg -n 'contains \'archive\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'archive\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
 
 
 #
 # Completions for the 'backout' subcommand
 #
 
-complete -c hg -n 'contains backout (commandline -poc)' -l merge --description 'Merge with old dirstate parent after backout'
-complete -c hg -n 'contains backout (commandline -poc)' -s m -l message --description 'Use <text> as commit message'
-complete -c hg -n 'contains backout (commandline -poc)' -s l -l logfile --description 'Read commit message from <file>'
-complete -c hg -n 'contains backout (commandline -poc)' -s d -l date --description 'Record datecode as commit date'
-complete -c hg -n 'contains backout (commandline -poc)' -l parent --description 'Parent to choose when backing out merge'
-complete -c hg -n 'contains backout (commandline -poc)' -s u -l user --description 'Record user as committer'
-complete -c hg -n 'contains backout (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains backout (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'backout\' (commandline -poc)' -l merge -x --description 'Remembers the parent of the working directory'
+complete -c hg -n 'contains \'backout\' (commandline -poc)' -l merge --description 'Merge with old dirstate parent after backout'
+complete -c hg -n 'contains \'backout\' (commandline -poc)' -s m -l message --description 'Use <text> as commit message'
+complete -c hg -n 'contains \'backout\' (commandline -poc)' -s l -l logfile --description 'Read commit message from <file>'
+complete -c hg -n 'contains \'backout\' (commandline -poc)' -s d -l date --description 'Record datecode as commit date'
+complete -c hg -n 'contains \'backout\' (commandline -poc)' -l parent --description 'Parent to choose when backing out merge'
+complete -c hg -n 'contains \'backout\' (commandline -poc)' -s u -l user --description 'Record user as committer'
+complete -c hg -n 'contains \'backout\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'backout\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
 
 
 #
 # Completions for the 'bundle' subcommand
 #
 
-complete -c hg -n 'contains bundle (commandline -poc)' -s f -l force --description 'Run even when remote repository is unrelated'
+complete -c hg -n 'contains \'bundle\' (commandline -poc)' -s f -l force --description 'Run even when remote repository is unrelated'
 
 
 #
 # Completions for the 'cat' subcommand
 #
 
-complete -c hg -n 'contains cat (commandline -poc)' -s o -l output --description 'Print output to file with formatted name'
-complete -c hg -n 'contains cat (commandline -poc)' -s r -l rev --description 'Print the given revision'
-complete -c hg -n 'contains cat (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains cat (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'cat\' (commandline -poc)' -s o -l output --description 'Print output to file with formatted name'
+complete -c hg -n 'contains \'cat\' (commandline -poc)' -s r -l rev --description 'Print the given revision'
+complete -c hg -n 'contains \'cat\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'cat\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
 
 
 #
 # Completions for the 'clone' subcommand
 #
 
-complete -c hg -n 'contains clone (commandline -poc)' -s U -l noupdate --description 'Do not update the new working directory'
-complete -c hg -n 'contains clone (commandline -poc)' -s r -l rev --description 'A changeset you would like to have after cloning'
-complete -c hg -n 'contains clone (commandline -poc)' -l pull --description 'Use pull protocol to copy metadata'
-complete -c hg -n 'contains clone (commandline -poc)' -l uncompressed --description 'Use uncompressed transfer (fast over LAN)'
-complete -c hg -n 'contains clone (commandline -poc)' -s e -l ssh --description 'Specify ssh command to use'
-complete -c hg -n 'contains clone (commandline -poc)' -l remotecmd --description 'Specify hg command to run on the remote side'
+complete -c hg -n 'contains \'clone\' (commandline -poc)' -s U -l noupdate --description 'Do not update the new working directory'
+complete -c hg -n 'contains \'clone\' (commandline -poc)' -s r -l rev --description 'A changeset you would like to have after cloning'
+complete -c hg -n 'contains \'clone\' (commandline -poc)' -l pull --description 'Use pull protocol to copy metadata'
+complete -c hg -n 'contains \'clone\' (commandline -poc)' -l uncompressed --description 'Use uncompressed transfer (fast over LAN)'
+complete -c hg -n 'contains \'clone\' (commandline -poc)' -s e -l ssh --description 'Specify ssh command to use'
+complete -c hg -n 'contains \'clone\' (commandline -poc)' -l remotecmd --description 'Specify hg command to run on the remote side'
 
 
 #
 # Completions for the 'commit' subcommand
 #
 
-complete -c hg -n 'contains commit (commandline -poc)' -s A -l addremove --description 'Mark new/missing files as added/removed before committing'
-complete -c hg -n 'contains commit (commandline -poc)' -s m -l message --description 'Use <text> as commit message'
-complete -c hg -n 'contains commit (commandline -poc)' -s l -l logfile --description 'Read the commit message from <file>'
-complete -c hg -n 'contains commit (commandline -poc)' -s d -l date --description 'Record datecode as commit date'
-complete -c hg -n 'contains commit (commandline -poc)' -s u -l user --description 'Record user as commiter'
-complete -c hg -n 'contains commit (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains commit (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'commit\' (commandline -poc)' -s A -l addremove --description 'Mark new/missing files as added/removed before committing'
+complete -c hg -n 'contains \'commit\' (commandline -poc)' -s m -l message --description 'Use <text> as commit message'
+complete -c hg -n 'contains \'commit\' (commandline -poc)' -s l -l logfile --description 'Read the commit message from <file>'
+complete -c hg -n 'contains \'commit\' (commandline -poc)' -s d -l date --description 'Record datecode as commit date'
+complete -c hg -n 'contains \'commit\' (commandline -poc)' -s u -l user --description 'Record user as commiter'
+complete -c hg -n 'contains \'commit\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'commit\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
 
 
 #
 # Completions for the 'copy' subcommand
 #
 
-complete -c hg -n 'contains copy (commandline -poc)' -s A -l after --description 'Record a copy that has already occurred'
-complete -c hg -n 'contains copy (commandline -poc)' -s f -l force --description 'Forcibly copy over an existing managed file'
-complete -c hg -n 'contains copy (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains copy (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
-complete -c hg -n 'contains copy (commandline -poc)' -s n -l dry-run --description 'Do not perform actions, just print output'
+complete -c hg -n 'contains \'copy\' (commandline -poc)' -s A -l after --description 'Record a copy that has already occurred'
+complete -c hg -n 'contains \'copy\' (commandline -poc)' -s f -l force --description 'Forcibly copy over an existing managed file'
+complete -c hg -n 'contains \'copy\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'copy\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'copy\' (commandline -poc)' -s n -l dry-run --description 'Do not perform actions, just print output'
 
 
 #
 # Completions for the 'diff' subcommand
 #
 
-complete -c hg -n 'contains diff (commandline -poc)' -s r -l rev --description 'Revision'
-complete -c hg -n 'contains diff (commandline -poc)' -s a -l text --description 'Treat all files as text'
-complete -c hg -n 'contains diff (commandline -poc)' -s p -l show-function --description 'Show which function each change is in'
-complete -c hg -n 'contains diff (commandline -poc)' -s w -l ignore-all-space --description 'Ignore white space when comparing lines'
-complete -c hg -n 'contains diff (commandline -poc)' -s b -l ignore-space-change --description 'Ignore changes in the amount of white space'
-complete -c hg -n 'contains diff (commandline -poc)' -s B -l ignore-blank-lines --description 'Ignore changes whose lines are all blank'
-complete -c hg -n 'contains diff (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains diff (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'diff\' (commandline -poc)' -s r -l rev --description 'Revision'
+complete -c hg -n 'contains \'diff\' (commandline -poc)' -s a -l text --description 'Treat all files as text'
+complete -c hg -n 'contains \'diff\' (commandline -poc)' -s p -l show-function --description 'Show which function each change is in'
+complete -c hg -n 'contains \'diff\' (commandline -poc)' -s w -l ignore-all-space --description 'Ignore white space when comparing lines'
+complete -c hg -n 'contains \'diff\' (commandline -poc)' -s b -l ignore-space-change --description 'Ignore changes in the amount of white space'
+complete -c hg -n 'contains \'diff\' (commandline -poc)' -s B -l ignore-blank-lines --description 'Ignore changes whose lines are all blank'
+complete -c hg -n 'contains \'diff\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'diff\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
 
 
 #
 # Completions for the 'export' subcommand
 #
 
-complete -c hg -n 'contains export (commandline -poc)' -s o -l output --description 'Print output to file with formatted name'
-complete -c hg -n 'contains export (commandline -poc)' -s a -l text --description 'Treat all files as text'
-complete -c hg -n 'contains export (commandline -poc)' -l switch-parent --description 'Diff against the second parent'
+complete -c hg -n 'contains \'export\' (commandline -poc)' -s o -l output --description 'Print output to file with formatted name'
+complete -c hg -n 'contains \'export\' (commandline -poc)' -s a -l text --description 'Treat all files as text'
+complete -c hg -n 'contains \'export\' (commandline -poc)' -l switch-parent --description 'Diff against the second parent'
 
 
 #
 # Completions for the 'grep' subcommand
 #
 
-complete -c hg -n 'contains grep (commandline -poc)' -s 0 -l print0 --description 'End fields with NUL'
-complete -c hg -n 'contains grep (commandline -poc)' -l all --description 'Print all revisions that match'
-complete -c hg -n 'contains grep (commandline -poc)' -s i -l ignore-case --description 'Ignore case when matching'
-complete -c hg -n 'contains grep (commandline -poc)' -s l -l files-with-matches --description 'Print only filenames and revs that match'
-complete -c hg -n 'contains grep (commandline -poc)' -s n -l line-number --description 'Print matching line numbers'
-complete -c hg -n 'contains grep (commandline -poc)' -s r -l rev --description 'Search in given revision range'
-complete -c hg -n 'contains grep (commandline -poc)' -s u -l user --description 'Print user who committed change'
-complete -c hg -n 'contains grep (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains grep (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'grep\' (commandline -poc)' -s 0 -l print0 --description 'End fields with NUL'
+complete -c hg -n 'contains \'grep\' (commandline -poc)' -l all --description 'Print all revisions that match'
+complete -c hg -n 'contains \'grep\' (commandline -poc)' -s i -l ignore-case --description 'Ignore case when matching'
+complete -c hg -n 'contains \'grep\' (commandline -poc)' -s l -l files-with-matches --description 'Print only filenames and revs that match'
+complete -c hg -n 'contains \'grep\' (commandline -poc)' -s n -l line-number --description 'Print matching line numbers'
+complete -c hg -n 'contains \'grep\' (commandline -poc)' -s r -l rev --description 'Search in given revision range'
+complete -c hg -n 'contains \'grep\' (commandline -poc)' -s u -l user --description 'Print user who committed change'
+complete -c hg -n 'contains \'grep\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'grep\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
 
 
 #
 # Completions for the 'heads' subcommand
 #
 
-complete -c hg -n 'contains heads (commandline -poc)' -s b -l branches --description 'Show branches'
-complete -c hg -n 'contains heads (commandline -poc)' -l style --description 'Display using template map file'
-complete -c hg -n 'contains heads (commandline -poc)' -s r -l rev --description 'Show only heads which are descendants of rev'
-complete -c hg -n 'contains heads (commandline -poc)' -l template --description 'Display with template'
+complete -c hg -n 'contains \'heads\' (commandline -poc)' -s b -l branches --description 'Show branches'
+complete -c hg -n 'contains \'heads\' (commandline -poc)' -l style --description 'Display using template map file'
+complete -c hg -n 'contains \'heads\' (commandline -poc)' -s r -l rev --description 'Show only heads which are descendants of rev'
+complete -c hg -n 'contains \'heads\' (commandline -poc)' -l template --description 'Display with template'
 
 
 #
@@ -224,62 +225,62 @@ complete -c hg -n 'contains heads (commandline -poc)' -l template --description
 # Completions for the 'import' subcommand
 #
 
-complete -c hg -n 'contains import (commandline -poc)' -s p -l strip --description 'Directory strip option for patch. This has the same'
-complete -c hg -n 'contains import (commandline -poc)' -s m -l message --description 'Use <text> as commit message'
-complete -c hg -n 'contains import (commandline -poc)' -s b -l base --description 'Base path'
-complete -c hg -n 'contains import (commandline -poc)' -s f -l force --description 'Skip check for outstanding uncommitted changes'
+complete -c hg -n 'contains \'import\' (commandline -poc)' -s p -l strip --description 'Directory strip option for patch. This has the same'
+complete -c hg -n 'contains \'import\' (commandline -poc)' -s m -l message --description 'Use <text> as commit message'
+complete -c hg -n 'contains \'import\' (commandline -poc)' -s b -l base --description 'Base path'
+complete -c hg -n 'contains \'import\' (commandline -poc)' -s f -l force --description 'Skip check for outstanding uncommitted changes'
 
 
 #
 # Completions for the 'incoming' subcommand
 #
 
-complete -c hg -n 'contains incoming (commandline -poc)' -s M -l no-merges --description 'Do not show merges'
-complete -c hg -n 'contains incoming (commandline -poc)' -s f -l force --description 'Run even when remote repository is unrelated'
-complete -c hg -n 'contains incoming (commandline -poc)' -l style --description 'Display using template map file'
-complete -c hg -n 'contains incoming (commandline -poc)' -s n -l newest-first --description 'Show newest record first'
-complete -c hg -n 'contains incoming (commandline -poc)' -l bundle --description 'File to store the bundles into'
-complete -c hg -n 'contains incoming (commandline -poc)' -s p -l patch --description 'Show patch'
-complete -c hg -n 'contains incoming (commandline -poc)' -s r -l rev --description 'A specific revision you would like to pull'
-complete -c hg -n 'contains incoming (commandline -poc)' -l template --description 'Display with template'
-complete -c hg -n 'contains incoming (commandline -poc)' -s e -l ssh --description 'Specify ssh command to use'
-complete -c hg -n 'contains incoming (commandline -poc)' -l remotecmd --description 'Specify hg command to run on the remote side'
+complete -c hg -n 'contains \'incoming\' (commandline -poc)' -s M -l no-merges --description 'Do not show merges'
+complete -c hg -n 'contains \'incoming\' (commandline -poc)' -s f -l force --description 'Run even when remote repository is unrelated'
+complete -c hg -n 'contains \'incoming\' (commandline -poc)' -l style --description 'Display using template map file'
+complete -c hg -n 'contains \'incoming\' (commandline -poc)' -s n -l newest-first --description 'Show newest record first'
+complete -c hg -n 'contains \'incoming\' (commandline -poc)' -l bundle --description 'File to store the bundles into'
+complete -c hg -n 'contains \'incoming\' (commandline -poc)' -s p -l patch --description 'Show patch'
+complete -c hg -n 'contains \'incoming\' (commandline -poc)' -s r -l rev --description 'A specific revision you would like to pull'
+complete -c hg -n 'contains \'incoming\' (commandline -poc)' -l template --description 'Display with template'
+complete -c hg -n 'contains \'incoming\' (commandline -poc)' -s e -l ssh --description 'Specify ssh command to use'
+complete -c hg -n 'contains \'incoming\' (commandline -poc)' -l remotecmd --description 'Specify hg command to run on the remote side'
 
 
 #
 # Completions for the 'init' subcommand
 #
 
-complete -c hg -n 'contains init (commandline -poc)' -s e -l ssh --description 'Specify ssh command to use'
-complete -c hg -n 'contains init (commandline -poc)' -l remotecmd --description 'Specify hg command to run on the remote side'
+complete -c hg -n 'contains \'init\' (commandline -poc)' -s e -l ssh --description 'Specify ssh command to use'
+complete -c hg -n 'contains \'init\' (commandline -poc)' -l remotecmd --description 'Specify hg command to run on the remote side'
 
 
 #
 # Completions for the 'locate' subcommand
 #
 
-complete -c hg -n 'contains locate (commandline -poc)' -s r -l rev --description 'Search the repository as it stood at rev'
-complete -c hg -n 'contains locate (commandline -poc)' -s 0 -l print0 --description 'End filenames with NUL, for use with xargs'
-complete -c hg -n 'contains locate (commandline -poc)' -s f -l fullpath --description 'Print complete paths from the filesystem root'
-complete -c hg -n 'contains locate (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains locate (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'locate\' (commandline -poc)' -s r -l rev --description 'Search the repository as it stood at rev'
+complete -c hg -n 'contains \'locate\' (commandline -poc)' -s 0 -l print0 --description 'End filenames with NUL, for use with xargs'
+complete -c hg -n 'contains \'locate\' (commandline -poc)' -s f -l fullpath --description 'Print complete paths from the filesystem root'
+complete -c hg -n 'contains \'locate\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'locate\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
 
 
 #
 # Completions for the 'log' subcommand
 #
 
-complete -c hg -n 'contains log (commandline -poc)' -s b -l branches --description 'Show branches'
-complete -c hg -n 'contains log (commandline -poc)' -s k -l keyword --description 'Search for a keyword'
-complete -c hg -n 'contains log (commandline -poc)' -s l -l limit --description 'Limit number of changes displayed'
-complete -c hg -n 'contains log (commandline -poc)' -s r -l rev --description 'Show the specified revision or range'
-complete -c hg -n 'contains log (commandline -poc)' -s M -l no-merges --description 'Do not show merges'
-complete -c hg -n 'contains log (commandline -poc)' -l style --description 'Display using template map file'
-complete -c hg -n 'contains log (commandline -poc)' -s m -l only-merges --description 'Show only merges'
-complete -c hg -n 'contains log (commandline -poc)' -s p -l patch --description 'Show patch'
-complete -c hg -n 'contains log (commandline -poc)' -l template --description 'Display with template'
-complete -c hg -n 'contains log (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains log (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'log\' (commandline -poc)' -s b -l branches --description 'Show branches'
+complete -c hg -n 'contains \'log\' (commandline -poc)' -s k -l keyword --description 'Search for a keyword'
+complete -c hg -n 'contains \'log\' (commandline -poc)' -s l -l limit --description 'Limit number of changes displayed'
+complete -c hg -n 'contains \'log\' (commandline -poc)' -s r -l rev --description 'Show the specified revision or range'
+complete -c hg -n 'contains \'log\' (commandline -poc)' -s M -l no-merges --description 'Do not show merges'
+complete -c hg -n 'contains \'log\' (commandline -poc)' -l style --description 'Display using template map file'
+complete -c hg -n 'contains \'log\' (commandline -poc)' -s m -l only-merges --description 'Show only merges'
+complete -c hg -n 'contains \'log\' (commandline -poc)' -s p -l patch --description 'Show patch'
+complete -c hg -n 'contains \'log\' (commandline -poc)' -l template --description 'Display with template'
+complete -c hg -n 'contains \'log\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'log\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
 
 
 #
@@ -292,33 +293,33 @@ complete -c hg -n 'contains log (commandline -poc)' -s X -l exclude --descriptio
 # Completions for the 'merge' subcommand
 #
 
-complete -c hg -n 'contains merge (commandline -poc)' -s b -l branch --description 'Merge with head of a specific branch'
-complete -c hg -n 'contains merge (commandline -poc)' -s f -l force --description 'Force a merge with outstanding changes'
+complete -c hg -n 'contains \'merge\' (commandline -poc)' -s b -l branch --description 'Merge with head of a specific branch'
+complete -c hg -n 'contains \'merge\' (commandline -poc)' -s f -l force --description 'Force a merge with outstanding changes'
 
 
 #
 # Completions for the 'outgoing' subcommand
 #
 
-complete -c hg -n 'contains outgoing (commandline -poc)' -s M -l no-merges --description 'Do not show merges'
-complete -c hg -n 'contains outgoing (commandline -poc)' -s f -l force --description 'Run even when remote repository is unrelated'
-complete -c hg -n 'contains outgoing (commandline -poc)' -s p -l patch --description 'Show patch'
-complete -c hg -n 'contains outgoing (commandline -poc)' -l style --description 'Display using template map file'
-complete -c hg -n 'contains outgoing (commandline -poc)' -s r -l rev --description 'A specific revision you would like to push'
-complete -c hg -n 'contains outgoing (commandline -poc)' -s n -l newest-first --description 'Show newest record first'
-complete -c hg -n 'contains outgoing (commandline -poc)' -l template --description 'Display with template'
-complete -c hg -n 'contains outgoing (commandline -poc)' -s e -l ssh --description 'Specify ssh command to use'
-complete -c hg -n 'contains outgoing (commandline -poc)' -l remotecmd --description 'Specify hg command to run on the remote side'
+complete -c hg -n 'contains \'outgoing\' (commandline -poc)' -s M -l no-merges --description 'Do not show merges'
+complete -c hg -n 'contains \'outgoing\' (commandline -poc)' -s f -l force --description 'Run even when remote repository is unrelated'
+complete -c hg -n 'contains \'outgoing\' (commandline -poc)' -s p -l patch --description 'Show patch'
+complete -c hg -n 'contains \'outgoing\' (commandline -poc)' -l style --description 'Display using template map file'
+complete -c hg -n 'contains \'outgoing\' (commandline -poc)' -s r -l rev --description 'A specific revision you would like to push'
+complete -c hg -n 'contains \'outgoing\' (commandline -poc)' -s n -l newest-first --description 'Show newest record first'
+complete -c hg -n 'contains \'outgoing\' (commandline -poc)' -l template --description 'Display with template'
+complete -c hg -n 'contains \'outgoing\' (commandline -poc)' -s e -l ssh --description 'Specify ssh command to use'
+complete -c hg -n 'contains \'outgoing\' (commandline -poc)' -l remotecmd --description 'Specify hg command to run on the remote side'
 
 
 #
 # Completions for the 'parents' subcommand
 #
 
-complete -c hg -n 'contains parents (commandline -poc)' -s b -l branches --description 'Show branches'
-complete -c hg -n 'contains parents (commandline -poc)' -s r -l rev --description 'Show parents from the specified rev'
-complete -c hg -n 'contains parents (commandline -poc)' -l style --description 'Display using template map file'
-complete -c hg -n 'contains parents (commandline -poc)' -l template --description 'Display with template'
+complete -c hg -n 'contains \'parents\' (commandline -poc)' -s b -l branches --description 'Show branches'
+complete -c hg -n 'contains \'parents\' (commandline -poc)' -s r -l rev --description 'Show parents from the specified rev'
+complete -c hg -n 'contains \'parents\' (commandline -poc)' -l style --description 'Display using template map file'
+complete -c hg -n 'contains \'parents\' (commandline -poc)' -l template --description 'Display with template'
 
 
 #
@@ -331,21 +332,21 @@ complete -c hg -n 'contains parents (commandline -poc)' -l template --descriptio
 # Completions for the 'pull' subcommand
 #
 
-complete -c hg -n 'contains pull (commandline -poc)' -s u -l update --description 'Update the working directory to tip after pull'
-complete -c hg -n 'contains pull (commandline -poc)' -s e -l ssh --description 'Specify ssh command to use'
-complete -c hg -n 'contains pull (commandline -poc)' -s f -l force --description 'Run even when remote repository is unrelated'
-complete -c hg -n 'contains pull (commandline -poc)' -s r -l rev --description 'A specific revision you would like to pull'
-complete -c hg -n 'contains pull (commandline -poc)' -l remotecmd --description 'Specify hg command to run on the remote side'
+complete -c hg -n 'contains \'pull\' (commandline -poc)' -s u -l update --description 'Update the working directory to tip after pull'
+complete -c hg -n 'contains \'pull\' (commandline -poc)' -s e -l ssh --description 'Specify ssh command to use'
+complete -c hg -n 'contains \'pull\' (commandline -poc)' -s f -l force --description 'Run even when remote repository is unrelated'
+complete -c hg -n 'contains \'pull\' (commandline -poc)' -s r -l rev --description 'A specific revision you would like to pull'
+complete -c hg -n 'contains \'pull\' (commandline -poc)' -l remotecmd --description 'Specify hg command to run on the remote side'
 
 
 #
 # Completions for the 'push' subcommand
 #
 
-complete -c hg -n 'contains push (commandline -poc)' -s f -l force --description 'Force push'
-complete -c hg -n 'contains push (commandline -poc)' -s e -l ssh --description 'Specify ssh command to use'
-complete -c hg -n 'contains push (commandline -poc)' -s r -l rev --description 'A specific revision you would like to push'
-complete -c hg -n 'contains push (commandline -poc)' -l remotecmd --description 'Specify hg command to run on the remote side'
+complete -c hg -n 'contains \'push\' (commandline -poc)' -s f -l force --description 'Force push'
+complete -c hg -n 'contains \'push\' (commandline -poc)' -s e -l ssh --description 'Specify ssh command to use'
+complete -c hg -n 'contains \'push\' (commandline -poc)' -s r -l rev --description 'A specific revision you would like to push'
+complete -c hg -n 'contains \'push\' (commandline -poc)' -l remotecmd --description 'Specify hg command to run on the remote side'
 
 
 #
@@ -358,32 +359,32 @@ complete -c hg -n 'contains push (commandline -poc)' -l remotecmd --description
 # Completions for the 'remove' subcommand
 #
 
-complete -c hg -n 'contains remove (commandline -poc)' -s A -l after --description 'Record remove that has already occurred'
-complete -c hg -n 'contains remove (commandline -poc)' -s f -l force --description 'Remove file even if modified'
-complete -c hg -n 'contains remove (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains remove (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'remove\' (commandline -poc)' -s A -l after --description 'Record remove that has already occurred'
+complete -c hg -n 'contains \'remove\' (commandline -poc)' -s f -l force --description 'Remove file even if modified'
+complete -c hg -n 'contains \'remove\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'remove\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
 
 
 #
 # Completions for the 'rename' subcommand
 #
 
-complete -c hg -n 'contains rename (commandline -poc)' -s A -l after --description 'Record a rename that has already occurred'
-complete -c hg -n 'contains rename (commandline -poc)' -s f -l force --description 'Forcibly copy over an existing managed file'
-complete -c hg -n 'contains rename (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains rename (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
-complete -c hg -n 'contains rename (commandline -poc)' -s n -l dry-run --description 'Do not perform actions, just print output'
+complete -c hg -n 'contains \'rename\' (commandline -poc)' -s A -l after --description 'Record a rename that has already occurred'
+complete -c hg -n 'contains \'rename\' (commandline -poc)' -s f -l force --description 'Forcibly copy over an existing managed file'
+complete -c hg -n 'contains \'rename\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'rename\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'rename\' (commandline -poc)' -s n -l dry-run --description 'Do not perform actions, just print output'
 
 
 #
 # Completions for the 'revert' subcommand
 #
 
-complete -c hg -n 'contains revert (commandline -poc)' -s r -l rev --description 'Revision to revert to'
-complete -c hg -n 'contains revert (commandline -poc)' -l no-backup --description 'Do not save backup copies of files'
-complete -c hg -n 'contains revert (commandline -poc)' -s I -l include --description 'Include names matching given patterns'
-complete -c hg -n 'contains revert (commandline -poc)' -s X -l exclude --description 'Exclude names matching given patterns'
-complete -c hg -n 'contains revert (commandline -poc)' -s n -l dry-run --description 'Do not perform actions, just print output'
+complete -c hg -n 'contains \'revert\' (commandline -poc)' -s r -l rev --description 'Revision to revert to'
+complete -c hg -n 'contains \'revert\' (commandline -poc)' -l no-backup --description 'Do not save backup copies of files'
+complete -c hg -n 'contains \'revert\' (commandline -poc)' -s I -l include --description 'Include names matching given patterns'
+complete -c hg -n 'contains \'revert\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching given patterns'
+complete -c hg -n 'contains \'revert\' (commandline -poc)' -s n -l dry-run --description 'Do not perform actions, just print output'
 
 
 #
@@ -402,47 +403,47 @@ complete -c hg -n 'contains revert (commandline -poc)' -s n -l dry-run --descrip
 # Completions for the 'serve' subcommand
 #
 
-complete -c hg -n 'contains serve (commandline -poc)' -s A -l accesslog --description 'Name of access log file to write to'
-complete -c hg -n 'contains serve (commandline -poc)' -s d -l daemon --description 'Run server in background'
-complete -c hg -n 'contains serve (commandline -poc)' -l daemon-pipefds --description 'Used internally by daemon mode'
-complete -c hg -n 'contains serve (commandline -poc)' -s E -l errorlog --description 'Name of error log file to write to'
-complete -c hg -n 'contains serve (commandline -poc)' -s p -l port --description 'Port to use (default: 8000)'
-complete -c hg -n 'contains serve (commandline -poc)' -s a -l address --description 'Address to use'
-complete -c hg -n 'contains serve (commandline -poc)' -s n -l name --description 'Name to show in web pages (default: working dir)'
-complete -c hg -n 'contains serve (commandline -poc)' -l webdir-conf --description 'Name of the webdir config file (serve more than one repo)'
-complete -c hg -n 'contains serve (commandline -poc)' -l pid-file --description 'Name of file to write process ID to'
-complete -c hg -n 'contains serve (commandline -poc)' -l stdio --description 'For remote clients'
-complete -c hg -n 'contains serve (commandline -poc)' -s t -l templates --description 'Web templates to use'
-complete -c hg -n 'contains serve (commandline -poc)' -l style --description 'Template style to use'
-complete -c hg -n 'contains serve (commandline -poc)' -s 6 -l ipv6 --description 'Use IPv6 in addition to IPv4'
+complete -c hg -n 'contains \'serve\' (commandline -poc)' -s A -l accesslog --description 'Name of access log file to write to'
+complete -c hg -n 'contains \'serve\' (commandline -poc)' -s d -l daemon --description 'Run server in background'
+complete -c hg -n 'contains \'serve\' (commandline -poc)' -l daemon-pipefds --description 'Used internally by daemon mode'
+complete -c hg -n 'contains \'serve\' (commandline -poc)' -s E -l errorlog --description 'Name of error log file to write to'
+complete -c hg -n 'contains \'serve\' (commandline -poc)' -s p -l port --description 'Port to use (default: 8000)'
+complete -c hg -n 'contains \'serve\' (commandline -poc)' -s a -l address --description 'Address to use'
+complete -c hg -n 'contains \'serve\' (commandline -poc)' -s n -l name --description 'Name to show in web pages (default: working dir)'
+complete -c hg -n 'contains \'serve\' (commandline -poc)' -l webdir-conf --description 'Name of the webdir config file (serve more than one repo)'
+complete -c hg -n 'contains \'serve\' (commandline -poc)' -l pid-file --description 'Name of file to write process ID to'
+complete -c hg -n 'contains \'serve\' (commandline -poc)' -l stdio --description 'For remote clients'
+complete -c hg -n 'contains \'serve\' (commandline -poc)' -s t -l templates --description 'Web templates to use'
+complete -c hg -n 'contains \'serve\' (commandline -poc)' -l style --description 'Template style to use'
+complete -c hg -n 'contains \'serve\' (commandline -poc)' -s 6 -l ipv6 --description 'Use IPv6 in addition to IPv4'
 
 
 #
 # Completions for the 'status' subcommand
 #
 
-complete -c hg -n 'contains status (commandline -poc)' -s m -l modified --description 'Show only modified files'
-complete -c hg -n 'contains status (commandline -poc)' -s a -l added --description 'Show only added files'
-complete -c hg -n 'contains status (commandline -poc)' -s r -l removed --description 'Show only removed files'
-complete -c hg -n 'contains status (commandline -poc)' -s d -l deleted --description 'Show only deleted (but tracked) files'
-complete -c hg -n 'contains status (commandline -poc)' -s u -l unknown --description 'Show only unknown (not tracked) files'
-complete -c hg -n 'contains status (commandline -poc)' -s i -l ignored --description 'Show ignored files'
-complete -c hg -n 'contains status (commandline -poc)' -s n -l no-status --description 'Hide status prefix'
-complete -c hg -n 'contains status (commandline -poc)' -s C -l copies --description 'Show source of copied files'
-complete -c hg -n 'contains status (commandline -poc)' -s 0 -l print0 --description 'End filenames with NUL, for use with xargs'
-complete -c hg -n 'contains status (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
-complete -c hg -n 'contains status (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
+complete -c hg -n 'contains \'status\' (commandline -poc)' -s m -l modified --description 'Show only modified files'
+complete -c hg -n 'contains \'status\' (commandline -poc)' -s a -l added --description 'Show only added files'
+complete -c hg -n 'contains \'status\' (commandline -poc)' -s r -l removed --description 'Show only removed files'
+complete -c hg -n 'contains \'status\' (commandline -poc)' -s d -l deleted --description 'Show only deleted (but tracked) files'
+complete -c hg -n 'contains \'status\' (commandline -poc)' -s u -l unknown --description 'Show only unknown (not tracked) files'
+complete -c hg -n 'contains \'status\' (commandline -poc)' -s i -l ignored --description 'Show ignored files'
+complete -c hg -n 'contains \'status\' (commandline -poc)' -s n -l no-status --description 'Hide status prefix'
+complete -c hg -n 'contains \'status\' (commandline -poc)' -s C -l copies --description 'Show source of copied files'
+complete -c hg -n 'contains \'status\' (commandline -poc)' -s 0 -l print0 --description 'End filenames with NUL, for use with xargs'
+complete -c hg -n 'contains \'status\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
+complete -c hg -n 'contains \'status\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
 
 
 #
 # Completions for the 'tag' subcommand
 #
 
-complete -c hg -n 'contains tag (commandline -poc)' -s l -l local --description 'Make the tag local'
-complete -c hg -n 'contains tag (commandline -poc)' -s m -l message --description 'Message for tag commit log entry'
-complete -c hg -n 'contains tag (commandline -poc)' -s d -l date --description 'Record datecode as commit date'
-complete -c hg -n 'contains tag (commandline -poc)' -s u -l user --description 'Record user as commiter'
-complete -c hg -n 'contains tag (commandline -poc)' -s r -l rev --description 'Revision to tag'
+complete -c hg -n 'contains \'tag\' (commandline -poc)' -s l -l local --description 'Make the tag local'
+complete -c hg -n 'contains \'tag\' (commandline -poc)' -s m -l message --description 'Message for tag commit log entry'
+complete -c hg -n 'contains \'tag\' (commandline -poc)' -s d -l date --description 'Record datecode as commit date'
+complete -c hg -n 'contains \'tag\' (commandline -poc)' -s u -l user --description 'Record user as commiter'
+complete -c hg -n 'contains \'tag\' (commandline -poc)' -s r -l rev --description 'Revision to tag'
 
 
 #
@@ -455,27 +456,27 @@ complete -c hg -n 'contains tag (commandline -poc)' -s r -l rev --description 'R
 # Completions for the 'tip' subcommand
 #
 
-complete -c hg -n 'contains tip (commandline -poc)' -s b -l branches --description 'Show branches'
-complete -c hg -n 'contains tip (commandline -poc)' -l style --description 'Display using template map file'
-complete -c hg -n 'contains tip (commandline -poc)' -s p -l patch --description 'Show patch'
-complete -c hg -n 'contains tip (commandline -poc)' -l template --description 'Display with template'
+complete -c hg -n 'contains \'tip\' (commandline -poc)' -s b -l branches --description 'Show branches'
+complete -c hg -n 'contains \'tip\' (commandline -poc)' -l style --description 'Display using template map file'
+complete -c hg -n 'contains \'tip\' (commandline -poc)' -s p -l patch --description 'Show patch'
+complete -c hg -n 'contains \'tip\' (commandline -poc)' -l template --description 'Display with template'
 
 
 #
 # Completions for the 'unbundle' subcommand
 #
 
-complete -c hg -n 'contains unbundle (commandline -poc)' -s u -l update --description 'Update the working directory to tip after unbundle'
+complete -c hg -n 'contains \'unbundle\' (commandline -poc)' -s u -l update --description 'Update the working directory to tip after unbundle'
 
 
 #
 # Completions for the 'update' subcommand
 #
 
-complete -c hg -n 'contains update (commandline -poc)' -s b -l branch --description 'Checkout the head of a specific branch'
-complete -c hg -n 'contains update (commandline -poc)' -s m -l merge --description 'Allow merging of branches (DEPRECATED)'
-complete -c hg -n 'contains update (commandline -poc)' -s C -l clean --description 'Overwrite locally modified files'
-complete -c hg -n 'contains update (commandline -poc)' -s f -l force --description 'Force a merge with outstanding changes'
+complete -c hg -n 'contains \'update\' (commandline -poc)' -s b -l branch --description 'Checkout the head of a specific branch'
+complete -c hg -n 'contains \'update\' (commandline -poc)' -s m -l merge --description 'Allow merging of branches (DEPRECATED)'
+complete -c hg -n 'contains \'update\' (commandline -poc)' -s C -l clean --description 'Overwrite locally modified files'
+complete -c hg -n 'contains \'update\' (commandline -poc)' -s f -l force --description 'Force a merge with outstanding changes'
 
 
 #
diff --git a/share/completions/svn.fish b/share/completions/svn.fish
index 3922edce..db4c1b56 100644
--- a/share/completions/svn.fish
+++ b/share/completions/svn.fish
@@ -80,807 +80,807 @@ complete -c svn -n '__fish_use_subcommand' -x -a up --description 'Bring changes
 # Completions for the 'add' subcommand
 #
 
-complete -c svn -n 'contains add (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains add (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
-complete -c svn -n 'contains add (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains add (commandline -poc)' -l no-ignore --description 'Disregard default and svn:ignore property ignores'
-complete -c svn -n 'contains add (commandline -poc)' -l auto-props --description 'Enable automatic properties'
-complete -c svn -n 'contains add (commandline -poc)' -l no-auto-props --description 'Disable automatic properties'
+complete -c svn -n 'contains \'add\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'add\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'add\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'add\' (commandline -poc)' -l no-ignore --description 'Disregard default and svn:ignore property ignores'
+complete -c svn -n 'contains \'add\' (commandline -poc)' -l auto-props --description 'Enable automatic properties'
+complete -c svn -n 'contains \'add\' (commandline -poc)' -l no-auto-props --description 'Disable automatic properties'
 
 
 #
 # Completions for the 'blame' subcommand
 #
 
-complete -c svn -n 'contains blame (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
-complete -c svn -n 'contains blame (commandline -poc)' -l xml --description 'Output in XML'
-complete -c svn -n 'contains blame (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains blame (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains blame (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains blame (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains blame (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'blame\' (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
+complete -c svn -n 'contains \'blame\' (commandline -poc)' -l xml --description 'Output in XML'
+complete -c svn -n 'contains \'blame\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'blame\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'blame\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'blame\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'blame\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'praise' subcommand
 #
 
-complete -c svn -n 'contains praise (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
-complete -c svn -n 'contains praise (commandline -poc)' -l xml --description 'Output in XML'
-complete -c svn -n 'contains praise (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains praise (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains praise (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains praise (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains praise (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'praise\' (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
+complete -c svn -n 'contains \'praise\' (commandline -poc)' -l xml --description 'Output in XML'
+complete -c svn -n 'contains \'praise\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'praise\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'praise\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'praise\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'praise\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'annotate' subcommand
 #
 
-complete -c svn -n 'contains annotate (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
-complete -c svn -n 'contains annotate (commandline -poc)' -l xml --description 'Output in XML'
-complete -c svn -n 'contains annotate (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains annotate (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains annotate (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains annotate (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains annotate (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'annotate\' (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
+complete -c svn -n 'contains \'annotate\' (commandline -poc)' -l xml --description 'Output in XML'
+complete -c svn -n 'contains \'annotate\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'annotate\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'annotate\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'annotate\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'annotate\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'ann' subcommand
 #
 
-complete -c svn -n 'contains ann (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
-complete -c svn -n 'contains ann (commandline -poc)' -l xml --description 'Output in XML'
-complete -c svn -n 'contains ann (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains ann (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains ann (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains ann (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains ann (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'ann\' (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
+complete -c svn -n 'contains \'ann\' (commandline -poc)' -l xml --description 'Output in XML'
+complete -c svn -n 'contains \'ann\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'ann\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'ann\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'ann\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'ann\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'cat' subcommand
 #
 
-complete -c svn -n 'contains cat (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains cat (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains cat (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains cat (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains cat (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'cat\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'cat\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'cat\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'cat\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'cat\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'checkout' subcommand
 #
 
-complete -c svn -n 'contains checkout (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains checkout (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains checkout (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains checkout (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains checkout (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
-complete -c svn -n 'contains checkout (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
+complete -c svn -n 'contains \'checkout\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'checkout\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'checkout\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'checkout\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'checkout\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'checkout\' (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
 
 
 #
 # Completions for the 'co' subcommand
 #
 
-complete -c svn -n 'contains co (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains co (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains co (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains co (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains co (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
-complete -c svn -n 'contains co (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
+complete -c svn -n 'contains \'co\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'co\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'co\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'co\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'co\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'co\' (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
 
 
 #
 # Completions for the 'cleanup' subcommand
 #
 
-complete -c svn -n 'contains cleanup (commandline -poc)' -l diff3-cmd -x --description 'Use ARG as merge command'
-complete -c svn -n 'contains cleanup (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'cleanup\' (commandline -poc)' -l diff3-cmd -x --description 'Use ARG as merge command'
+complete -c svn -n 'contains \'cleanup\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'commit' subcommand
 #
 
-complete -c svn -n 'contains commit (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains commit (commandline -poc)' -l no-unlock --description 'Don\'t unlock the targets'
-complete -c svn -n 'contains commit (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains commit (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains commit (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains commit (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains commit (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains commit (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains commit (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains commit (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'commit\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'commit\' (commandline -poc)' -l no-unlock --description 'Don\'t unlock the targets'
+complete -c svn -n 'contains \'commit\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'commit\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'commit\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'commit\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'commit\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'commit\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'commit\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'commit\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'ci' subcommand
 #
 
-complete -c svn -n 'contains ci (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains ci (commandline -poc)' -l no-unlock --description 'Don\'t unlock the targets'
-complete -c svn -n 'contains ci (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains ci (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains ci (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains ci (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains ci (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains ci (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains ci (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains ci (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'ci\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'ci\' (commandline -poc)' -l no-unlock --description 'Don\'t unlock the targets'
+complete -c svn -n 'contains \'ci\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'ci\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'ci\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'ci\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'ci\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'ci\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'ci\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'ci\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'copy' subcommand
 #
 
-complete -c svn -n 'contains copy (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains copy (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains copy (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains copy (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains copy (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains copy (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains copy (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains copy (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'copy\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'copy\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'copy\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'copy\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'copy\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'copy\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'copy\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'copy\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'cp' subcommand
 #
 
-complete -c svn -n 'contains cp (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains cp (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains cp (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains cp (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains cp (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains cp (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains cp (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains cp (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'cp\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'cp\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'cp\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'cp\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'cp\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'cp\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'cp\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'cp\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'delete' subcommand
 #
 
-complete -c svn -n 'contains delete (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains delete (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains delete (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains delete (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains delete (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains delete (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains delete (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains delete (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains delete (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains delete (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'delete\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'delete\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'delete\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'delete\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'delete\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'delete\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'delete\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'delete\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'delete\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'delete\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'del' subcommand
 #
 
-complete -c svn -n 'contains del (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains del (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains del (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains del (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains del (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains del (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains del (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains del (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains del (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains del (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'del\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'del\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'del\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'del\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'del\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'del\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'del\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'del\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'del\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'del\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'remove' subcommand
 #
 
-complete -c svn -n 'contains remove (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains remove (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains remove (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains remove (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains remove (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains remove (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains remove (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains remove (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains remove (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains remove (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'remove\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'remove\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'remove\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'remove\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'remove\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'remove\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'remove\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'remove\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'remove\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'remove\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'rm' subcommand
 #
 
-complete -c svn -n 'contains rm (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains rm (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains rm (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains rm (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains rm (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains rm (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains rm (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains rm (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains rm (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains rm (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'rm\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'rm\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'rm\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'rm\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'rm\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'rm\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'rm\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'rm\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'rm\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'rm\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'diff' subcommand
 #
 
-complete -c svn -n 'contains diff (commandline -poc)' -l old -x --description 'Use ARG as the older target'
-complete -c svn -n 'contains diff (commandline -poc)' -l new -x --description 'Use ARG as the newer target'
-complete -c svn -n 'contains diff (commandline -poc)' -l diff-cmd -x --description 'Use ARG as diff command'
-complete -c svn -n 'contains diff (commandline -poc)' -l no-diff-deleted --description 'Do not print differences for deleted files'
-complete -c svn -n 'contains diff (commandline -poc)' -l notice-ancestry --description 'Notice ancestry when calculating differences'
-complete -c svn -n 'contains diff (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains diff (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains diff (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains diff (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains diff (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains diff (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'diff\' (commandline -poc)' -l old -x --description 'Use ARG as the older target'
+complete -c svn -n 'contains \'diff\' (commandline -poc)' -l new -x --description 'Use ARG as the newer target'
+complete -c svn -n 'contains \'diff\' (commandline -poc)' -l diff-cmd -x --description 'Use ARG as diff command'
+complete -c svn -n 'contains \'diff\' (commandline -poc)' -l no-diff-deleted --description 'Do not print differences for deleted files'
+complete -c svn -n 'contains \'diff\' (commandline -poc)' -l notice-ancestry --description 'Notice ancestry when calculating differences'
+complete -c svn -n 'contains \'diff\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'diff\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'diff\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'diff\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'diff\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'diff\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'di' subcommand
 #
 
-complete -c svn -n 'contains di (commandline -poc)' -l old -x --description 'Use ARG as the older target'
-complete -c svn -n 'contains di (commandline -poc)' -l new -x --description 'Use ARG as the newer target'
-complete -c svn -n 'contains di (commandline -poc)' -l diff-cmd -x --description 'Use ARG as diff command'
-complete -c svn -n 'contains di (commandline -poc)' -l no-diff-deleted --description 'Do not print differences for deleted files'
-complete -c svn -n 'contains di (commandline -poc)' -l notice-ancestry --description 'Notice ancestry when calculating differences'
-complete -c svn -n 'contains di (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains di (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains di (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains di (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains di (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains di (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'di\' (commandline -poc)' -l old -x --description 'Use ARG as the older target'
+complete -c svn -n 'contains \'di\' (commandline -poc)' -l new -x --description 'Use ARG as the newer target'
+complete -c svn -n 'contains \'di\' (commandline -poc)' -l diff-cmd -x --description 'Use ARG as diff command'
+complete -c svn -n 'contains \'di\' (commandline -poc)' -l no-diff-deleted --description 'Do not print differences for deleted files'
+complete -c svn -n 'contains \'di\' (commandline -poc)' -l notice-ancestry --description 'Notice ancestry when calculating differences'
+complete -c svn -n 'contains \'di\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'di\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'di\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'di\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'di\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'di\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'export' subcommand
 #
 
-complete -c svn -n 'contains export (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains export (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains export (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains export (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains export (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains export (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
-complete -c svn -n 'contains export (commandline -poc)' -l native-eol -x --description 'Use a different EOL marker than the standard'
-complete -c svn -n 'contains export (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
+complete -c svn -n 'contains \'export\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'export\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'export\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'export\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'export\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'export\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'export\' (commandline -poc)' -l native-eol -x --description 'Use a different EOL marker than the standard'
+complete -c svn -n 'contains \'export\' (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
 
 
 #
 # Completions for the 'help' subcommand
 #
 
-complete -c svn -n 'contains help (commandline -poc)' -l version --description 'Print client version info'
-complete -c svn -n 'contains help (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'help\' (commandline -poc)' -l version --description 'Print client version info'
+complete -c svn -n 'contains \'help\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the '?' subcommand
 #
 
-complete -c svn -n 'contains ? (commandline -poc)' -l version --description 'Print client version info'
-complete -c svn -n 'contains ? (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'?\' (commandline -poc)' -l version --description 'Print client version info'
+complete -c svn -n 'contains \'?\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'h' subcommand
 #
 
-complete -c svn -n 'contains h (commandline -poc)' -l version --description 'Print client version info'
-complete -c svn -n 'contains h (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'h\' (commandline -poc)' -l version --description 'Print client version info'
+complete -c svn -n 'contains \'h\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'import' subcommand
 #
 
-complete -c svn -n 'contains import (commandline -poc)' -l auto-props --description 'Enable automatic properties'
-complete -c svn -n 'contains import (commandline -poc)' -l no-auto-props --description 'Disable automatic properties'
-complete -c svn -n 'contains import (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains import (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains import (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains import (commandline -poc)' -l no-ignore --description 'Disregard default and svn:ignore property ignores'
-complete -c svn -n 'contains import (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains import (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains import (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains import (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains import (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'import\' (commandline -poc)' -l auto-props --description 'Enable automatic properties'
+complete -c svn -n 'contains \'import\' (commandline -poc)' -l no-auto-props --description 'Disable automatic properties'
+complete -c svn -n 'contains \'import\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'import\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'import\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'import\' (commandline -poc)' -l no-ignore --description 'Disregard default and svn:ignore property ignores'
+complete -c svn -n 'contains \'import\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'import\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'import\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'import\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'import\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'info' subcommand
 #
 
-complete -c svn -n 'contains info (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains info (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
-complete -c svn -n 'contains info (commandline -poc)' -l xml --description 'Output in XML'
-complete -c svn -n 'contains info (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains info (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains info (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains info (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains info (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'info\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'info\' (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
+complete -c svn -n 'contains \'info\' (commandline -poc)' -l xml --description 'Output in XML'
+complete -c svn -n 'contains \'info\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'info\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'info\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'info\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'info\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'list' subcommand
 #
 
-complete -c svn -n 'contains list (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
-complete -c svn -n 'contains list (commandline -poc)' -l xml --description 'Output in XML'
-complete -c svn -n 'contains list (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains list (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains list (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains list (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains list (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'list\' (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
+complete -c svn -n 'contains \'list\' (commandline -poc)' -l xml --description 'Output in XML'
+complete -c svn -n 'contains \'list\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'list\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'list\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'list\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'list\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'ls' subcommand
 #
 
-complete -c svn -n 'contains ls (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
-complete -c svn -n 'contains ls (commandline -poc)' -l xml --description 'Output in XML'
-complete -c svn -n 'contains ls (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains ls (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains ls (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains ls (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains ls (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'ls\' (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
+complete -c svn -n 'contains \'ls\' (commandline -poc)' -l xml --description 'Output in XML'
+complete -c svn -n 'contains \'ls\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'ls\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'ls\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'ls\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'ls\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'lock' subcommand
 #
 
-complete -c svn -n 'contains lock (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains lock (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains lock (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains lock (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains lock (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains lock (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains lock (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains lock (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
-complete -c svn -n 'contains lock (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'lock\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'lock\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'lock\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'lock\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'lock\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'lock\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'lock\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'lock\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'lock\' (commandline -poc)' -l force --description 'Force operation to run'
 
 
 #
 # Completions for the 'log' subcommand
 #
 
-complete -c svn -n 'contains log (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains log (commandline -poc)' -l stop-on-copy --description 'Do not cross copies while traversing history'
-complete -c svn -n 'contains log (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
-complete -c svn -n 'contains log (commandline -poc)' -l xml --description 'Output in XML'
-complete -c svn -n 'contains log (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains log (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains log (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains log (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains log (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
-complete -c svn -n 'contains log (commandline -poc)' -l limit -x --description 'Maximum number of log entries'
+complete -c svn -n 'contains \'log\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'log\' (commandline -poc)' -l stop-on-copy --description 'Do not cross copies while traversing history'
+complete -c svn -n 'contains \'log\' (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
+complete -c svn -n 'contains \'log\' (commandline -poc)' -l xml --description 'Output in XML'
+complete -c svn -n 'contains \'log\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'log\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'log\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'log\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'log\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'log\' (commandline -poc)' -l limit -x --description 'Maximum number of log entries'
 
 
 #
 # Completions for the 'merge' subcommand
 #
 
-complete -c svn -n 'contains merge (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains merge (commandline -poc)' -l dry-run --description 'Try operation but make no changes'
-complete -c svn -n 'contains merge (commandline -poc)' -l diff3-cmd -x --description 'Use ARG as merge command'
-complete -c svn -n 'contains merge (commandline -poc)' -l ignore-ancestry --description 'Ignore ancestry when calculating merges'
-complete -c svn -n 'contains merge (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains merge (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains merge (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains merge (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains merge (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'merge\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'merge\' (commandline -poc)' -l dry-run --description 'Try operation but make no changes'
+complete -c svn -n 'contains \'merge\' (commandline -poc)' -l diff3-cmd -x --description 'Use ARG as merge command'
+complete -c svn -n 'contains \'merge\' (commandline -poc)' -l ignore-ancestry --description 'Ignore ancestry when calculating merges'
+complete -c svn -n 'contains \'merge\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'merge\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'merge\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'merge\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'merge\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'mkdir' subcommand
 #
 
-complete -c svn -n 'contains mkdir (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains mkdir (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains mkdir (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains mkdir (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains mkdir (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains mkdir (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains mkdir (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains mkdir (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'mkdir\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'mkdir\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'mkdir\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'mkdir\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'mkdir\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'mkdir\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'mkdir\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'mkdir\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'move' subcommand
 #
 
-complete -c svn -n 'contains move (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains move (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains move (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains move (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains move (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains move (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains move (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains move (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains move (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'move\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'move\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'move\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'move\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'move\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'move\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'move\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'move\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'move\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'mv' subcommand
 #
 
-complete -c svn -n 'contains mv (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains mv (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains mv (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains mv (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains mv (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains mv (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains mv (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains mv (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains mv (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'mv\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'mv\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'mv\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'mv\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'mv\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'mv\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'mv\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'mv\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'mv\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'rename' subcommand
 #
 
-complete -c svn -n 'contains rename (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains rename (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains rename (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains rename (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains rename (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains rename (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains rename (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains rename (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains rename (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'rename\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'rename\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'rename\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'rename\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'rename\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'rename\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'rename\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'rename\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'rename\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'ren' subcommand
 #
 
-complete -c svn -n 'contains ren (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains ren (commandline -poc)' -l force-log --description 'Force validity of log message source'
-complete -c svn -n 'contains ren (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains ren (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains ren (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains ren (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains ren (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains ren (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains ren (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'ren\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'ren\' (commandline -poc)' -l force-log --description 'Force validity of log message source'
+complete -c svn -n 'contains \'ren\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'ren\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'ren\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'ren\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'ren\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'ren\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'ren\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'propdel' subcommand
 #
 
-complete -c svn -n 'contains propdel (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains propdel (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains propdel (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains propdel (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains propdel (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains propdel (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'propdel\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'propdel\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'propdel\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'propdel\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'propdel\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'propdel\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'pdel' subcommand
 #
 
-complete -c svn -n 'contains pdel (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains pdel (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains pdel (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains pdel (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains pdel (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains pdel (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'pdel\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'pdel\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'pdel\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'pdel\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'pdel\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'pdel\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'pd' subcommand
 #
 
-complete -c svn -n 'contains pd (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains pd (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains pd (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains pd (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains pd (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains pd (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'pd\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'pd\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'pd\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'pd\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'pd\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'pd\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'propedit' subcommand
 #
 
-complete -c svn -n 'contains propedit (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains propedit (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains propedit (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains propedit (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains propedit (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains propedit (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains propedit (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains propedit (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains propedit (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'propedit\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'propedit\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'propedit\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'propedit\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'propedit\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'propedit\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'propedit\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'propedit\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'propedit\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'pedit' subcommand
 #
 
-complete -c svn -n 'contains pedit (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains pedit (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains pedit (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains pedit (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains pedit (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains pedit (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains pedit (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains pedit (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains pedit (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'pedit\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'pedit\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'pedit\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'pedit\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'pedit\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'pedit\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'pedit\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'pedit\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'pedit\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'pe' subcommand
 #
 
-complete -c svn -n 'contains pe (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains pe (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains pe (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains pe (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains pe (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains pe (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains pe (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
-complete -c svn -n 'contains pe (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains pe (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'pe\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'pe\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'pe\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'pe\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'pe\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'pe\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'pe\' (commandline -poc)' -l editor-cmd -x --description 'Use ARG as external editor'
+complete -c svn -n 'contains \'pe\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'pe\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'propget' subcommand
 #
 
-complete -c svn -n 'contains propget (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains propget (commandline -poc)' -l strict --description 'Use strict semantics'
-complete -c svn -n 'contains propget (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains propget (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains propget (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains propget (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains propget (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'propget\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'propget\' (commandline -poc)' -l strict --description 'Use strict semantics'
+complete -c svn -n 'contains \'propget\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'propget\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'propget\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'propget\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'propget\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'pget' subcommand
 #
 
-complete -c svn -n 'contains pget (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains pget (commandline -poc)' -l strict --description 'Use strict semantics'
-complete -c svn -n 'contains pget (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains pget (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains pget (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains pget (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains pget (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'pget\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'pget\' (commandline -poc)' -l strict --description 'Use strict semantics'
+complete -c svn -n 'contains \'pget\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'pget\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'pget\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'pget\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'pget\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'pg' subcommand
 #
 
-complete -c svn -n 'contains pg (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains pg (commandline -poc)' -l strict --description 'Use strict semantics'
-complete -c svn -n 'contains pg (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains pg (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains pg (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains pg (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains pg (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'pg\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'pg\' (commandline -poc)' -l strict --description 'Use strict semantics'
+complete -c svn -n 'contains \'pg\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'pg\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'pg\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'pg\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'pg\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'proplist' subcommand
 #
 
-complete -c svn -n 'contains proplist (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains proplist (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains proplist (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains proplist (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains proplist (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains proplist (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'proplist\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'proplist\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'proplist\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'proplist\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'proplist\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'proplist\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'plist' subcommand
 #
 
-complete -c svn -n 'contains plist (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains plist (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains plist (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains plist (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains plist (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains plist (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'plist\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'plist\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'plist\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'plist\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'plist\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'plist\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'pl' subcommand
 #
 
-complete -c svn -n 'contains pl (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains pl (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains pl (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains pl (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains pl (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains pl (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'pl\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'pl\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'pl\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'pl\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'pl\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'pl\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'propset' subcommand
 #
 
-complete -c svn -n 'contains propset (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains propset (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains propset (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains propset (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains propset (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains propset (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains propset (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains propset (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains propset (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'propset\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'propset\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'propset\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'propset\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'propset\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'propset\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'propset\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'propset\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'propset\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'pset' subcommand
 #
 
-complete -c svn -n 'contains pset (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains pset (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains pset (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains pset (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains pset (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains pset (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains pset (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains pset (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains pset (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'pset\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'pset\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'pset\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'pset\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'pset\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'pset\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'pset\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'pset\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'pset\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'ps' subcommand
 #
 
-complete -c svn -n 'contains ps (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
-complete -c svn -n 'contains ps (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains ps (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
-complete -c svn -n 'contains ps (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains ps (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains ps (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains ps (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains ps (commandline -poc)' -l force --description 'Force operation to run'
-complete -c svn -n 'contains ps (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'ps\' (commandline -poc)' -l encoding -x --description 'Treat value as being in charset encoding ARG'
+complete -c svn -n 'contains \'ps\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'ps\' (commandline -poc)' -l revprop --description 'Operate on a revision property (use with -r)'
+complete -c svn -n 'contains \'ps\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'ps\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'ps\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'ps\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'ps\' (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'ps\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'resolved' subcommand
 #
 
-complete -c svn -n 'contains resolved (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains resolved (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'resolved\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'resolved\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'revert' subcommand
 #
 
-complete -c svn -n 'contains revert (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains revert (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'revert\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'revert\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'status' subcommand
 #
 
-complete -c svn -n 'contains status (commandline -poc)' -l no-ignore --description 'Disregard default and svn:ignore property ignores'
-complete -c svn -n 'contains status (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
-complete -c svn -n 'contains status (commandline -poc)' -l xml --description 'Output in XML'
-complete -c svn -n 'contains status (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains status (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains status (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains status (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains status (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
-complete -c svn -n 'contains status (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
+complete -c svn -n 'contains \'status\' (commandline -poc)' -l no-ignore --description 'Disregard default and svn:ignore property ignores'
+complete -c svn -n 'contains \'status\' (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
+complete -c svn -n 'contains \'status\' (commandline -poc)' -l xml --description 'Output in XML'
+complete -c svn -n 'contains \'status\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'status\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'status\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'status\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'status\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'status\' (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
 
 
 #
 # Completions for the 'stat' subcommand
 #
 
-complete -c svn -n 'contains stat (commandline -poc)' -l no-ignore --description 'Disregard default and svn:ignore property ignores'
-complete -c svn -n 'contains stat (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
-complete -c svn -n 'contains stat (commandline -poc)' -l xml --description 'Output in XML'
-complete -c svn -n 'contains stat (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains stat (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains stat (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains stat (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains stat (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
-complete -c svn -n 'contains stat (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
+complete -c svn -n 'contains \'stat\' (commandline -poc)' -l no-ignore --description 'Disregard default and svn:ignore property ignores'
+complete -c svn -n 'contains \'stat\' (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
+complete -c svn -n 'contains \'stat\' (commandline -poc)' -l xml --description 'Output in XML'
+complete -c svn -n 'contains \'stat\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'stat\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'stat\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'stat\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'stat\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'stat\' (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
 
 
 #
 # Completions for the 'st' subcommand
 #
 
-complete -c svn -n 'contains st (commandline -poc)' -l no-ignore --description 'Disregard default and svn:ignore property ignores'
-complete -c svn -n 'contains st (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
-complete -c svn -n 'contains st (commandline -poc)' -l xml --description 'Output in XML'
-complete -c svn -n 'contains st (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains st (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains st (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains st (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains st (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
-complete -c svn -n 'contains st (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
+complete -c svn -n 'contains \'st\' (commandline -poc)' -l no-ignore --description 'Disregard default and svn:ignore property ignores'
+complete -c svn -n 'contains \'st\' (commandline -poc)' -l incremental --description 'Give output suitable for concatenation'
+complete -c svn -n 'contains \'st\' (commandline -poc)' -l xml --description 'Output in XML'
+complete -c svn -n 'contains \'st\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'st\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'st\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'st\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'st\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'st\' (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
 
 
 #
 # Completions for the 'switch' subcommand
 #
 
-complete -c svn -n 'contains switch (commandline -poc)' -l diff3-cmd -x --description 'Use ARG as merge command'
-complete -c svn -n 'contains switch (commandline -poc)' -l relocate --description 'Relocate via URL-rewriting'
-complete -c svn -n 'contains switch (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains switch (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains switch (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains switch (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains switch (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'switch\' (commandline -poc)' -l diff3-cmd -x --description 'Use ARG as merge command'
+complete -c svn -n 'contains \'switch\' (commandline -poc)' -l relocate --description 'Relocate via URL-rewriting'
+complete -c svn -n 'contains \'switch\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'switch\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'switch\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'switch\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'switch\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'sw' subcommand
 #
 
-complete -c svn -n 'contains sw (commandline -poc)' -l diff3-cmd -x --description 'Use ARG as merge command'
-complete -c svn -n 'contains sw (commandline -poc)' -l relocate --description 'Relocate via URL-rewriting'
-complete -c svn -n 'contains sw (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains sw (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains sw (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains sw (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains sw (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'sw\' (commandline -poc)' -l diff3-cmd -x --description 'Use ARG as merge command'
+complete -c svn -n 'contains \'sw\' (commandline -poc)' -l relocate --description 'Relocate via URL-rewriting'
+complete -c svn -n 'contains \'sw\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'sw\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'sw\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'sw\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'sw\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
 
 
 #
 # Completions for the 'unlock' subcommand
 #
 
-complete -c svn -n 'contains unlock (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
-complete -c svn -n 'contains unlock (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains unlock (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains unlock (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains unlock (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains unlock (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
-complete -c svn -n 'contains unlock (commandline -poc)' -l force --description 'Force operation to run'
+complete -c svn -n 'contains \'unlock\' (commandline -poc)' -l targets -x --description 'Pass contents of file ARG as additional args'
+complete -c svn -n 'contains \'unlock\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'unlock\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'unlock\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'unlock\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'unlock\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'unlock\' (commandline -poc)' -l force --description 'Force operation to run'
 
 
 #
 # Completions for the 'update' subcommand
 #
 
-complete -c svn -n 'contains update (commandline -poc)' -l diff3-cmd -x --description 'Use ARG as merge command'
-complete -c svn -n 'contains update (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains update (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains update (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains update (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains update (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
-complete -c svn -n 'contains update (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
+complete -c svn -n 'contains \'update\' (commandline -poc)' -l diff3-cmd -x --description 'Use ARG as merge command'
+complete -c svn -n 'contains \'update\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'update\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'update\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'update\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'update\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'update\' (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
 
 
 #
 # Completions for the 'up' subcommand
 #
 
-complete -c svn -n 'contains up (commandline -poc)' -l diff3-cmd -x --description 'Use ARG as merge command'
-complete -c svn -n 'contains up (commandline -poc)' -l username -x --description 'Specify a username ARG'
-complete -c svn -n 'contains up (commandline -poc)' -l password -x --description 'Specify a password ARG'
-complete -c svn -n 'contains up (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
-complete -c svn -n 'contains up (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
-complete -c svn -n 'contains up (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
-complete -c svn -n 'contains up (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'
+complete -c svn -n 'contains \'up\' (commandline -poc)' -l diff3-cmd -x --description 'Use ARG as merge command'
+complete -c svn -n 'contains \'up\' (commandline -poc)' -l username -x --description 'Specify a username ARG'
+complete -c svn -n 'contains \'up\' (commandline -poc)' -l password -x --description 'Specify a password ARG'
+complete -c svn -n 'contains \'up\' (commandline -poc)' -l no-auth-cache --description 'Do not cache authentication tokens'
+complete -c svn -n 'contains \'up\' (commandline -poc)' -l non-interactive --description 'Do no interactive prompting'
+complete -c svn -n 'contains \'up\' (commandline -poc)' -l config-dir -x --description 'Read user configuration files from directory ARG'
+complete -c svn -n 'contains \'up\' (commandline -poc)' -l ignore-externals --description 'Ignore externals definitions'