X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fc068916893d69f75d9eab25b5ebd46ed5341683..9fa103b8814d1a53ffefc75d8949d8c1ba3d222c:/detect-renamed.diff diff --git a/detect-renamed.diff b/detect-renamed.diff index 984694e..9e61a02 100644 --- a/detect-renamed.diff +++ b/detect-renamed.diff @@ -32,9 +32,28 @@ TODO: a file that can't use it, while missing out on giving it to a file that could use it. +--- old/compat.c ++++ new/compat.c +@@ -47,6 +47,7 @@ extern int preserve_hard_links; + extern int need_messages_from_generator; + extern int delete_mode, delete_before, delete_during, delete_after; + extern int delete_excluded; ++extern int detect_renamed; + extern int make_backups; + extern char *backup_dir, *backup_suffix; + extern char *partial_dir; +@@ -163,7 +164,7 @@ void setup_protocol(int f_out,int f_in) + } else if (protocol_version >= 30) { + if (recurse && allow_inc_recurse && !preserve_hard_links + && !delete_before && !delete_after && !delay_updates +- && !prune_empty_dirs) ++ && !prune_empty_dirs && !detect_renamed) + inc_recurse = 1; + need_messages_from_generator = 1; + } --- old/flist.c +++ new/flist.c -@@ -56,6 +56,7 @@ extern int non_perishable_cnt; +@@ -57,6 +57,7 @@ extern int non_perishable_cnt; extern int prune_empty_dirs; extern int copy_links; extern int copy_unsafe_links; @@ -42,16 +61,16 @@ TODO: extern int protocol_version; extern int sanitize_paths; extern struct stats stats; -@@ -86,6 +87,8 @@ static int64 tmp_dev, tmp_ino; +@@ -87,6 +88,8 @@ static int64 tmp_dev, tmp_ino; #endif - static char tmp_sum[MD4_SUM_LENGTH]; + static char tmp_sum[MAX_DIGEST_LEN]; +struct file_list the_fattr_list; + - static char empty_sum[MD4_SUM_LENGTH]; + static char empty_sum[MAX_DIGEST_LEN]; static int flist_count_offset; /* for --delete --progress */ -@@ -268,6 +271,45 @@ static mode_t from_wire_mode(int mode) +@@ -273,6 +276,45 @@ static mode_t from_wire_mode(int mode) return mode; } @@ -97,7 +116,7 @@ TODO: static void send_directory(int f, struct file_list *flist, int ndx, char *fbuf, int len, int flags); -@@ -1702,6 +1744,25 @@ struct file_list *recv_file_list(int f) +@@ -1767,6 +1809,25 @@ struct file_list *recv_file_list(int f) clean_flist(flist, relative_paths, 1); @@ -120,7 +139,7 @@ TODO: + the_fattr_list.high = j; + } + - if (incremental) { + if (inc_recurse) { qsort(dir_flist->files + dstart, dir_flist->count - dstart, sizeof dir_flist->files[0], (int (*)())file_compare); --- old/generator.c @@ -133,7 +152,7 @@ TODO: extern int whole_file; extern int list_only; extern int new_root_dir; -@@ -95,6 +96,7 @@ extern char *backup_suffix; +@@ -96,6 +97,7 @@ extern char *backup_suffix; extern int backup_suffix_len; extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct filter_list_struct server_filter_list; @@ -141,7 +160,7 @@ TODO: int ignore_perishable = 0; int non_perishable_cnt = 0; -@@ -102,12 +104,14 @@ int maybe_ATTRS_REPORT = 0; +@@ -103,6 +105,7 @@ int maybe_ATTRS_REPORT = 0; static dev_t dev_zero; static int deletion_count = 0; /* used to implement --max-delete */ @@ -149,7 +168,9 @@ TODO: static int deldelay_size = 0, deldelay_cnt = 0; static char *deldelay_buf = NULL; static int deldelay_fd = -1; - static BOOL solo_file = 0; +@@ -111,7 +114,8 @@ static int dir_tweaking; + static int need_retouch_dir_times; + 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(). */ @@ -157,7 +178,7 @@ TODO: #define DEL_RECURSE (1<<1) /* recurse */ #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ -@@ -129,11 +133,120 @@ static int is_backup_file(char *fn) +@@ -133,11 +137,120 @@ static int is_backup_file(char *fn) return k > 0 && strcmp(fn+k, backup_suffix) == 0; } @@ -183,14 +204,14 @@ TODO: + continue; + } + if (always_checksum) { -+ /* We use the FLAG_SENT flag to indicate when we ++ /* We use the FLAG_FILE_SENT flag to indicate when we + * have computed the checksum for an entry. */ -+ if (!(f->flags & FLAG_SENT)) { ++ if (!(f->flags & FLAG_FILE_SENT)) { + if (fmid->modtime == f->modtime + && f_name_cmp(fmid, f) == 0) + return -1; /* assume we can't help */ + file_checksum(fname, (char*)F_SUM(f), F_LENGTH(f)); -+ f->flags |= FLAG_SENT; ++ f->flags |= FLAG_FILE_SENT; + } + diff = u_memcmp(F_SUM(fmid), F_SUM(f), checksum_len); + if (diff) { @@ -278,7 +299,7 @@ TODO: */ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) { -@@ -155,6 +268,8 @@ static enum delret delete_item(char *fbu +@@ -159,6 +272,8 @@ static enum delret delete_item(char *fbu goto check_ret; /* OK: try to delete the directory. */ } @@ -287,7 +308,7 @@ TODO: if (!replace && max_delete >= 0 && ++deletion_count > max_delete) return DR_AT_LIMIT; -@@ -201,6 +316,8 @@ static enum delret delete_item(char *fbu +@@ -205,6 +320,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.) @@ -296,7 +317,7 @@ TODO: */ static enum delret delete_dir_contents(char *fname, int flags) { -@@ -220,7 +337,9 @@ static enum delret delete_dir_contents(c +@@ -224,7 +341,9 @@ static enum delret delete_dir_contents(c save_filters = push_local_filters(fname, dlen); non_perishable_cnt = 0; @@ -306,7 +327,7 @@ TODO: ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS; if (!dirlist->count) -@@ -257,6 +376,8 @@ static enum delret delete_dir_contents(c +@@ -261,6 +380,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; @@ -315,7 +336,7 @@ TODO: if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS) ret = DR_NOT_EMPTY; } -@@ -409,13 +530,17 @@ static void do_delayed_deletions(char *d +@@ -413,13 +534,17 @@ 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 @@ -336,7 +357,7 @@ TODO: int dlen, i; if (!flist) { -@@ -426,21 +551,28 @@ static void delete_in_dir(struct file_li +@@ -430,21 +555,28 @@ static void delete_in_dir(struct file_li if (verbose > 2) rprintf(FINFO, "delete_in_dir(%s)\n", fbuf); @@ -370,7 +391,7 @@ TODO: if (one_file_system) { if (file->flags & FLAG_TOP_DIR) filesystem_dev = *fs_dev; -@@ -450,6 +582,11 @@ static void delete_in_dir(struct file_li +@@ -454,6 +586,11 @@ static void delete_in_dir(struct file_li dirlist = get_dirlist(fbuf, dlen, 0); @@ -382,7 +403,7 @@ TODO: /* If an item in dirlist is not found in flist, delete it * from the filesystem. */ for (i = dirlist->count; i--; ) { -@@ -462,16 +599,23 @@ static void delete_in_dir(struct file_li +@@ -466,16 +603,23 @@ static void delete_in_dir(struct file_li f_name(fp, NULL)); continue; } @@ -409,7 +430,7 @@ TODO: flist_free(dirlist); } -@@ -501,9 +645,9 @@ static void do_delete_pass(struct file_l +@@ -505,9 +649,9 @@ static void do_delete_pass(struct file_l || !S_ISDIR(st.st_mode)) continue; @@ -421,32 +442,32 @@ TODO: if (do_progress && !am_server) rprintf(FINFO, " \r"); -@@ -1038,6 +1182,7 @@ static int try_dests_non(struct file_str +@@ -1041,6 +1185,7 @@ static int try_dests_non(struct file_str return j; } +static struct bitbag *delayed_bits = NULL; static int phase = 0; + static int dflt_perms; - /* Acts on cur_flist->file's ndx'th item, whose name is fname. If a dir, -@@ -1229,8 +1374,12 @@ static void recv_generator(char *fname, +@@ -1237,8 +1382,12 @@ static void recv_generator(char *fname, } } else if (delete_during && f_out != -1 && !phase && dry_run < 2 - && (file->flags & FLAG_XFER_DIR)) -- delete_in_dir(cur_flist, fname, file, &real_st.st_dev); +- delete_in_dir(cur_flist, fname, file, &real_sx.st.st_dev); + && (file->flags & FLAG_XFER_DIR)) { + if (detect_renamed && real_ret != 0) + unexplored_dirs++; -+ delete_in_dir(cur_flist, fname, file, &real_st.st_dev, ++ delete_in_dir(cur_flist, fname, file, &real_sx.st.st_dev, + delete_during < 0 ? DEL_NO_DELETIONS : 0); + } - return; + goto cleanup; } -@@ -1494,8 +1643,14 @@ static void recv_generator(char *fname, +@@ -1510,8 +1659,14 @@ static void recv_generator(char *fname, if (preserve_hard_links && F_HLINK_NOT_LAST(file)) - return; + goto cleanup; #endif - if (stat_errno == ENOENT) + if (stat_errno == ENOENT) { @@ -459,21 +480,21 @@ TODO: + } rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s", full_fname(fname)); - return; -@@ -1683,6 +1838,12 @@ void generate_files(int f_out, char *loc + goto cleanup; +@@ -1818,6 +1973,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->count); + if (!delete_before && !delete_during) + delete_during = -1; + } + - if (delete_before && !local_name && cur_flist->count > 0) + if (delete_before && !solo_file && cur_flist->count > 0) do_delete_pass(cur_flist); if (delete_during == 2) { -@@ -1693,7 +1854,7 @@ void generate_files(int f_out, char *loc +@@ -1828,7 +1989,7 @@ void generate_files(int f_out, const cha } do_progress = 0; @@ -482,7 +503,7 @@ TODO: whole_file = 0; if (verbose >= 2) { rprintf(FINFO, "delta-transmission %s\n", -@@ -1718,7 +1879,7 @@ void generate_files(int f_out, char *loc +@@ -1855,7 +2016,7 @@ void generate_files(int f_out, const cha dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); } else dirdev = MAKEDEV(0, 0); @@ -491,29 +512,29 @@ TODO: } } for (i = cur_flist->low; i <= cur_flist->high; i++) { -@@ -1764,7 +1925,21 @@ void generate_files(int f_out, char *loc - - if (!incremental) { - if (delete_during) -- delete_in_dir(NULL, NULL, NULL, &dev_zero); -+ delete_in_dir(NULL, NULL, NULL, &dev_zero, 0); -+ if (detect_renamed) { -+ if (delete_during < 0) -+ delete_during = 0; -+ detect_renamed = 0; +@@ -1911,7 +2072,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, &dev_zero); ++ delete_in_dir(NULL, 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]; -+ if (local_name) -+ strlcpy(fbuf, local_name, sizeof fbuf); -+ else -+ f_name(file, fbuf); -+ recv_generator(fbuf, file, i, itemizing, code, f_out); -+ } -+ } - phase++; - if (verbose > 2) { - rprintf(FINFO, "generate_files phase=%d\n", ++ for (i = -1; (i = bitbag_next_bit(delayed_bits, i)) >= 0; ) { ++ 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, code, f_out); ++ } ++ } + phase++; + if (verbose > 2) + rprintf(FINFO, "generate_files phase=%d\n", phase); --- old/options.c +++ new/options.c @@ -78,6 +78,7 @@ int am_generator = 0; @@ -524,7 +545,7 @@ TODO: int numeric_ids = 0; int allow_8bit_chars = 0; int force_delete = 0; -@@ -343,6 +344,7 @@ void usage(enum logcode F) +@@ -352,6 +353,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"); @@ -532,7 +553,7 @@ 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"); -@@ -497,6 +499,7 @@ static struct poptOption long_options[] +@@ -513,6 +515,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 }, @@ -540,7 +561,7 @@ TODO: {"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 }, -@@ -1368,7 +1371,7 @@ int parse_arguments(int *argc, const cha +@@ -1402,7 +1405,7 @@ int parse_arguments(int *argc, const cha inplace = 1; } @@ -549,7 +570,7 @@ TODO: partial_dir = tmp_partialdir; if (inplace) { -@@ -1377,6 +1380,7 @@ int parse_arguments(int *argc, const cha +@@ -1411,6 +1414,7 @@ int parse_arguments(int *argc, const cha snprintf(err_buf, sizeof err_buf, "--%s cannot be used with --%s\n", append_mode ? "append" : "inplace", @@ -557,7 +578,7 @@ TODO: delay_updates ? "delay-updates" : "partial-dir"); return 0; } -@@ -1690,6 +1694,8 @@ void server_options(char **args,int *arg +@@ -1724,6 +1728,8 @@ void server_options(char **args,int *arg args[ac++] = "--super"; if (size_only) args[ac++] = "--size-only"; @@ -568,7 +589,7 @@ TODO: if (modify_window_set) { --- old/rsync.yo +++ new/rsync.yo -@@ -364,6 +364,7 @@ to the detailed description below for a +@@ -365,6 +365,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 @@ -576,7 +597,7 @@ 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 -@@ -1272,6 +1273,15 @@ Note that the use of the bf(--delete) op +@@ -1305,6 +1306,15 @@ 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. @@ -594,7 +615,7 @@ TODO: files against doing transfers (if the files are missing in the destination --- old/util.c +++ new/util.c -@@ -1027,6 +1027,32 @@ int handle_partial_dir(const char *fname +@@ -1026,6 +1026,32 @@ int handle_partial_dir(const char *fname return 1; }