This patch adds the options --detect-renamed-lax and --detect-moved. These modify the --detect-renamed algorithm to adopt a matching file without verifying that the content is as expected. The former blindly accepts a file that matches in size and modified time. The latter requires that the filename also match (ignoring any renamed files). This patch is EXPERIMENTAL, though it did work correctly in my light testing. To use this patch, run these commands for a successful build: patch -p1 based-on: patch/master/detect-renamed diff --git a/generator.c b/generator.c --- a/generator.c +++ b/generator.c @@ -468,7 +468,9 @@ static int fattr_find(struct file_struct *f, char *fname) continue; } } - ok_match = mid; + /* --detect-moved doesn't allow non-basename matches */ + if (detect_renamed != 3) + ok_match = mid; diff = u_strcmp(fmid->basename, f->basename); if (diff == 0) { good_match = mid; @@ -1982,6 +1984,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, fnamecmp = partialptr; fnamecmp_type = FNAMECMP_PARTIAL_DIR; statret = 0; + if (detect_renamed > 1 && unchanged_file(fnamecmp, file, &sx.st)) { + /* Adopt the partial file. */ + finish_transfer(fname, fnamecmp, NULL, NULL, file, 1, 1); + handle_partial_dir(partialptr, PDIR_DELETE); + if (itemizing) + itemize(fnamecmp, file, ndx, -1, &sx, + ITEM_LOCAL_CHANGE, fnamecmp_type, NULL); +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && F_IS_HLINKED(file)) + finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1); +#endif + if (remove_source_files == 1) + goto return_with_success; + goto cleanup; + } } if (!do_xfers) diff --git a/options.c b/options.c --- a/options.c +++ b/options.c @@ -734,7 +734,9 @@ static struct poptOption long_options[] = { {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 }, {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 }, {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, - {"detect-renamed", 0, POPT_ARG_NONE, &detect_renamed, 0, 0, 0 }, + {"detect-renamed", 0, POPT_ARG_VAL, &detect_renamed, 1, 0, 0 }, + {"detect-renamed-lax",0, POPT_ARG_VAL, &detect_renamed, 2, 0, 0 }, + {"detect-moved", 0, POPT_ARG_VAL, &detect_renamed, 3, 0, 0 }, {"fuzzy", 'y', POPT_ARG_NONE, 0, 'y', 0, 0 }, {"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, {"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, @@ -2763,8 +2765,14 @@ void server_options(char **args, int *argc_p) args[ac++] = "--super"; if (size_only) args[ac++] = "--size-only"; - if (detect_renamed) - args[ac++] = "--detect-renamed"; + if (detect_renamed) { + if (detect_renamed == 1) + args[ac++] = "--detect-renamed"; + else if (detect_renamed == 2) + args[ac++] = "--detect-renamed-lax"; + else + args[ac++] = "--detect-moved"; + } if (do_stats) args[ac++] = "--stats"; } else { diff --git a/rsync.1.md b/rsync.1.md --- a/rsync.1.md +++ b/rsync.1.md @@ -422,6 +422,8 @@ detailed description below for a complete description. --temp-dir=DIR, -T create temporary files in directory DIR --fuzzy, -y find similar file for basis if no dest file --detect-renamed try to find renamed files to speed the xfer +--detect-renamed-lax ...& assume identical to src files (risky!) +--detect-moved ... only if basenames match (less risky) --compare-dest=DIR also compare destination files relative to DIR --copy-dest=DIR ... and include copies of unchanged files --link-dest=DIR hardlink to files in DIR when unchanged @@ -2264,6 +2266,17 @@ your home directory (remove the '=' for that). otential alternate-basis files will be removed as the transfer progresses. This option conflicts with `--inplace` and `--append`. +0. ``--detect-renamed-lax` This version of `--detect-renamed` makes rsync + hard-link `dest/D` to `dest/S` without verifying that `src/S` and + `dest/S` have the same data. This poses a significant risk of corrupting + the destination by representing a new source file by an unrelated + destination file that coincidentally passes the quick check with the source + file. Use this option only if you accept the risk and disk I/O is a + bottleneck. + +0. ``--detect-moved`` A less risky variant of `--detect-renamed-lax` that only + uses a destination file that has the same basename as the new source file. + 0. `--compare-dest=DIR` This option instructs rsync to use _DIR_ on the destination machine as an diff -Nurp a/rsync.1 b/rsync.1 --- a/rsync.1 +++ b/rsync.1 @@ -498,6 +498,8 @@ detailed description below for a complet --temp-dir=DIR, -T create temporary files in directory DIR --fuzzy, -y find similar file for basis if no dest file --detect-renamed try to find renamed files to speed the xfer +--detect-renamed-lax ...& assume identical to src files (risky!) +--detect-moved ... only if basenames match (less risky) --compare-dest=DIR also compare destination files relative to DIR --copy-dest=DIR ... and include copies of unchanged files --link-dest=DIR hardlink to files in DIR when unchanged @@ -2305,6 +2307,15 @@ By default, alternate-basis files are ha \fB\-\-partial-dir\fP option, that directory will be used instead. These otential alternate-basis files will be removed as the transfer progresses. This option conflicts with \fB\-\-inplace\fP and \fB\-\-append\fP. +.IP "``\-\-detect-renamed-lax\fBThis\ version\ of\fP\-\-detect-renamed` makes rsync +hard-link `dest/D` to `dest/S` without verifying that `src/S` and +`dest/S` have the same data. This poses a significant risk of corrupting +the destination by representing a new source file by an unrelated +destination file that coincidentally passes the quick check with the source +file. Use this option only if you accept the risk and disk I/O is a +bottleneck." +.IP "\fB\-\-detect-moved\fP A less risky variant of \fB\-\-detect-renamed-lax\fP that only +uses a destination file that has the same basename as the new source file." .IP "\fB\-\-compare-dest=DIR\fP" This option instructs rsync to use \fIDIR\fP on the destination machine as an additional hierarchy to compare destination files against doing transfers diff -Nurp a/rsync.1.html b/rsync.1.html --- a/rsync.1.html +++ b/rsync.1.html @@ -413,6 +413,8 @@ detailed description below for a complet --temp-dir=DIR, -T create temporary files in directory DIR --fuzzy, -y find similar file for basis if no dest file --detect-renamed try to find renamed files to speed the xfer +--detect-renamed-lax ...& assume identical to src files (risky!) +--detect-moved ... only if basenames match (less risky) --compare-dest=DIR also compare destination files relative to DIR --copy-dest=DIR ... and include copies of unchanged files --link-dest=DIR hardlink to files in DIR when unchanged @@ -2151,6 +2153,19 @@ otential alternate-basis files will be r This option conflicts with --inplace and --append.

+
``-⁠-⁠detect-renamed-laxThis version of-⁠-⁠detect-renamed` makes rsync +hard-link `dest/D` to `dest/S` without verifying that `src/S` and +`dest/S` have the same data. This poses a significant risk of corrupting +the destination by representing a new source file by an unrelated +destination file that coincidentally passes the quick check with the source +file. Use this option only if you accept the risk and disk I/O is a +bottleneck.
+
+ +
--detect-moved A less risky variant of --detect-renamed-lax that only +uses a destination file that has the same basename as the new source file.
+
+
--compare-dest=DIR

This option instructs rsync to use DIR on the destination machine as an additional hierarchy to compare destination files against doing transfers