Wayne Davison [Sun, 27 Mar 2005 05:02:49 +0000 (05:02 +0000)]
- Fixed a bug in the saving of the --dirs option's state.
- Added the saving of the --compress option's state.
- Deal with the xfer_dirs var in a better way for pre-29 batches.
Wayne Davison [Thu, 24 Mar 2005 16:41:16 +0000 (16:41 +0000)]
- Don't complain if --dry-run is specified with --read-batch
or --write-batch.
- If --write-batch is combined with --dry-run, just disable
--write-batch (that avoids trying to create a batch file
and tells the user what would be transferred).
Wayne Davison [Tue, 15 Mar 2005 19:19:44 +0000 (19:19 +0000)]
- Made read_item_attrs() detect and reject a pre1/pre2 rsync (used
by both the sender and the receiver).
- Added an extra phase to the end of the transfer to better handle
delayed updates that have hard links.
Wayne Davison [Tue, 15 Mar 2005 19:19:38 +0000 (19:19 +0000)]
- Added an extra phase to the end of the transfer to better handle
delayed updates that have hard links.
- Send the new ITEM_DUMMY_BIT to the sender so that we can figure
out if the other side is pre1 or pre2 and let the receiver reject
it.
Wayne Davison [Mon, 14 Mar 2005 17:30:15 +0000 (17:30 +0000)]
Split the conditional-directory sending out of send_file_name() into
a new function: send_if_directory(). This lets the code that is
recursively descending through the directories make its list of a
dir's contents and close the DIR handle before recursing into the
subdirs. Also, the "recurse" var is just true/false once again.
Wayne Davison [Wed, 9 Mar 2005 23:46:28 +0000 (23:46 +0000)]
- Improved the error-checking for some delete_item() calls.
- Move the non-regular-file delete-check above the alt-basis check
where it belongs.
- Keep track of the real statret and real stat-struct for certain
alt-basis scenarios (e.g. partial-dir and fuzzy) so that we send
the right itemized change flags.
Wayne Davison [Wed, 9 Mar 2005 18:54:19 +0000 (18:54 +0000)]
We now handle the reading and writing of extra basis-file info: the
fnamecmp_type byte, and the extra name (currently used for fuzzy
processing and hard-link status).
Wayne Davison [Wed, 9 Mar 2005 18:54:16 +0000 (18:54 +0000)]
Got rid of the name-pipe, so we now read the fnamecmp_type data over
the socket for protocol >= 29, or handle it like the old days for
older protocol versions. This means that we now validate this extra
data for safety (such as the fuzzy filename).
Wayne Davison [Wed, 9 Mar 2005 18:54:12 +0000 (18:54 +0000)]
Made itemize() output the fnamecmp_type and the fuzzy name based on
the new ITEM_BASIS_TYPE_FOLLOWS and ITEM_XNAME_FOLLOWS flags. Got
rid of the name-pipe to the receiver.
Wayne Davison [Wed, 9 Mar 2005 04:00:20 +0000 (04:00 +0000)]
We need to mention any change to a directory, not just a time change.
Yeah, this isn't very consistent with how files are treated, but it's
backward compatible.
Wayne Davison [Sun, 6 Mar 2005 23:37:42 +0000 (23:37 +0000)]
Backed out the hack that reversed ITEM_REPORT_XATTRS with
ITEM_TRANSFER. Yes, it allowed some kludge code that made backward
compatibility seamless, but it made it impossible to remove the hack
in the future. This way, the backward compatibility is just
slightly inaccurate in the display of the first letter in the %i
output, and the only hack can be safely removed without causing
problems.
Wayne Davison [Sat, 5 Mar 2005 18:58:42 +0000 (18:58 +0000)]
- When --max-delete is exceeded, we now count how many deletions
would have happend, warn about the number skipped, and set
io_error to IOERR_DEL_LIMIT.
- When dry_run > 1 (which indicates that the destinationdir is
missing), skip deletions in that dir. This fixes a bug in a
copy that is creating the destination dir w/--delete enabled.
Wayne Davison [Sat, 5 Mar 2005 17:51:23 +0000 (17:51 +0000)]
Moved the end_progress() call from match.c to sender.c so that we
report progress on 0-length files when pushing files (the receiver
already called it, so we already produced progress on a 0-length
file when pulling).
Wayne Davison [Sat, 5 Mar 2005 16:42:52 +0000 (16:42 +0000)]
Don't try to determine the phase we're in by looking at the value
of csum_length -- it might have been computed to be SUM_LENGTH.
Instead, look at the "phase" variable directly.
Wayne Davison [Sat, 5 Mar 2005 04:34:06 +0000 (04:34 +0000)]
Added a hack that uses the ITEM_REPORT_XATTRS bit (which is the old
ITEM_UPDATING bit) to make us compatible when sending/receiving bits
to/from an earlier pre-release.
Wayne Davison [Sat, 5 Mar 2005 04:34:04 +0000 (04:34 +0000)]
Added a hack that sets the ITEM_REPORT_XATTRS bit (which is the old
ITEM_UPDATING bit) when ITEM_TRANSFER or ITEM_LOCAL_CHANGE is set.
This lets us interact compatibly when sending itemized bits to an
earlier pre-release.
Wayne Davison [Sat, 5 Mar 2005 04:34:01 +0000 (04:34 +0000)]
Swapped the bit-values for ITEM_TRANSFER and ITEM_REPORT_XATTRS.
This lets us be more compatible with the earlier pre-releases
with a better heuristic for backward-compatible itemized bits.
Wayne Davison [Sat, 5 Mar 2005 00:21:50 +0000 (00:21 +0000)]
- Make use of the new ITEM_* flags to mention when things were
updated locally instead of being updated remotely.
- Added support for outputting 'a' in the itemized log-output (for
future use in extended-attribute handling).
Wayne Davison [Sat, 5 Mar 2005 00:21:48 +0000 (00:21 +0000)]
- Made the sock_{in,out} variables non-static.
- Added hlink_list, a FIFO list of finished hard-link items.
- Made get_redo_num() check for finished hard-link items and
call the generator when they are found. This ensures that
we finish all the hard-link items by the time the MSG_DONE
is read and returned to the generator.
- Added get_hlink_num() to read the new hlink_list.
Wayne Davison [Sat, 5 Mar 2005 00:21:44 +0000 (00:21 +0000)]
- Changed hlink_list[] to store file-list indexes instead of
pointers.
- Made hard_link_one() non-static so that the generator can call it.
Improved it to do itemized output.
- Replaced do_hard_links() with hard_link_cluster(), which changes
the hard-linking from a post-transfer loop into a per-cluster
operation that occurs incrementally as the transfer updates (or
finds unchanged) one item in the cluster.
Wayne Davison [Sat, 5 Mar 2005 00:21:42 +0000 (00:21 +0000)]
- Updated itemize() to handle sending of hard-link-name info. Made
it non-static so the hard-link code can now output itemized
messages.
- Made the locally-changed items (such as dirs and symlinks) itemize
using a new ITEM_LOCAL_CHANGE flag instead of the (renamed)
ITEM_TRANSFER flag (formerly ITEM_UPDATING).
- Improved the hard-link support by having a cluster of hard-linked
files get processed as soon as we notice that a single item is
already up-to-date, or it succssfully finishes being updated.
- The hard-linking that occurs when using --link-dest will now be
mentioned at higher levels of verbosity IFF %i is in the log-
format.
Wayne Davison [Sat, 5 Mar 2005 00:21:39 +0000 (00:21 +0000)]
- Changed ITEM_UPDATING to ITEM_TRANSFER.
- Added defines ITEM_HARD_LINKED, ITEM_LOCAL_CHANGE,
ITEM_REPORT_XATTRS, and SIGNIFICANT_ITEM_FLAGS.
- Changed the "next" var in struct hlink into an int.
Wayne Davison [Fri, 4 Mar 2005 16:53:26 +0000 (16:53 +0000)]
Moved some code out of the main loop in send_files() into a new
function called read_iflags() (which was made generic enough that
the receiver could use it too). Also call the new maybe_log_item().
Wayne Davison [Fri, 4 Mar 2005 16:07:50 +0000 (16:07 +0000)]
- Replaced log_send() and log_recv() with log_item().
- Made log_formatted() and log_item() take an "hlink" arg that
will be used to pass in a hard-link name for use in %L.