Wayne Davison [Mon, 14 Feb 2005 02:55:16 +0000 (02:55 +0000)]
Fixed failing hunks.
Wayne Davison [Mon, 14 Feb 2005 02:45:00 +0000 (02:45 +0000)]
Applied to trunk.
Wayne Davison [Sun, 13 Feb 2005 22:03:14 +0000 (22:03 +0000)]
Fixed patch fuzz.
Wayne Davison [Sun, 13 Feb 2005 22:01:54 +0000 (22:01 +0000)]
Fixed a failing hunk.
Wayne Davison [Sun, 13 Feb 2005 21:53:26 +0000 (21:53 +0000)]
- If we find a file with an identical size & mod-time to the file
on the server, prefer that over any similarly named file.
- Added the short-option -y for specifying --fuzzy.
Wayne Davison [Sun, 13 Feb 2005 21:24:04 +0000 (21:24 +0000)]
Added FLAG_NO_FUZZY.
Wayne Davison [Sun, 13 Feb 2005 10:10:50 +0000 (10:10 +0000)]
- Fixed a couple bugs in find_filename_suffix().
- Upgraded the fuzzy algorithm to scan the entire parent dir for a
file into a file_list object when the first file for a particular
directory is handled. This avoids rescanning the directory for
each missing file, and also avoids the problem of finding: a non-
regular file, an active rsync temp-file, a file that is being
updated by the receiver, or a server-excluded file.
Wayne Davison [Sun, 13 Feb 2005 07:00:00 +0000 (07:00 +0000)]
Fixed failing hunks.
Wayne Davison [Sat, 12 Feb 2005 20:01:43 +0000 (20:01 +0000)]
Fixed some patch fuzz.
Wayne Davison [Sat, 12 Feb 2005 20:01:28 +0000 (20:01 +0000)]
- Ignore 1-line of fuzz unless --minor-updates was specified.
- Added --failures-only (-f) option.
Wayne Davison [Sat, 12 Feb 2005 19:54:17 +0000 (19:54 +0000)]
Applied to the trunk.
Wayne Davison [Sat, 12 Feb 2005 19:27:58 +0000 (19:27 +0000)]
Fixed a failing hunk.
Wayne Davison [Sat, 12 Feb 2005 19:25:54 +0000 (19:25 +0000)]
- We don't need to ignore local rules in send_file_name() anymore
when --delete-excluded was specified because the local filter
list has already been pruned of any rules that don't apply on
the receiver. This simplification removes the need for the code
that set delete_excluded to 2 for protocol_version >= 29.
- Improved the code in get_rule_prefix() to always supply the full
list of prefixes for protocol_version >= 29.
- Don't ever avoid a get_rule_prefix() when trimming the filter list
without sending it because it is the function that tells us if a
rule is too modern for the other side to deal with (e.g. if we
couldn't send the protect rules to the receiver).
Wayne Davison [Fri, 11 Feb 2005 23:25:23 +0000 (23:25 +0000)]
Fixed hunk fuzz.
Wayne Davison [Fri, 11 Feb 2005 23:22:00 +0000 (23:22 +0000)]
Fixed a failing hunk for the latest manpage.
Wayne Davison [Fri, 11 Feb 2005 22:51:12 +0000 (22:51 +0000)]
Fixed failing hunk.
Wayne Davison [Fri, 11 Feb 2005 22:47:21 +0000 (22:47 +0000)]
Made the hide/protect antonym rules better.
Wayne Davison [Fri, 11 Feb 2005 20:41:37 +0000 (20:41 +0000)]
A new option: --append.
Wayne Davison [Fri, 11 Feb 2005 17:21:48 +0000 (17:21 +0000)]
- Fixed a failing hunk.
- Improved the docs a bit.
Wayne Davison [Wed, 9 Feb 2005 05:00:06 +0000 (05:00 +0000)]
Fixed a bug in the propagation of a filter rule's "r" modifier
to a server-sender.
Wayne Davison [Tue, 8 Feb 2005 19:14:19 +0000 (19:14 +0000)]
- Added long-name versions of the options.
- Added "send" and "unprotect" (opposites of "hide" and "protect").
Wayne Davison [Mon, 7 Feb 2005 21:13:19 +0000 (21:13 +0000)]
Fixed failing hunks.
Wayne Davison [Sun, 6 Feb 2005 07:27:39 +0000 (07:27 +0000)]
Fixed a failing hunk.
Wayne Davison [Sat, 5 Feb 2005 17:54:22 +0000 (17:54 +0000)]
Updated to apply to 1.3.5.
Wayne Davison [Sat, 5 Feb 2005 07:25:54 +0000 (07:25 +0000)]
A patch that makes it possible to write filter rules that affect
the sender, the receiver, or both (the latter can protect against
the deleting power of --delete-excluded).
Wayne Davison [Sat, 5 Feb 2005 01:25:10 +0000 (01:25 +0000)]
Fixed a failing hunk.
Wayne Davison [Thu, 3 Feb 2005 02:12:24 +0000 (02:12 +0000)]
Updated to apply cleanly.
Wayne Davison [Thu, 3 Feb 2005 02:08:39 +0000 (02:08 +0000)]
Fixed failing hunks.
Wayne Davison [Sun, 30 Jan 2005 10:13:33 +0000 (10:13 +0000)]
Fixed failing hunks.
Wayne Davison [Fri, 28 Jan 2005 19:36:25 +0000 (19:36 +0000)]
Fixed failing hunks.
Wayne Davison [Fri, 28 Jan 2005 17:14:14 +0000 (17:14 +0000)]
Added check to ensure that a read-only daemon doesn't honor
--delete-sent-files.
Wayne Davison [Thu, 27 Jan 2005 22:48:03 +0000 (22:48 +0000)]
Applied to the trunk with option renamed to be --delay-updates.
Wayne Davison [Thu, 27 Jan 2005 22:25:30 +0000 (22:25 +0000)]
Applied to the trunk.
Wayne Davison [Tue, 25 Jan 2005 18:16:34 +0000 (18:16 +0000)]
Added .rsync-filter.
Wayne Davison [Tue, 25 Jan 2005 12:18:25 +0000 (12:18 +0000)]
substitute exclude -> filter, as appropriate.
Wayne Davison [Tue, 25 Jan 2005 09:35:46 +0000 (09:35 +0000)]
Some more doc changes and a couple minor code tweaks.
Wayne Davison [Tue, 25 Jan 2005 03:39:03 +0000 (03:39 +0000)]
Got rid of patch fuzz.
Wayne Davison [Tue, 25 Jan 2005 03:29:55 +0000 (03:29 +0000)]
Fixed two failing hunks.
Wayne Davison [Tue, 25 Jan 2005 00:53:42 +0000 (00:53 +0000)]
Applied to trunk (with a few changes).
Wayne Davison [Mon, 24 Jan 2005 02:26:08 +0000 (02:26 +0000)]
Fixed some failing hunks.
Wayne Davison [Mon, 24 Jan 2005 02:11:44 +0000 (02:11 +0000)]
Get rid of some fuzz.
Wayne Davison [Mon, 24 Jan 2005 02:08:40 +0000 (02:08 +0000)]
Fixed failing hunks.
Wayne Davison [Mon, 24 Jan 2005 02:08:26 +0000 (02:08 +0000)]
Got rid of dependency on delete-during.diff.
Wayne Davison [Mon, 24 Jan 2005 02:05:37 +0000 (02:05 +0000)]
Rejected (using omit-dir-times.diff instead).
Wayne Davison [Mon, 24 Jan 2005 01:42:23 +0000 (01:42 +0000)]
Applied to the turnk (with a few tweaks).
Wayne Davison [Mon, 24 Jan 2005 00:52:45 +0000 (00:52 +0000)]
Applied to the trunk.
Wayne Davison [Mon, 24 Jan 2005 00:30:15 +0000 (00:30 +0000)]
Got rid of some fuzz.
Wayne Davison [Mon, 24 Jan 2005 00:29:53 +0000 (00:29 +0000)]
Changed the short option from -d to -O.
Wayne Davison [Mon, 24 Jan 2005 00:28:30 +0000 (00:28 +0000)]
Fixed a failing hunk.
Wayne Davison [Sun, 23 Jan 2005 08:07:40 +0000 (08:07 +0000)]
- Improved the comment in front of send_file_list().
- Dropped the do_subdir arg from delete_in_dir().
- Improved the logic in delete_in_dir() and send_file_list() for
handling the various --delete* types.
Wayne Davison [Sun, 23 Jan 2005 07:36:18 +0000 (07:36 +0000)]
Fixed failing hunks.
Wayne Davison [Sun, 23 Jan 2005 07:16:56 +0000 (07:16 +0000)]
Updated to work with latest CVS.
Wayne Davison [Fri, 21 Jan 2005 20:09:01 +0000 (20:09 +0000)]
Some doc improvements.
Wayne Davison [Fri, 21 Jan 2005 19:14:09 +0000 (19:14 +0000)]
Fixed 2-line fuzz.
Wayne Davison [Fri, 21 Jan 2005 19:13:17 +0000 (19:13 +0000)]
Fixed failing hunk.
Wayne Davison [Fri, 21 Jan 2005 18:58:28 +0000 (18:58 +0000)]
Changed the name of the .rsync-rules file (used by -F) to
.rsync-filter.
Wayne Davison [Fri, 21 Jan 2005 11:00:18 +0000 (11:00 +0000)]
- Decided to put the new, smaller delete_files() back into
receiver.c.
- Got rid of the call of add_cvs_excludes() in the delete_files()
function because it potentially adds the excludes a second time.
Instead, make sure that the one code path in main.c that was
missing the add_cvs_excludes() call now calls it.
Wayne Davison [Fri, 21 Jan 2005 10:13:37 +0000 (10:13 +0000)]
Mention the need for "make proto".
Wayne Davison [Fri, 21 Jan 2005 02:12:22 +0000 (02:12 +0000)]
Made the new --delete-during work properly with --relative.
Wayne Davison [Fri, 21 Jan 2005 00:06:02 +0000 (00:06 +0000)]
- Fixed some deletion problems where a non-empty directory was
needing to be removed.
- Tweaked the option parsing a bit.
- Removed some of dry-run fixes that already made it into the
CVS version.
Wayne Davison [Thu, 20 Jan 2005 01:18:15 +0000 (01:18 +0000)]
Tweaked the --help text a tad.
Wayne Davison [Thu, 20 Jan 2005 01:04:46 +0000 (01:04 +0000)]
Tweaked the args to find_filename_suffix().
Wayne Davison [Wed, 19 Jan 2005 20:25:34 +0000 (20:25 +0000)]
Fixing failed hunks caused by recent removal of delete_one().
Wayne Davison [Wed, 19 Jan 2005 01:21:47 +0000 (01:21 +0000)]
Made the patch depend on delete-during.diff (though we don't yet
try to use its new functionality). Also added one more TODO item
to the list.
Wayne Davison [Wed, 19 Jan 2005 01:14:28 +0000 (01:14 +0000)]
An improvement to the --delete algorithm that makes it more
efficient. It also lays the groundwork of having a per-dir
file-list on the receiving side that --fuzzy will need to
make it more efficient (and less problematical).
Wayne Davison [Tue, 18 Jan 2005 20:21:21 +0000 (20:21 +0000)]
- Added a caveat about --delete to the --fuzzy description in the
man page.
- Added a "TODO" comment to find_fuzzy().
Wayne Davison [Tue, 18 Jan 2005 19:37:17 +0000 (19:37 +0000)]
- Added a better filename-suffix-finding heuristic, including
the ignoring of useless additional suffixes (such as '~').
- Don't exclude based on suffix, but rate a suffix mismatch more
strongly than a filename mismatch.
- Improved the return from the fuzzy_distance() function when
one of the strings is empty (as is often the case for a
suffix comparison).
Wayne Davison [Tue, 18 Jan 2005 11:29:20 +0000 (11:29 +0000)]
Swapped out the simplistic measure_name() run-length count for
a new fuzzy_distance() function I created that implements a
modified version of the Levenshtein distance algorithm.
Wayne Davison [Mon, 17 Jan 2005 23:44:16 +0000 (23:44 +0000)]
Some preliminary changes got mixed in with the last commit, so
fixed two small problems in the last check-in.
Wayne Davison [Mon, 17 Jan 2005 23:30:40 +0000 (23:30 +0000)]
Got rid of patch-fuzz.
Wayne Davison [Mon, 17 Jan 2005 23:24:26 +0000 (23:24 +0000)]
Fixed a failing hunk.
Wayne Davison [Mon, 17 Jan 2005 23:11:35 +0000 (23:11 +0000)]
Applied to trunk.
Wayne Davison [Mon, 17 Jan 2005 07:04:06 +0000 (07:04 +0000)]
- Added a description of "filter" to the rsyncd.yo doc.
- More rsync.yo documentation tweaks.
Wayne Davison [Mon, 17 Jan 2005 06:31:31 +0000 (06:31 +0000)]
- Fixed the handling of the "!" list-clearing rules.
- Fixed a potential crash bug in the clearing of a per-dir
merge file via "!".
- Simplified the push/pop structure for per-dir merge files.
- Some minor enhancements to exclude.test.
- Improved the parsing of filters rules when the "s" modifier is
used (where rules are split on whitespace).
- Allow '_' to separate the prefix from the suffix in a filter rule.
- Improved some debug messages relating to includes/excludes.
Wayne Davison [Mon, 17 Jan 2005 01:13:17 +0000 (01:13 +0000)]
Twiddled a few defines in h and improved the docs.
Wayne Davison [Mon, 17 Jan 2005 00:45:15 +0000 (00:45 +0000)]
Another round of re-think for the enhanced syntax. This time the
result is something that is 100% backward compatible with (1)
all existing include/exclude files, and (2) older rsync versions
that it shares excludes with over the wire. To enable the new
include/exclude features, the user now uses the --filter (-f)
option.
Wayne Davison [Sun, 16 Jan 2005 01:21:48 +0000 (01:21 +0000)]
- Added modifiers "C" and "E" to the include/exclude +/- rules: -C is
the same as "-p .cvsignore", and "-pE .excl' is the same as both
"-p .excl" and "- .excl". As you might expect, -CE is the same as
"-pE .cvsignore".
- Made the repeating of the -E command-line option add a second exclude
rule: "- .rsync-excludes" (thus -E is short for "-p /.rsync-excludes",
and -EE is short for "-pE /.rsync-excludes").
Wayne Davison [Sun, 16 Jan 2005 00:22:48 +0000 (00:22 +0000)]
Added an entry for --fuzzy to the man page.
Wayne Davison [Sun, 16 Jan 2005 00:22:27 +0000 (00:22 +0000)]
Fixed some patch fuzz.
Wayne Davison [Sun, 16 Jan 2005 00:20:42 +0000 (00:20 +0000)]
Fixed a failing hunk.
Wayne Davison [Sat, 15 Jan 2005 21:36:05 +0000 (21:36 +0000)]
Fixed a failing hunk.
Wayne Davison [Sat, 15 Jan 2005 20:32:23 +0000 (20:32 +0000)]
Fixed a failing hunk.
Wayne Davison [Sat, 15 Jan 2005 20:31:15 +0000 (20:31 +0000)]
The latest --link-dest option is now compatible with --inplace,
so remove that restriction too.
Wayne Davison [Sat, 15 Jan 2005 20:11:27 +0000 (20:11 +0000)]
Fixed some fuzz.
Wayne Davison [Sat, 15 Jan 2005 20:11:17 +0000 (20:11 +0000)]
Fixed a failing hunk.
Wayne Davison [Sat, 15 Jan 2005 06:21:03 +0000 (06:21 +0000)]
Changed the syntax that specifies a merge file. It is now this:
-m /path/single-merge.excludes
+m /path/single-merge.includes
-p .perdir-merge.excludes
+p .perdir-merge.includes
Wayne Davison [Sat, 15 Jan 2005 04:41:42 +0000 (04:41 +0000)]
Fixed a new failing hunk.
Wayne Davison [Fri, 14 Jan 2005 18:34:18 +0000 (18:34 +0000)]
Fixed a failing hunk.
Wayne Davison [Mon, 10 Jan 2005 10:53:12 +0000 (10:53 +0000)]
- Error-check the MSG_SUCCESS values going from the generator to the
sender.
- Tweaked the option-parsing code a little.
Wayne Davison [Mon, 10 Jan 2005 10:45:04 +0000 (10:45 +0000)]
Fixed a failing hunk.
Wayne Davison [Mon, 10 Jan 2005 10:26:21 +0000 (10:26 +0000)]
Delay the renaming of all the temp files until the end of the transfer.
Wayne Davison [Sat, 8 Jan 2005 20:45:37 +0000 (20:45 +0000)]
Improved a sentence in the docs.
Wayne Davison [Sat, 1 Jan 2005 21:21:02 +0000 (21:21 +0000)]
Fixed fuzzy hunks.
Wayne Davison [Sat, 1 Jan 2005 21:20:51 +0000 (21:20 +0000)]
Fixed failing hunks.
Wayne Davison [Fri, 3 Dec 2004 23:43:05 +0000 (23:43 +0000)]
The reverse behavior of the --dir-times option (also in this dir).
Wayne Davison [Mon, 29 Nov 2004 01:40:38 +0000 (01:40 +0000)]
Fixed the code that complains if --fuzzy is combined with --inplace.
Wayne Davison [Sat, 27 Nov 2004 18:39:28 +0000 (18:39 +0000)]
Fixed failing hunks.
Wayne Davison [Sat, 27 Nov 2004 18:35:34 +0000 (18:35 +0000)]
Fixed patch fuzz.
Wayne Davison [Sat, 27 Nov 2004 18:33:59 +0000 (18:33 +0000)]
Promoted to the trunk.
Wayne Davison [Sat, 27 Nov 2004 18:21:46 +0000 (18:21 +0000)]
Fixed failing hunks.