X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/f2863bc00ee660400c314a756d19ce5455dce87d..refs/heads/master:/source-backup.diff

diff --git a/source-backup.diff b/source-backup.diff
index 8dc21d5..4fa8937 100644
--- a/source-backup.diff
+++ b/source-backup.diff
@@ -9,18 +9,19 @@ To use this patch, run these commands for a successful build:
 
 -- Matt McCutchen <hashproduct@gmail.com>
 
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -32,6 +32,7 @@ extern struct filter_list_struct filter_list;
- extern struct filter_list_struct server_filter_list;
+@@ -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
-@@ -362,6 +363,7 @@ void usage(enum logcode F)
+@@ -713,6 +714,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");
@@ -28,15 +29,15 @@ diff --git a/options.c b/options.c
    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");
-@@ -589,6 +591,7 @@ static struct poptOption long_options[] = {
-   {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
+@@ -967,6 +969,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 },
-@@ -1902,6 +1905,8 @@ void server_options(char **args, int *argc_p)
+@@ -2536,6 +2539,8 @@ void server_options(char **args, int *argc_p)
  				goto oom;
  			args[ac++] = arg;
  		}
@@ -44,19 +45,19 @@ diff --git a/options.c b/options.c
 +			args[ac++] = "--source-backup";
  	}
  
- 	if (modify_window_set) {
+ 	/* --delete-missing-args needs the cooperation of both sides, but
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -361,6 +361,7 @@ to the detailed description below for a complete description.  verb(
+@@ -368,6 +368,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)
-@@ -1085,6 +1086,14 @@ dit(bf(--remove-source-files)) This tells rsync to remove from the sending
+      --delete-before         receiver deletes before xfer, not during
+@@ -1198,6 +1199,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.
  
@@ -79,10 +80,10 @@ diff --git a/sender.c b/sender.c
  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;
+@@ -126,6 +127,7 @@ void successful_send(int ndx)
  	char fname[MAXPATHLEN];
  	struct file_struct *file;
  	struct file_list *flist;
@@ -90,16 +91,16 @@ diff --git a/sender.c b/sender.c
  
  	if (!remove_source_files)
  		return;
-@@ -139,7 +141,11 @@ void successful_send(int ndx)
+@@ -136,7 +138,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