Commit d9fcc198 authored by Andrew Tridgell's avatar Andrew Tridgell

added -P option

it is equivalent to --partial --progress
parent c8313794
...@@ -132,6 +132,7 @@ void usage(int F) ...@@ -132,6 +132,7 @@ void usage(int F)
rprintf(F," --size-only only use file size when determining if a file should be transferred\n"); rprintf(F," --size-only only use file size when determining if a file should be transferred\n");
rprintf(F," -T --temp-dir=DIR create temporary files in directory DIR\n"); rprintf(F," -T --temp-dir=DIR create temporary files in directory DIR\n");
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," -P equivalent to --partial --progress\n");
rprintf(F," -z, --compress compress file data\n"); rprintf(F," -z, --compress compress file data\n");
rprintf(F," --exclude=PATTERN exclude files matching PATTERN\n"); rprintf(F," --exclude=PATTERN exclude files matching PATTERN\n");
rprintf(F," --exclude-from=FILE exclude patterns listed in FILE\n"); rprintf(F," --exclude-from=FILE exclude patterns listed in FILE\n");
...@@ -160,7 +161,7 @@ enum {OPT_VERSION, OPT_SUFFIX, OPT_SENDER, OPT_SERVER, OPT_EXCLUDE, ...@@ -160,7 +161,7 @@ enum {OPT_VERSION, OPT_SUFFIX, OPT_SENDER, OPT_SERVER, OPT_EXCLUDE,
OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS, OPT_COMPARE_DEST, OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS, OPT_COMPARE_DEST,
OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY}; OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY};
static char *short_options = "oblLWHpguDCtcahvqrRIxnSe:B:T:z"; static char *short_options = "oblLWHpguDCtcahvqrRIxnSe:B:T:zP";
static struct option long_options[] = { static struct option long_options[] = {
{"version", 0, 0, OPT_VERSION}, {"version", 0, 0, OPT_VERSION},
...@@ -500,6 +501,11 @@ int parse_arguments(int argc, char *argv[], int frommain) ...@@ -500,6 +501,11 @@ int parse_arguments(int argc, char *argv[], int frommain)
keep_partial = 1; keep_partial = 1;
break; break;
case 'P':
do_progress = 1;
keep_partial = 1;
break;
case OPT_CONFIG: case OPT_CONFIG:
config_file = optarg; config_file = optarg;
break; break;
......
...@@ -252,7 +252,7 @@ Options ...@@ -252,7 +252,7 @@ Options
-x, --one-file-system don't cross filesystem boundaries -x, --one-file-system don't cross filesystem boundaries
-B, --block-size=SIZE checksum blocking size (default 700) -B, --block-size=SIZE checksum blocking size (default 700)
-e, --rsh=COMMAND specify rsh replacement -e, --rsh=COMMAND specify rsh replacement
--rsync-path=PATH specify full path to rsync on the remote machine --rsync-path=PATH specify path to rsync on the remote machine
-C, --cvs-exclude auto ignore files in the same way CVS does -C, --cvs-exclude auto ignore files in the same way CVS does
--delete delete files that don't exist on the sending side --delete delete files that don't exist on the sending side
--delete-excluded also delete excluded files on the receiving side --delete-excluded also delete excluded files on the receiving side
...@@ -264,6 +264,7 @@ Options ...@@ -264,6 +264,7 @@ Options
--size-only only use file size when determining if a file should be transferred --size-only only use file size when determining if a file should be transferred
-T --temp-dir=DIR create temporary files in directory DIR -T --temp-dir=DIR create temporary files in directory DIR
--compare-dest=DIR also compare destination files relative to DIR --compare-dest=DIR also compare destination files relative to DIR
-P equivalent to --partial --progress
-z, --compress compress file data -z, --compress compress file data
--exclude=PATTERN exclude files matching PATTERN --exclude=PATTERN exclude files matching PATTERN
--exclude-from=FILE exclude patterns listed in FILE --exclude-from=FILE exclude patterns listed in FILE
...@@ -391,12 +392,6 @@ dit(bf(-W, --whole-file)) With this option the incremental rsync algorithm ...@@ -391,12 +392,6 @@ dit(bf(-W, --whole-file)) With this option the incremental rsync algorithm
is not used and the whole file is sent as-is instead. This may be is not used and the whole file is sent as-is instead. This may be
useful when using rsync with a local machine. useful when using rsync with a local machine.
dit(bf(--partial)) By default, rsync will delete any partially
transferred file if the transfer is interrupted. In some circumstances
it is more desirable to keep partially transferred files. Using the
--partial option tells rsync to keep the partial file which should
make a subsequent transfer of the rest of the file much faster.
dit(bf(-p, --perms)) This option causes rsync to update the remote dit(bf(-p, --perms)) This option causes rsync to update the remote
permissions to be the same as the local permissions. permissions to be the same as the local permissions.
...@@ -610,6 +605,12 @@ dit(bf(--stats)) This tells rsync to print a verbose set of statistics ...@@ -610,6 +605,12 @@ dit(bf(--stats)) This tells rsync to print a verbose set of statistics
on the file transfer, allowing you to tell how effective the rsync on the file transfer, allowing you to tell how effective the rsync
algorithm is for your data. algorithm is for your data.
dit(bf(--partial)) By default, rsync will delete any partially
transferred file if the transfer is interrupted. In some circumstances
it is more desirable to keep partially transferred files. Using the
--partial option tells rsync to keep the partial file which should
make a subsequent transfer of the rest of the file much faster.
dit(bf(--progress)) This option tells rsync to print information dit(bf(--progress)) This option tells rsync to print information
showing the progress of the transfer. This gives a bored user showing the progress of the transfer. This gives a bored user
something to watch. something to watch.
...@@ -617,6 +618,10 @@ something to watch. ...@@ -617,6 +618,10 @@ something to watch.
This option is normally combined with -v. Using this option without This option is normally combined with -v. Using this option without
the -v option will produce weird results on your display. the -v option will produce weird results on your display.
dit(bf(-P)) The -P option is equivalent to --partial --progress. I
found myself typing that combination quite often so I created an
option to make it easier.
dit(bf(--password-file)) This option allows you to provide a password dit(bf(--password-file)) This option allows you to provide a password
in a file for accessing a remote rsync server. Note that this option in a file for accessing a remote rsync server. Note that this option
is only useful when accessing a rsync server using the built in is only useful when accessing a rsync server using the built in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment