From 18f73fc65cd734620bbd01389fcd7b670b1db3a7 Mon Sep 17 00:00:00 2001 From: Paul Ackersviller Date: Mon, 26 Nov 2007 03:21:04 +0000 Subject: Merge of onto 4.2 branch unposted trunk revisions 1.3[67] for new options. --- Completion/Unix/Command/_rsync | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'Completion') diff --git a/Completion/Unix/Command/_rsync b/Completion/Unix/Command/_rsync index 6e80dd17f..82683b0ba 100644 --- a/Completion/Unix/Command/_rsync +++ b/Completion/Unix/Command/_rsync @@ -114,15 +114,20 @@ _arguments -s \ '(-a --archive)'{-a,--archive}'[archive mode; same as -rlptgoD (no -H)]' \ '(-r --recursive)'{-r,--recursive}'[recurse into directories]' \ {--no-r,--no-recursive}'[turn off --recursive]' \ + {--no-inc-recursive,--no-i-r}'[disable incremental recursive mode]' \ '(-R --relative)'{-R,--relative}'[use relative path names]' \ {--no-R,--no-relative}'[turn off --relative]' \ - '--no-implied-dirs[do not send implied dirs with --relative]' \ + {--no-implied-dirs,--no-i-d}'[do not send implied dirs with --relative]' \ '(-b --backup)'{-b,--backup}'[make backups into hierarchy at indicated directory]' \ '--backup-dir=[make backups into specified directory]:backup directory:_directories' \ '--suffix=[set backup suffix]:suffix:(\~)' \ '(-u --update)'{-u,--update}'[skip files that are newer on the receiving side]' \ '--inplace[update destination files in-place]' \ - '--append[append data onto shorter files]' \ + '(--append-verify)--append[append data onto shorter files]' \ + '(--append)--append-verify[append data onto shorter files, verifying old data]' \ + '(-A --acls)'{-A,--acls}'[preserve access-control lists]' \ + '(-X --xattrs)'{-X,--xattrs}'[preserve extended attributes]' \ + '--fake-super[use xattrs to save all file attributes]' \ '(-d --dirs)'{-d,--dirs}'[transfer directories without recursing]' \ {--no-d,--no-dirs}'[turn off --dirs]' \ '(-l --links)'{-l,--links}'[copy symlinks as symlinks]' \ @@ -136,7 +141,7 @@ _arguments -s \ '(-K --keep-dirlinks)'{-K,--keep-dirlinks}'[treat symlinked dir on receiver as dir]' \ '(-p --perms -E --executability)'{-p,--perms}'[preserve permissions]' \ {--no-p,--no-perms}'[turn off --perms]' \ - '(-E --executability -p --perms)'{-E,--executability}'[preserve executability]' \ + '(-E --executability)'{-E,--executability}'[preserve executability]' \ '(-o --owner)'{-o,--owner}'[preserve owner]' \ {--no-o,--no-owner}'[turn off --owner]' \ '(-g --group)'{-g,--group}'[preserve group]' \ @@ -163,11 +168,12 @@ _arguments -s \ '(--existing --ignore-non-existing)'{--existing,--ignore-non-existing}'[ignore files that do not exist on receiving side]' \ '--remove-source-files[synchronized files are removed from sending side]' \ '--remove-sent-files[transferred files/symlinks are removed from sending side]' \ - '(--delete-before --delete-during --delete-after)--del[an alias for --delete-during]' \ + '(--delete-before --delete-during --delete-after --delete-delay)--del[an alias for --delete-during]' \ '--delete[delete files that do not exist on the sending side]' \ - '(--del --delete-during --delete-after)--delete-before[receiver deletes before transfer]' \ - '(--del --delete-before --delete-after)--delete-during[receiver deletes during transfer]' \ - '(--del --delete-before --delete-during)--delete-after[receiver deletes after transfer]' \ + '(--del --delete-during --delete-after --delete-delay)--delete-before[receiver deletes before transfer]' \ + '(--del --delete-before --delete-after --delete-delay)--delete-during[receiver deletes during transfer]' \ + '(--del --delete-before --delete-during --delete-delay)--delete-after[receiver deletes after transfer]' \ + '(--del --delete-before --delete-during --delete-after)--delete-delay[receiver deletes after transfer]' \ '--delete-excluded[also delete excluded files on the receiving side]' \ '--ignore-errors[delete even if there are I/O errors]' \ '--force[force deletion of directories even if not empty]' \ @@ -192,6 +198,7 @@ _arguments -s \ '(--compare-dest --copy-dest)*--link-dest=[hardlink to files in specified directory hierarchy when unchanged]:directory:_directories' \ '(-z --compress)'{-z,--compress}'[compress file data during the transfer]' \ '--compress-level=[explicitly set compression level]:number' \ + '--skip-compress=[skip compressing files with a listed suffix]:suffixes' \ '(-C --cvs-exclude)'{-C,--cvs-exclude}'[auto-ignore files the same way CVS does]' \ '*'{-f,--filter=}'[add a file-filtering rule]:rule' \ '*-F[same as --filter="dir-merge /.rsync-filter", repeated: --filter="- .rsync-filter"]' \ @@ -201,6 +208,7 @@ _arguments -s \ '*--include=[do not exclude files matching pattern]:pattern' \ '--files-from=[read list of source-file names from specified file]:file:_files' \ '(-0 --from0)'{-0,--from0}'[all *-from file lists are delimited by nulls]' \ + '(-s --protect-args)'{-s,--protect-args}'[no space-splitting; only wildcard special-chars]' \ '--version[print version number]' \ '(-h --human-readable --si)'{-h,--human-readable}'[output numbers in a human-readable format]' \ '(-h --human-readable)--si[like --human-readable, but use powers of 1000]' \ @@ -216,9 +224,10 @@ _arguments -s \ '--out-format=[output updates using specified format]:format' \ '--log-file-format=[log updates using specified format]:format' \ '--log-file=[log what rsync is doing to the specified file]:file:_files' \ - '--password-file=[read password from file]:file:_files' \ + '--password-file=[read daemon-access password from file]:file:_files' \ '--list-only[list the files instead of copying them]' \ '(--only-write-batch)--write-batch=[write a batched update to the specified file]:file:_files' \ '(--write-batch)--only-write-batch=[like --write-batch but w/o updating destination]:file:_files' \ '--protocol=[force an older protocol version to be used]:number' \ + '--iconv=[request charset conversion of filenames]:number' \ '--read-batch=[read a batched update from the specified file]:file:_files' -- cgit 1.4.1