X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/73adde61db8f09341ee81e703c1747990983757a..5ba66156c2f3b31eae4a1ae88a44c1efaf248c9c:/detect-renamed.diff

diff --git a/detect-renamed.diff b/detect-renamed.diff
index 6793e45..ffbb5e5 100644
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -34,7 +34,7 @@ TODO:
 
 --- old/compat.c
 +++ new/compat.c
-@@ -48,6 +48,7 @@ extern int preserve_hard_links;
+@@ -50,6 +50,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;
@@ -42,10 +42,10 @@ TODO:
  extern int make_backups;
  extern char *shell_cmd; /* contains VER.SUB string if client is a pre-release */
  extern char *backup_dir, *backup_suffix;
-@@ -205,7 +206,7 @@ void setup_protocol(int f_out,int f_in)
- 	} else if (protocol_version >= 30) {
+@@ -204,7 +205,7 @@ void setup_protocol(int f_out,int f_in)
  		if (recurse && allow_inc_recurse && !preserve_hard_links
  		 && !delete_before && !delete_after && !delay_updates
+ 		 && (!relative_paths || implied_dirs) && !use_qsort
 -		 && !prune_empty_dirs)
 +		 && !prune_empty_dirs && !detect_renamed)
  			inc_recurse = 1;
@@ -53,7 +53,7 @@ TODO:
  	}
 --- old/flist.c
 +++ new/flist.c
-@@ -59,6 +59,7 @@ extern int non_perishable_cnt;
+@@ -60,6 +60,7 @@ extern int non_perishable_cnt;
  extern int prune_empty_dirs;
  extern int copy_links;
  extern int copy_unsafe_links;
@@ -61,7 +61,7 @@ TODO:
  extern int protocol_version;
  extern int sanitize_paths;
  extern struct stats stats;
-@@ -95,6 +96,8 @@ static int64 tmp_dev, tmp_ino;
+@@ -98,6 +99,8 @@ static int64 tmp_dev, tmp_ino;
  #endif
  static char tmp_sum[MAX_DIGEST_LEN];
  
@@ -69,8 +69,8 @@ TODO:
 +
  static char empty_sum[MAX_DIGEST_LEN];
  static int flist_count_offset; /* for --delete --progress */
- 
-@@ -261,6 +264,45 @@ static int is_excluded(char *fname, int 
+ static int dir_count = 0;
+@@ -265,6 +268,45 @@ static int is_excluded(char *fname, int 
  	return 0;
  }
  
@@ -116,7 +116,7 @@ TODO:
  static void send_directory(int f, struct file_list *flist,
  			   char *fbuf, int len, int flags);
  
-@@ -1855,6 +1897,25 @@ struct file_list *send_file_list(int f, 
+@@ -1929,6 +1971,25 @@ struct file_list *send_file_list(int f, 
  	if (verbose > 2)
  		rprintf(FINFO, "send_file_list done\n");
  
@@ -140,8 +140,8 @@ TODO:
 +	}
 +
  	if (inc_recurse) {
- #ifdef ICONV_OPTION
- 		if (!need_unsorted_flist)
+ 		add_dirs_to_tree(-1, flist, dir_count);
+ 		flist_done_allocating(flist);
 --- old/generator.c
 +++ new/generator.c
 @@ -80,6 +80,7 @@ extern char *basis_dir[];
@@ -168,8 +168,8 @@ TODO:
  static int deldelay_size = 0, deldelay_cnt = 0;
  static char *deldelay_buf = NULL;
  static int deldelay_fd = -1;
-@@ -115,7 +118,8 @@ static int dir_tweaking;
- static int need_retouch_dir_times;
+@@ -116,7 +119,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(). */
@@ -178,7 +178,7 @@ TODO:
  #define DEL_RECURSE		(1<<1) /* recurse */
  #define DEL_DIR_IS_EMPTY	(1<<2) /* internal delete_FUNCTIONS use only */
  
-@@ -137,11 +141,120 @@ static int is_backup_file(char *fn)
+@@ -138,11 +142,120 @@ static int is_backup_file(char *fn)
  	return k > 0 && strcmp(fn+k, backup_suffix) == 0;
  }
  
@@ -210,7 +210,7 @@ TODO:
 +				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));
