X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/c66bc26c6b17a86de17288c26fc9f79577f4362b..7ac2aef2fd35ed0cffe2b558b69643f12662a03e:/date-only.diff

diff --git a/date-only.diff b/date-only.diff
index d2f7d1a..42315fd 100644
--- a/date-only.diff
+++ b/date-only.diff
@@ -15,103 +15,81 @@ Jeremy Bornstein
 
 [Patched update to have context and apply to latest CVS source.]
 
---- generator.c	10 Feb 2004 22:56:16 -0000	1.75
-+++ generator.c	24 Feb 2004 19:17:31 -0000
-@@ -43,11 +43,14 @@
- extern int always_checksum;
- extern char *compare_dest;
- extern int link_dest;
+--- old/generator.c
++++ new/generator.c
+@@ -61,6 +61,7 @@ extern int append_mode;
+ extern int make_backups;
+ extern int csum_length;
+ extern int ignore_times;
 +extern int date_only;
- 
- 
- /* choose whether to skip a particular file */
- static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
+ extern int size_only;
+ extern OFF_T max_size;
+ extern OFF_T min_size;
+@@ -379,6 +380,8 @@ void itemize(struct file_struct *file, i
+ /* Perform our quick-check heuristic for determining if a file is unchanged. */
+ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  {
 +	if (date_only)
-+		return cmp_modtime(st->st_mtime,file->modtime) == 0;
- 	if (st->st_size != file->length) {
++		return cmp_time(st->st_mtime, file->modtime) == 0;
+ 	if (st->st_size != file->length)
  		return 0;
- 	}
---- options.c	22 Feb 2004 08:56:43 -0000	1.139
-+++ options.c	24 Feb 2004 19:17:31 -0000
-@@ -80,6 +80,7 @@
+ 
+--- old/options.c
++++ new/options.c
+@@ -99,6 +99,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int size_only = 0;
 +int date_only = 0;
+ int daemon_bwlimit = 0;
  int bwlimit = 0;
- int delete_after = 0;
- int only_existing = 0;
-@@ -260,6 +261,7 @@
+ int fuzzy_basis = 0;
+@@ -332,6 +333,7 @@ void usage(enum logcode F)
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
-   rprintf(F," -I, --ignore-times          turn off mod time & file size quick check\n");
-   rprintf(F,"     --size-only             ignore mod time for quick check (use size)\n");
-+  rprintf(F,"     --date-only             ignore size for quick check (use mod time)\n");
-   rprintf(F,"     --modify-window=NUM     compare mod times with reduced accuracy\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");
-@@ -314,6 +316,7 @@
-   {"password-file",    0,  POPT_ARG_STRING, &password_file,	0, 0, 0 },
+   rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
+   rprintf(F,"     --size-only             skip files that match in size\n");
++  rprintf(F,"     --date-only             skip files that match in mod-time\n");
+   rprintf(F,"     --modify-window=NUM     compare mod-times with reduced accuracy\n");
+   rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
+   rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");
+@@ -443,6 +445,7 @@ static struct poptOption long_options[] 
+   {"chmod",            0,  POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
    {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
 +  {"date-only",        0,  POPT_ARG_NONE,   &date_only, 0, 0, 0 },
-   {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
-   {"one-file-system", 'x', POPT_ARG_NONE,   &one_file_system, 0, 0, 0 },
-   {"delete",           0,  POPT_ARG_NONE,   &delete_mode, 0, 0, 0 },
-@@ -886,6 +889,9 @@
+   {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
+   {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
+   {"existing",         0,  POPT_ARG_NONE,   &ignore_non_existing, 0, 0, 0 },
+@@ -1647,6 +1650,9 @@ void server_options(char **args,int *arg
+ 			args[ac++] = "--size-only";
+ 	}
  
- 	if (size_only)
- 		args[ac++] = "--size-only";
-+
 +	if (date_only)
 +		args[ac++] = "--date-only";
- 
++
  	if (modify_window_set) {
  		if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
---- rsync.1	2 Feb 2004 18:23:09 -0000	1.163
-+++ rsync.1	24 Feb 2004 19:17:32 -0000
-@@ -357,6 +357,7 @@
+ 			goto oom;
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -355,6 +355,7 @@ to the detailed description below for a 
       --timeout=TIME          set I/O timeout in seconds
-  -I, --ignore-times          turn off mod time & file size quick check
-      --size-only             ignore mod time for quick check (use size)
-+     --date-only             ignore size for quick check (use mod time)
-      --modify-window=NUM     compare mod times with reduced accuracy
-  -T  --temp-dir=DIR          create temporary files in directory DIR
-      --compare-dest=DIR      also compare received files relative to DIR
-@@ -435,6 +436,13 @@
- regardless of timestamp\&. This is useful when starting to use rsync
- after using another mirroring system which may not preserve timestamps
- exactly\&.
-+.IP 
-+.IP "\fB--date-only\fP" 
-+Normally rsync will skip any files that are
-+already the same size and have the same modification time-stamp\&. With the
-+--date-only option, files will be skipped if they have the same
-+timestamp, regardless of size\&. This may be useful when the remote
-+files have passed through a size-changing filter, e\&.g\&. for encryption\&.
- .IP 
- .IP "\fB--modify-window\fP" 
- When comparing two timestamps rsync treats
---- rsync.yo	2 Feb 2004 18:23:09 -0000	1.147
-+++ rsync.yo	24 Feb 2004 19:17:33 -0000
-@@ -320,6 +320,7 @@
-      --timeout=TIME          set I/O timeout in seconds
-  -I, --ignore-times          turn off mod time & file size quick check
-      --size-only             ignore mod time for quick check (use size)
-+     --date-only             ignore size for quick check (use mod time)
-      --modify-window=NUM     compare mod times with reduced accuracy
-  -T  --temp-dir=DIR          create temporary files in directory DIR
-      --compare-dest=DIR      also compare received files relative to DIR
-@@ -390,6 +391,12 @@
- regardless of timestamp. This is useful when starting to use rsync
+  -I, --ignore-times          don't skip files that match size and time
+      --size-only             skip files that match in size
++     --date-only             skip files that match in mod-time
+      --modify-window=NUM     compare mod-times with reduced accuracy
+  -T, --temp-dir=DIR          create temporary files in directory DIR
+  -y, --fuzzy                 find similar file for basis if no dest file
+@@ -460,6 +461,12 @@ regardless of timestamp. This is useful 
  after using another mirroring system which may not preserve timestamps
  exactly.
-+
+ 
 +dit(bf(--date-only)) Normally rsync will skip any files that are
 +already the same size and have the same modification time-stamp. With the
 +--date-only option, files will be skipped if they have the same
 +timestamp, regardless of size. This may be useful when the remote
 +files have passed through a size-changing filter, e.g. for encryption.
- 
- dit(bf(--modify-window)) When comparing two timestamps rsync treats
- the timestamps as being equal if they are within the value of
++
+ dit(bf(--modify-window)) When comparing two timestamps, rsync treats the
+ timestamps as being equal if they differ by no more than the modify-window
+ value.  This is normally 0 (for an exact match), but you may find it useful