-- Matt McCutchen <hashproduct@gmail.com>
---- old/options.c
-+++ new/options.c
-@@ -29,6 +29,7 @@ extern struct filter_list_struct filter_
- extern struct filter_list_struct server_filter_list;
+based-on: d64bda1c1e79dc385f194d74f7957ce7cd118654
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -33,6 +33,7 @@ extern filter_rule_list filter_list;
+ extern filter_rule_list daemon_filter_list;
int make_backups = 0;
+int make_source_backups = 0;
/**
* If 1, send the whole file as literal data rather than trying to
-@@ -351,6 +352,7 @@ void usage(enum logcode F)
+@@ -715,6 +716,7 @@ void usage(enum logcode F)
rprintf(F," --existing skip creating new files on receiver\n");
rprintf(F," --ignore-existing skip updating files that already exist on receiver\n");
rprintf(F," --remove-source-files sender removes synchronized files (non-dirs)\n");
rprintf(F," --del an alias for --delete-during\n");
rprintf(F," --delete delete extraneous files from destination dirs\n");
rprintf(F," --delete-before receiver deletes before transfer, not during\n");
-@@ -570,6 +572,7 @@ static struct poptOption long_options[]
- {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 },
+@@ -972,6 +974,7 @@ static struct poptOption long_options[] = {
+ {"bwlimit", 0, POPT_ARG_STRING, &bwlimit_arg, OPT_BWLIMIT, 0, 0 },
{"no-bwlimit", 0, POPT_ARG_VAL, &bwlimit, 0, 0, 0 },
{"backup", 'b', POPT_ARG_VAL, &make_backups, 1, 0, 0 },
+ {"source-backup", 0, POPT_ARG_NONE, &make_source_backups, 0, 0, 0},
{"no-backup", 0, POPT_ARG_VAL, &make_backups, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-@@ -1836,7 +1839,8 @@ void server_options(char **args,int *arg
- args[ac++] = "--super";
- if (size_only)
- args[ac++] = "--size-only";
-- }
-+ } else if (make_source_backups)
-+ args[ac++] = "--source-backup";
+@@ -2549,6 +2552,8 @@ void server_options(char **args, int *argc_p)
+ goto oom;
+ args[ac++] = arg;
+ }
++ if (make_source_backups)
++ args[ac++] = "--source-backup";
+ }
- if (modify_window_set) {
- if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -350,6 +350,7 @@ to the detailed description below for a
+ /* --delete-missing-args needs the cooperation of both sides, but
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -369,6 +369,7 @@ to the detailed description below for a complete description. verb(
--existing skip creating new files on receiver
--ignore-existing skip updating files that exist on receiver
--remove-source-files sender removes synchronized files (non-dir)
+ --source-backup ... and backs up those files
--del an alias for --delete-during
--delete delete extraneous files from dest dirs
- --delete-before receiver deletes before transfer (default)
-@@ -1004,6 +1005,15 @@ dit(bf(--remove-source-files)) This tell
+ --delete-before receiver deletes before xfer, not during
+@@ -1238,6 +1239,14 @@ dit(bf(--remove-source-files)) This tells rsync to remove from the sending
side the files (meaning non-directories) that are a part of the transfer
and have been successfully duplicated on the receiving side.
+dit(bf(--source-backup)) Makes the sender back up the source files it removes
+due to bf(--remove-source-files). This option is independent of
+bf(--backup) but uses the same bf(--backup-dir) and bf(--suffix) settings,
-+if any. With bf(--backup-dir), each backup file is placed inside the backup
-+dir according to the source file's full path from the working directory
-+(backup-dir + source argument path + file-list path); if you want files placed according
-+to the file-list path, you could either make appropriate symlinks or have the
-+sender "cd" into the source directory so that the source argument is just ".".
++if any. With bf(--backup-dir), rsync looks for each file's backup dir relative
++to the source argument the file came from. Consequently, if the
++bf(--backup-dir) path is relative, each source argument gets a separate backup
++dir at that path relative to the argument.
+
dit(bf(--delete)) This tells rsync to delete extraneous files from the
receiving side (ones that aren't on the sending side), but only for the
directories that are being synchronized. You must have asked rsync to
---- old/sender.c
-+++ new/sender.c
+diff --git a/sender.c b/sender.c
+--- a/sender.c
++++ b/sender.c
@@ -39,6 +39,7 @@ extern int protocol_version;
extern int remove_source_files;
extern int updating_basis_file;
extern int make_backups;
+extern int make_source_backups;
- extern int do_progress;
extern int inplace;
extern int batch_fd;
-@@ -123,6 +124,7 @@ void successful_send(int ndx)
+ extern int write_batch;
+@@ -125,6 +126,7 @@ void successful_send(int ndx)
char fname[MAXPATHLEN];
struct file_struct *file;
struct file_list *flist;
if (!remove_source_files)
return;
-@@ -139,7 +141,11 @@ void successful_send(int ndx)
+@@ -135,7 +137,11 @@ void successful_send(int ndx)
return;
f_name(file, fname);
- if (do_unlink(fname) == 0) {
+ if (make_source_backups)
-+ result = !make_backup(fname);
++ result = !make_backup(fname, True);
+ else
+ result = do_unlink(fname);
+ if (result == 0) {
- if (verbose > 1)
+ if (INFO_GTE(REMOVE, 1))
rprintf(FINFO, "sender removed %s\n", fname);
} else
git.samba.org / rsync-patches.git / blobdiff