X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/6292693900fa7a084472f5ddad3ebcf0695380f6..6240d1e484dd4e3cc4d0dad8d47d58193354784e:/detect-renamed.diff diff --git a/detect-renamed.diff b/detect-renamed.diff index 6faf82a..4f927d9 100644 --- a/detect-renamed.diff +++ b/detect-renamed.diff @@ -19,10 +19,10 @@ memory than trying to keep track of the matches internally, and also allows any deletions or file-updates to occur normally without interfering with these alternate-basis discoveries. -After applying this patch, run these commands for a successful build: +To use this patch, run these commands for a successful build: - ./prepare-source - ./configure (optional if already run) + patch -p1 basename || !S_ISREG(f1->mode) || !f1->length) { -+ if (!f2->basename || !S_ISREG(f2->mode) || !f2->length) ++ if (!f1->basename || !S_ISREG(f1->mode) || !len1) { ++ if (!f2->basename || !S_ISREG(f2->mode) || !len2) + return 0; + return 1; + } -+ if (!f2->basename || !S_ISREG(f2->mode) || !f2->length) ++ if (!f2->basename || !S_ISREG(f2->mode) || !len2) + return -1; + + /* Don't use diff for values that are longer than an int. */ -+ if (f1->length != f2->length) -+ return f1->length < f2->length ? -1 : 1; ++ if (len1 != len2) ++ return len1 < len2 ? -1 : 1; + + if (always_checksum) { -+ diff = u_memcmp(f1->u.sum, f2->u.sum, checksum_len); ++ diff = u_memcmp(F_SUM(f1), F_SUM(f2), checksum_len); + if (diff) + return diff; + } else if (f1->modtime != f2->modtime) @@ -94,37 +113,37 @@ TODO: +} + static void send_directory(int f, struct file_list *flist, - char *fbuf, int len); + char *fbuf, int len, int flags); -@@ -1387,6 +1428,25 @@ struct file_list *recv_file_list(int f) +@@ -2154,6 +2196,25 @@ struct file_list *recv_file_list(int f) - clean_flist(flist, relative_paths, 1); + clean_flist(flist, relative_paths); + if (detect_renamed) { -+ int j = flist->count; -+ the_fattr_list.count = j; ++ int j = flist->used; ++ the_fattr_list.used = j; + the_fattr_list.files = new_array(struct file_struct *, j); + if (!the_fattr_list.files) -+ goto oom; ++ out_of_memory("recv_file_list"); + memcpy(the_fattr_list.files, flist->files, + j * sizeof (struct file_struct *)); + qsort(the_fattr_list.files, j, -+ sizeof the_fattr_list.files[0], (int (*)())fattr_compare); ++ sizeof the_fattr_list.files[0], (int (*)())fattr_compare); + the_fattr_list.low = 0; + while (j-- > 0) { + struct file_struct *fp = the_fattr_list.files[j]; -+ if (fp->basename && S_ISREG(fp->mode) && fp->length) ++ if (fp->basename && S_ISREG(fp->mode) && F_LENGTH(fp)) + break; + } + the_fattr_list.high = j; + } + - if (f >= 0) { - recv_uid_list(f, flist); - + if (protocol_version < 30) { + /* Recv the io_error flag */ + if (ignore_errors) --- old/generator.c +++ new/generator.c -@@ -77,6 +77,7 @@ extern char *basis_dir[]; +@@ -79,6 +79,7 @@ extern char *basis_dir[]; extern int compare_dest; extern int copy_dest; extern int link_dest; @@ -132,24 +151,33 @@ TODO: extern int whole_file; extern int list_only; extern int read_batch; -@@ -91,12 +92,15 @@ extern char *backup_dir; - extern char *backup_suffix; +@@ -95,6 +96,7 @@ extern char *backup_suffix; extern int backup_suffix_len; - extern struct file_list *the_file_list; -+extern struct file_list the_fattr_list; + extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct filter_list_struct server_filter_list; ++extern struct file_list the_fattr_list; + #ifdef ICONV_OPTION + extern int ic_ndx; + #endif +@@ -105,6 +107,7 @@ int maybe_ATTRS_REPORT = 0; + static dev_t dev_zero; static int deletion_count = 0; /* used to implement --max-delete */ +static int unexplored_dirs = 1; - --/* For calling delete_file() */ -+/* For calling delete_item() and delete_in_dir() */ - #define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */ -+#define DEL_NO_DELETIONS (1<<2) - #define DEL_TERSE (1<<3) - - -@@ -106,12 +110,120 @@ static int is_backup_file(char *fn) + static int deldelay_size = 0, deldelay_cnt = 0; + static char *deldelay_buf = NULL; + static int deldelay_fd = -1; +@@ -114,7 +117,8 @@ static int need_retouch_dir_times; + static int need_retouch_dir_perms; + static const char *solo_file = NULL; + +-/* For calling delete_item() and delete_dir_contents(). */ ++/* For calling delete_item(), delete_dir_contents(), and delete_in_dir(). */ ++#define DEL_NO_DELETIONS (1<<0) + #define DEL_RECURSE (1<<1) /* recurse */ + #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ + +@@ -136,11 +140,121 @@ static int is_backup_file(char *fn) return k > 0 && strcmp(fn+k, backup_suffix) == 0; } @@ -157,7 +185,7 @@ TODO: + * time (plus the basename, if possible) or (2) the size & checksum. If + * we find an exact match down to the dirname, return -1 because we found + * an up-to-date file in the transfer, not a renamed file. */ -+static int fattr_find(struct file_struct *f, char *fname, alloc_pool_t pool) ++static int fattr_find(struct file_struct *f, char *fname) +{ + int low = the_fattr_list.low, high = the_fattr_list.high; + int mid, ok_match = -1, good_match = -1; @@ -167,23 +195,24 @@ TODO: + while (low <= high) { + mid = (low + high) / 2; + fmid = the_fattr_list.files[mid]; -+ if (fmid->length != f->length) { -+ if (fmid->length < f->length) ++ if (F_LENGTH(fmid) != F_LENGTH(f)) { ++ if (F_LENGTH(fmid) < F_LENGTH(f)) + low = mid + 1; + else + high = mid - 1; + continue; + } + if (always_checksum) { -+ if (!f->u.sum) { ++ /* We use the FLAG_FILE_SENT flag to indicate when we ++ * have computed the checksum for an entry. */ ++ if (!(f->flags & FLAG_FILE_SENT)) { + if (fmid->modtime == f->modtime + && f_name_cmp(fmid, f) == 0) + return -1; /* assume we can't help */ -+ f->u.sum = pool_alloc(pool, MD4_SUM_LENGTH, -+ "fattr_find"); -+ file_checksum(fname, f->u.sum, f->length); ++ file_checksum(fname, F_SUM(f), F_LENGTH(f)); ++ f->flags |= FLAG_FILE_SENT; + } -+ diff = u_memcmp(fmid->u.sum, f->u.sum, checksum_len); ++ diff = u_memcmp(F_SUM(fmid), F_SUM(f), checksum_len); + if (diff) { + if (diff < 0) + low = mid + 1; @@ -227,15 +256,14 @@ TODO: + return good_match >= 0 ? good_match : ok_match; +} + -+static void look_for_rename(struct file_struct *file, char *fname, -+ alloc_pool_t pool) ++static void look_for_rename(struct file_struct *file, char *fname) +{ + struct file_struct *fp; + char *partialptr, *fn; + STRUCT_STAT st; + int ndx; + -+ if ((ndx = fattr_find(file, fname, pool)) < 0) ++ if (!partial_dir || (ndx = fattr_find(file, fname)) < 0) + return; + + fp = the_fattr_list.files[ndx]; @@ -243,105 +271,104 @@ TODO: + /* We don't provide an alternate-basis file if there is a basis file. */ + if (link_stat(fn, &st, 0) == 0) + return; -+ if ((partialptr = partial_dir_fname(fn)) == NULL -+ || !handle_partial_dir(partialptr, PDIR_CREATE)) -+ return; + -+ /* We only use the file if we can hard-link it into our tmp dir. */ -+ if (link(fname, partialptr) == 0) { -+ if (verbose > 2) { -+ rprintf(FINFO, "found renamed: %s => %s\n", -+ fname, partialptr); ++ if (!dry_run) { ++ if ((partialptr = partial_dir_fname(fn)) == NULL ++ || !handle_partial_dir(partialptr, PDIR_CREATE)) ++ return; ++ /* We only use the file if we can hard-link it into our tmp dir. */ ++ if (link(fname, partialptr) != 0) { ++ if (errno != EEXIST) ++ handle_partial_dir(partialptr, PDIR_DELETE); ++ return; + } -+ return; + } + -+ if (errno != EEXIST) -+ handle_partial_dir(partialptr, PDIR_DELETE); ++ /* I think this falls into the -vv category with "%s is uptodate", etc. */ ++ if (verbose > 1) ++ rprintf(FINFO, "found renamed: %s => %s\n", fname, fn); +} - - /* Delete a file or directory. If DEL_FORCE_RECURSE is set in the flags, or if - * force_delete is set, this will delete recursively. ++ + /* Delete a file or directory. If DEL_RECURSE is set in the flags, this will + * delete recursively. * - * Note that fname must point to a MAXPATHLEN buffer if the mode indicates it's + * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's * a directory! (The buffer is used for recursion, but returned unchanged.) + * -+ * Also Note: --detect-rename may use this routine with DEL_NO_DELETIONS set! ++ * Also note: --detect-rename may use this routine with DEL_NO_DELETIONS set! */ - static int delete_item(char *fname, int mode, int flags) + static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) { -@@ -122,6 +234,8 @@ static int delete_item(char *fname, int - char *p; - - if (!S_ISDIR(mode)) { -+ if (flags & DEL_NO_DELETIONS) -+ return 0; - if (max_delete && ++deletion_count > max_delete) - return 0; - if (make_backups && (backup_dir || !is_backup_file(fname))) -@@ -144,6 +258,7 @@ static int delete_item(char *fname, int - - zap_dir = flags & DEL_FORCE_RECURSE || force_delete; - if ((max_delete && ++deletion_count > max_delete) -+ || flags & DEL_NO_DELETIONS - || (dry_run && zap_dir)) { - ok = 0; - errno = ENOTEMPTY; -@@ -186,6 +301,8 @@ static int delete_item(char *fname, int - continue; - - strlcpy(p, fp->basename, remainder); +@@ -162,6 +276,8 @@ static enum delret delete_item(char *fbu + goto check_ret; + /* OK: try to delete the directory. */ + } ++ if (flags & DEL_NO_DELETIONS) ++ return DR_SUCCESS; + + if (!replace && max_delete >= 0 && ++deletion_count > max_delete) + return DR_AT_LIMIT; +@@ -208,6 +324,8 @@ static enum delret delete_item(char *fbu + * its contents, otherwise just checks for content. Returns DR_SUCCESS or + * DR_NOT_EMPTY. Note that fname must point to a MAXPATHLEN buffer! (The + * buffer is used for recursion, but returned unchanged.) ++ * ++ * Note: --detect-rename may use this routine with DEL_NO_DELETIONS set! + */ + static enum delret delete_dir_contents(char *fname, int flags) + { +@@ -227,7 +345,9 @@ static enum delret delete_dir_contents(c + save_filters = push_local_filters(fname, dlen); + + non_perishable_cnt = 0; ++ file_extra_cnt += SUM_EXTRA_CNT; + dirlist = get_dirlist(fname, dlen, 0); ++ file_extra_cnt -= SUM_EXTRA_CNT; + ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS; + + if (!dirlist->used) +@@ -264,6 +384,8 @@ static enum delret delete_dir_contents(c + if (S_ISDIR(fp->mode) + && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) + ret = DR_NOT_EMPTY; + if (detect_renamed && S_ISREG(fp->mode)) -+ look_for_rename(fp, fname, dirlist->file_pool); - delete_item(fname, fp->mode, flags & ~DEL_TERSE); ++ look_for_rename(fp, fname); + if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS) + ret = DR_NOT_EMPTY; } - flist_free(dirlist); -@@ -194,7 +311,8 @@ static int delete_item(char *fname, int - - pop_local_filters(save_filters); - -- if (max_delete && ++deletion_count > max_delete) -+ if (flags & DEL_NO_DELETIONS -+ || (max_delete && ++deletion_count > max_delete)) - return 0; - - if (do_rmdir(fname) == 0) { -@@ -214,15 +332,19 @@ static int delete_item(char *fname, int +@@ -416,13 +538,18 @@ static void do_delayed_deletions(char *d * all the --delete-WHEN options. Note that the fbuf pointer must point to a * MAXPATHLEN buffer with the name of the directory in it (the functions we * call will append names onto the end, but the old dir value will be restored - * on exit). */ +-static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) + * on exit). + * + * Note: --detect-rename may use this routine with DEL_NO_DELETIONS set! + */ - static void delete_in_dir(struct file_list *flist, char *fbuf, -- struct file_struct *file, STRUCT_STAT *stp) -+ struct file_struct *file, STRUCT_STAT *stp, int flags) ++static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev, ++ int flags) { - static int min_depth = MAXPATHLEN, cur_depth = -1; - static void *filt_array[MAXPATHLEN/2+1]; static int already_warned = 0; struct file_list *dirlist; - char delbuf[MAXPATHLEN]; +- int dlen, i; + char *p, delbuf[MAXPATHLEN]; + unsigned remainder; - int dlen, i; ++ int dlen, i, restore_dot = 0; - if (!flist) { -@@ -236,6 +358,8 @@ static void delete_in_dir(struct file_li + if (!fbuf) { + change_local_filter_dir(NULL, 0, 0); +@@ -432,21 +559,28 @@ static void delete_in_dir(char *fbuf, st if (verbose > 2) rprintf(FINFO, "delete_in_dir(%s)\n", fbuf); -+ flags |= DEL_FORCE_RECURSE; ++ flags |= DEL_RECURSE; + if (allowed_lull) maybe_send_keepalive(); -@@ -243,12 +367,14 @@ static void delete_in_dir(struct file_li - return; /* Impossible... */ - - if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) { + if (io_error && !ignore_errors) { - if (already_warned) + if (!already_warned) { + rprintf(FINFO, @@ -357,93 +384,102 @@ TODO: + flags |= DEL_NO_DELETIONS; } - while (cur_depth >= file->dir.depth && cur_depth >= min_depth) -@@ -259,6 +385,9 @@ static void delete_in_dir(struct file_li dlen = strlen(fbuf); - filt_array[cur_depth] = push_local_filters(fbuf, dlen); + change_local_filter_dir(fbuf, dlen, F_DEPTH(file)); + if (detect_renamed) + unexplored_dirs--; + if (one_file_system) { if (file->flags & FLAG_TOP_DIR) - filesystem_dev = stp->st_dev; -@@ -268,18 +397,30 @@ static void delete_in_dir(struct file_li + filesystem_dev = *fs_dev; +@@ -456,6 +590,14 @@ static void delete_in_dir(char *fbuf, st dirlist = get_dirlist(fbuf, dlen, 0); + p = fbuf + dlen; -+ if (dlen != 1 || *fbuf != '/') ++ if (dlen == 1 && *fbuf == '.') { ++ restore_dot = 1; ++ p = fbuf; ++ } else if (dlen != 1 || *fbuf != '/') + *p++ = '/'; + remainder = MAXPATHLEN - (p - fbuf); + /* If an item in dirlist is not found in flist, delete it * from the filesystem. */ - for (i = dirlist->count; i--; ) { - struct file_struct *fp = dirlist->files[i]; - if (!fp->basename || fp->flags & FLAG_MOUNT_POINT) + for (i = dirlist->used; i--; ) { +@@ -468,16 +610,25 @@ static void delete_in_dir(char *fbuf, st + f_name(fp, NULL)); continue; + } + if (detect_renamed && S_ISREG(fp->mode)) { + strlcpy(p, fp->basename, remainder); -+ look_for_rename(fp, fbuf, dirlist->file_pool); ++ look_for_rename(fp, fbuf); + } - if (flist_find(flist, fp) < 0) { + if (flist_find(cur_flist, fp) < 0) { f_name(fp, delbuf); -- delete_item(delbuf, fp->mode, DEL_FORCE_RECURSE); +- if (delete_during == 2) { ++ if (delete_during == 2 && !(flags & DEL_NO_DELETIONS)) { + if (!remember_delete(fp, delbuf)) + break; + } else +- delete_item(delbuf, fp->mode, NULL, DEL_RECURSE); - } -+ delete_item(delbuf, fp->mode, flags); ++ delete_item(delbuf, fp->mode, NULL, flags); + } else if (detect_renamed && S_ISDIR(fp->mode)) + unexplored_dirs++; } ++ if (restore_dot) ++ fbuf[0] = '.'; + fbuf[dlen] = '\0'; + flist_free(dirlist); } -@@ -309,9 +450,9 @@ static void do_delete_pass(struct file_l +@@ -507,9 +658,9 @@ static void do_delete_pass(void) || !S_ISDIR(st.st_mode)) continue; -- delete_in_dir(flist, fbuf, file, &st); -+ delete_in_dir(flist, fbuf, file, &st, 0); +- delete_in_dir(fbuf, file, &st.st_dev); ++ delete_in_dir(fbuf, file, &st.st_dev, 0); } -- delete_in_dir(NULL, NULL, NULL, NULL); -+ delete_in_dir(NULL, NULL, NULL, NULL, 0); +- delete_in_dir(NULL, NULL, &dev_zero); ++ delete_in_dir(NULL, NULL, &dev_zero, 0); if (do_progress && !am_server) rprintf(FINFO, " \r"); -@@ -756,6 +897,7 @@ static int try_dests_non(struct file_str - return -1; +@@ -1106,6 +1257,7 @@ static void list_file_entry(struct file_ + } } +static struct bitbag *delayed_bits = NULL; static int phase = 0; + static int dflt_perms; - /* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir, -@@ -910,8 +1052,12 @@ static void recv_generator(char *fname, - && verbose && code && f_out != -1) - rprintf(code, "%s/\n", fname); - if (delete_during && f_out != -1 && !phase && dry_run < 2 -- && (file->flags & FLAG_DEL_HERE)) -- delete_in_dir(the_file_list, fname, file, &st); -+ && (file->flags & FLAG_DEL_HERE)) { -+ if (detect_renamed && statret != 0) +@@ -1350,8 +1502,12 @@ static void recv_generator(char *fname, + } + } + else if (delete_during && f_out != -1 && !phase && dry_run < 2 +- && (file->flags & FLAG_CONTENT_DIR)) +- delete_in_dir(fname, file, &real_sx.st.st_dev); ++ && (file->flags & FLAG_CONTENT_DIR)) { ++ if (detect_renamed && real_ret != 0) + unexplored_dirs++; -+ delete_in_dir(the_file_list, fname, file, &st, ++ delete_in_dir(fname, file, &real_sx.st.st_dev, + delete_during < 0 ? DEL_NO_DELETIONS : 0); + } - return; + goto cleanup; } -@@ -1150,8 +1296,14 @@ static void recv_generator(char *fname, - && hard_link_check(file, ndx, fname, statret, &st, - itemizing, code, HL_SKIP)) - return; +@@ -1629,8 +1785,14 @@ static void recv_generator(char *fname, + goto cleanup; + } + #endif - if (stat_errno == ENOENT) + if (stat_errno == ENOENT) { + if (detect_renamed && unexplored_dirs > 0 -+ && file->length) { ++ && F_LENGTH(file)) { + bitbag_set_bit(delayed_bits, ndx); + return; + } @@ -451,54 +487,64 @@ TODO: + } rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s", full_fname(fname)); - return; -@@ -1329,11 +1481,17 @@ void generate_files(int f_out, struct fi - (long)getpid(), flist->count); - } + goto cleanup; +@@ -1966,6 +2128,12 @@ void generate_files(int f_out, const cha + if (verbose > 2) + rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid()); + if (detect_renamed) { -+ delayed_bits = bitbag_create(flist->count); ++ delayed_bits = bitbag_create(cur_flist->used); + if (!delete_before && !delete_during) + delete_during = -1; + } + - if (delete_before && !local_name && flist->count > 0) - do_delete_pass(flist); + if (delete_before && !solo_file && cur_flist->used > 0) + do_delete_pass(); + if (delete_during == 2) { +@@ -1976,7 +2144,7 @@ void generate_files(int f_out, const cha + } do_progress = 0; -- if (append_mode || whole_file < 0) -+ if (append_mode || detect_renamed || whole_file < 0) +- if (append_mode > 0 || whole_file < 0) ++ if (append_mode > 0 || detect_renamed || whole_file < 0) whole_file = 0; if (verbose >= 2) { rprintf(FINFO, "delta-transmission %s\n", -@@ -1388,7 +1546,23 @@ void generate_files(int f_out, struct fi - } - recv_generator(NULL, NULL, 0, 0, 0, code, -1); +@@ -2014,7 +2182,7 @@ void generate_files(int f_out, const cha + dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); + } else + dirdev = MAKEDEV(0, 0); +- delete_in_dir(f_name(fp, fbuf), fp, &dirdev); ++ delete_in_dir(f_name(fp, fbuf), fp, &dirdev, 0); + } + } + } +@@ -2059,7 +2227,21 @@ void generate_files(int f_out, const cha + } while ((cur_flist = cur_flist->next) != NULL); + if (delete_during) -- delete_in_dir(NULL, NULL, NULL, NULL); -+ delete_in_dir(NULL, NULL, NULL, NULL, 0); -+ +- delete_in_dir(NULL, NULL, &dev_zero); ++ delete_in_dir(NULL, NULL, &dev_zero, 0); + if (detect_renamed) { + if (delete_during < 0) + delete_during = 0; + detect_renamed = 0; + + for (i = -1; (i = bitbag_next_bit(delayed_bits, i)) >= 0; ) { -+ struct file_struct *file = flist->files[i]; ++ struct file_struct *file = cur_flist->files[i]; + if (local_name) + strlcpy(fbuf, local_name, sizeof fbuf); + else + f_name(file, fbuf); -+ recv_generator(fbuf, file, i, itemizing, -+ maybe_ATTRS_REPORT, code, f_out); ++ recv_generator(fbuf, file, i, itemizing, code, f_out); + } + } - phase++; - csum_length = SUM_LENGTH; + if (verbose > 2) + rprintf(FINFO, "generate_files phase=%d\n", phase); --- old/options.c +++ new/options.c -@@ -76,6 +76,7 @@ int am_generator = 0; +@@ -80,6 +80,7 @@ int am_generator = 0; int am_starting_up = 1; int relative_paths = -1; int implied_dirs = 1; @@ -506,7 +552,7 @@ TODO: int numeric_ids = 0; int allow_8bit_chars = 0; int force_delete = 0; -@@ -334,6 +335,7 @@ void usage(enum logcode F) +@@ -383,6 +384,7 @@ void usage(enum logcode F) 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"); @@ -514,15 +560,15 @@ TODO: rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n"); rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n"); -@@ -481,6 +483,7 @@ static struct poptOption long_options[] +@@ -561,6 +563,7 @@ 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 }, {"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 }, {"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 }, - {"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 }, -@@ -1340,7 +1343,7 @@ int parse_arguments(int *argc, const cha + {"no-compress", 0, POPT_ARG_VAL, &do_compression, 0, 0, 0 }, +@@ -1532,7 +1535,7 @@ int parse_arguments(int *argc_p, const c inplace = 1; } @@ -531,7 +577,7 @@ TODO: partial_dir = tmp_partialdir; if (inplace) { -@@ -1349,6 +1352,7 @@ int parse_arguments(int *argc, const cha +@@ -1541,6 +1544,7 @@ int parse_arguments(int *argc_p, const c snprintf(err_buf, sizeof err_buf, "--%s cannot be used with --%s\n", append_mode ? "append" : "inplace", @@ -539,18 +585,18 @@ TODO: delay_updates ? "delay-updates" : "partial-dir"); return 0; } -@@ -1651,6 +1655,8 @@ void server_options(char **args,int *arg +@@ -1885,6 +1889,8 @@ void server_options(char **args, int *ar args[ac++] = "--super"; if (size_only) args[ac++] = "--size-only"; + if (detect_renamed) + args[ac++] = "--detect-renamed"; - } - - if (modify_window_set) { + } else { + if (skip_compress) { + if (asprintf(&arg, "--skip-compress=%s", skip_compress) < 0) --- old/rsync.yo +++ new/rsync.yo -@@ -362,6 +362,7 @@ to the detailed description below for a +@@ -384,6 +384,7 @@ to the detailed description below for a --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 @@ -558,13 +604,19 @@ TODO: --compare-dest=DIR also compare received files relative to DIR --copy-dest=DIR ... and include copies of unchanged files --link-dest=DIR hardlink to files in DIR when unchanged -@@ -1240,6 +1241,15 @@ Note that the use of the bf(--delete) op +@@ -1430,6 +1431,21 @@ Note that the use of the bf(--delete) op fuzzy-match files, so either use bf(--delete-after) or specify some filename exclusions if you need to prevent this. -+dit(bf(--detect-renamed)) This option tells rsync to scan the receiving -+side for files that have been renamed, and to use any that are found as -+alternate basis files to help speed up the transfer. ++dit(bf(--detect-renamed)) With this option, for each new source file ++(call it em(src/S)), rsync looks for a file em(dest/D) anywhere in the ++destination that passes the quick check with em(src/S). If such a em(dest/D) ++is found, rsync uses it as an alternate basis for transferring em(S). The ++idea is that if em(src/S) was renamed from em(src/D) (as opposed to em(src/S) ++passing the quick check with em(dest/D) by coincidence), the delta-transfer ++algorithm will find that all the data matches between em(src/S) and em(dest/D), ++and the transfer will be really fast. ++ +By default, alternate-basis files are hard-linked into a directory named +".~tmp~" in each file's destination directory, but if you've specified +the bf(--partial-dir) option, that directory will be used instead. These @@ -576,7 +628,7 @@ TODO: files against doing transfers (if the files are missing in the destination --- old/util.c +++ new/util.c -@@ -1013,6 +1013,32 @@ int handle_partial_dir(const char *fname +@@ -1030,6 +1030,32 @@ int handle_partial_dir(const char *fname return 1; }