++				file_checksum(fname, F_SUM(f), F_LENGTH(f));
 +				f->flags |= FLAG_FILE_SENT;
 +			}
 +			diff = u_memcmp(F_SUM(fmid), F_SUM(f), checksum_len);
@@ -299,7 +299,7 @@ TODO:
   */
  static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
  {
-@@ -163,6 +276,8 @@ static enum delret delete_item(char *fbu
+@@ -164,6 +277,8 @@ static enum delret delete_item(char *fbu
  			goto check_ret;
  		/* OK: try to delete the directory. */
  	}
@@ -308,7 +308,7 @@ TODO:
  
  	if (!replace && max_delete >= 0 && ++deletion_count > max_delete)
  		return DR_AT_LIMIT;
-@@ -209,6 +324,8 @@ static enum delret delete_item(char *fbu
+@@ -210,6 +325,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.)
@@ -317,7 +317,7 @@ TODO:
   */
  static enum delret delete_dir_contents(char *fname, int flags)
  {
-@@ -228,7 +345,9 @@ static enum delret delete_dir_contents(c
+@@ -229,7 +346,9 @@ static enum delret delete_dir_contents(c
  	save_filters = push_local_filters(fname, dlen);
  
  	non_perishable_cnt = 0;
@@ -326,8 +326,8 @@ TODO:
 +	file_extra_cnt -= SUM_EXTRA_CNT;
  	ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
  
- 	if (!dirlist->count)
-@@ -265,6 +384,8 @@ static enum delret delete_dir_contents(c
+ 	if (!dirlist->used)
+@@ -266,6 +385,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;
@@ -336,7 +336,7 @@ TODO:
  		if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
  			ret = DR_NOT_EMPTY;
  	}
-@@ -417,12 +538,17 @@ static void do_delayed_deletions(char *d
+@@ -418,12 +539,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
@@ -357,7 +357,7 @@ TODO:
  	int dlen, i;
  
  	if (!fbuf) {
-@@ -433,21 +559,28 @@ static void delete_in_dir(char *fbuf, st
+@@ -434,21 +560,28 @@ static void delete_in_dir(char *fbuf, st
  	if (verbose > 2)
  		rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
  
@@ -391,7 +391,7 @@ TODO:
  	if (one_file_system) {
  		if (file->flags & FLAG_TOP_DIR)
  			filesystem_dev = *fs_dev;
-@@ -457,6 +590,11 @@ static void delete_in_dir(char *fbuf, st
+@@ -458,6 +591,11 @@ static void delete_in_dir(char *fbuf, st
  
  	dirlist = get_dirlist(fbuf, dlen, 0);
  
@@ -402,8 +402,8 @@ TODO:
 +
  	/* If an item in dirlist is not found in flist, delete it
  	 * from the filesystem. */
- 	for (i = dirlist->count; i--; ) {
-@@ -469,16 +607,23 @@ static void delete_in_dir(char *fbuf, st
+ 	for (i = dirlist->used; i--; ) {
+@@ -470,16 +608,23 @@ static void delete_in_dir(char *fbuf, st
  					f_name(fp, NULL));
  			continue;
  		}
@@ -430,7 +430,7 @@ TODO:
  	flist_free(dirlist);
  }
  
-@@ -508,9 +653,9 @@ static void do_delete_pass(void)
+@@ -509,9 +654,9 @@ static void do_delete_pass(void)
  		 || !S_ISDIR(st.st_mode))
  			continue;
  
@@ -442,7 +442,7 @@ TODO:
  
  	if (do_progress && !am_server)
  		rprintf(FINFO, "                    \r");
-@@ -1073,6 +1218,7 @@ static int try_dests_non(struct file_str
+@@ -1074,6 +1219,7 @@ static int try_dests_non(struct file_str
  	return j;
  }
  
@@ -450,7 +450,7 @@ TODO:
  static int phase = 0;
  static int dflt_perms;
  
-@@ -1272,8 +1418,12 @@ static void recv_generator(char *fname, 
+@@ -1298,8 +1444,12 @@ static void recv_generator(char *fname, 
  			}
  		}
  		else if (delete_during && f_out != -1 && !phase && dry_run < 2
@@ -465,7 +465,7 @@ TODO:
  		goto cleanup;
  	}
  
-@@ -1545,8 +1695,14 @@ static void recv_generator(char *fname, 
+@@ -1571,8 +1721,14 @@ static void recv_generator(char *fname, 
  		if (preserve_hard_links && F_HLINK_NOT_LAST(file))
  			goto cleanup;
  #endif
@@ -481,7 +481,7 @@ TODO:
  		rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
  			full_fname(fname));
  		goto cleanup;
-@@ -1861,6 +2017,12 @@ void generate_files(int f_out, const cha
+@@ -1885,6 +2041,12 @@ void generate_files(int f_out, const cha
  	if (verbose > 2)
  		rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
  
@@ -491,10 +491,10 @@ TODO:
 +			delete_during = -1;
 +	}
 +
- 	if (delete_before && !solo_file && cur_flist->count > 0)
+ 	if (delete_before && !solo_file && cur_flist->used > 0)
  		do_delete_pass();
  	if (delete_during == 2) {
-@@ -1871,7 +2033,7 @@ void generate_files(int f_out, const cha
+@@ -1895,7 +2057,7 @@ void generate_files(int f_out, const cha
  	}
  	do_progress = 0;
  
@@ -503,16 +503,16 @@ TODO:
  		whole_file = 0;
  	if (verbose >= 2) {
  		rprintf(FINFO, "delta-transmission %s\n",
-@@ -1898,7 +2060,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);
+@@ -1926,7 +2088,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);
+ 				}
  			}
  		}
- 		for (i = cur_flist->low; i <= cur_flist->high; i++) {
-@@ -1960,7 +2122,21 @@ void generate_files(int f_out, const cha
+@@ -1979,7 +2141,21 @@ void generate_files(int f_out, const cha
  	} while ((cur_flist = cur_flist->next) != NULL);
  
  	if (delete_during)
@@ -537,7 +537,7 @@ TODO:
  		rprintf(FINFO, "generate_files phase=%d\n", phase);
 --- old/options.c
 +++ new/options.c
-@@ -79,6 +79,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;
@@ -545,7 +545,7 @@ TODO:
  int numeric_ids = 0;
  int allow_8bit_chars = 0;
  int force_delete = 0;
-@@ -373,6 +374,7 @@ void usage(enum logcode F)
+@@ -375,6 +376,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");
@@ -553,15 +553,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");
-@@ -541,6 +543,7 @@ static struct poptOption long_options[] 
+@@ -548,6 +550,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 },
-@@ -1472,7 +1475,7 @@ int parse_arguments(int *argc, const cha
+   {"no-compress",      0,  POPT_ARG_VAL,    &do_compression, 0, 0, 0 },
+@@ -1495,7 +1498,7 @@ int parse_arguments(int *argc, const cha
  		inplace = 1;
  	}
  
@@ -570,7 +570,7 @@ TODO:
  		partial_dir = tmp_partialdir;
  
  	if (inplace) {
-@@ -1481,6 +1484,7 @@ int parse_arguments(int *argc, const cha
+@@ -1504,6 +1507,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",
@@ -578,18 +578,18 @@ TODO:
  				 delay_updates ? "delay-updates" : "partial-dir");
  			return 0;
  		}
-@@ -1820,6 +1824,8 @@ void server_options(char **args,int *arg
+@@ -1844,6 +1848,8 @@ void server_options(char **args,int *arg
  			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
-@@ -367,6 +367,7 @@ to the detailed description below for a 
+@@ -388,6 +388,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
@@ -597,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
-@@ -1347,6 +1348,15 @@ Note that the use of the bf(--delete) op
+@@ -1376,6 +1377,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.
  
@@ -615,7 +615,7 @@ TODO:
  files against doing transfers (if the files are missing in the destination
 --- old/util.c
 +++ new/util.c
-@@ -1026,6 +1026,32 @@ int handle_partial_dir(const char *fname
+@@ -1029,6 +1029,32 @@ int handle_partial_dir(const char *fname
  	return 1;
  }