feat: promote whole_file=1 when --checksum-choice=none#4066
Merged
Conversation
Mirrors upstream rsync 3.4.1 behaviour at checksum.c:197-198 where parse_checksum_choice unconditionally sets whole_file = 1 when the negotiated transfer checksum is CSUM_NONE. The delta algorithm cannot run without a transfer checksum, so whole-file transfer is the only valid mode. Changes: - Add StrongChecksumAlgorithm::None and accept `none` (case-insensitive) via --checksum-choice/--cc, forwarding it to the remote peer. - ClientConfigBuilder::build now promotes whole_file to Some(true) whenever checksum_choice.transfer_is_none(); explicit --no-whole-file is silently overridden (matching upstream's unconditional assignment). - Regression tests at the builder layer (checksum_choice_none_promotes_whole_file, checksum_choice_none_overrides_explicit_no_whole_file) and at the CLI parser layer (test_checksum_choice_none_parses, _via_cc_alias). - Refresh the mutual-exclusion audit matrix and oc-rsync(1) man page so `none` is documented; mark G1 RESOLVED. Closes #2139, #2140, #2141.
…e-none-whole-file-2139 # Conflicts: # docs/audits/compatibility-flags-mutual-exclusion-matrix.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Closes G1 from the compatibility-flags mutual-exclusion audit.
Adds
StrongChecksumAlgorithm::Noneand accepts--checksum-choice=none(case-insensitive, also via--cc=none), forwarding the value to remote peers.ClientConfigBuilder::buildnow promoteswhole_filetoSome(true)wheneverchecksum_choice.transfer_is_none(), mirroring upstreamtarget/interop/upstream-src/rsync-3.4.1/checksum.c:197-198:The assignment is unconditional upstream, so an explicit
--no-whole-fileis silently overridden. The delta pipeline cannot run without a transfer checksum, so whole-file is the only valid mode.Refs #2139, #2140, #2141.
Test plan
cargo fmt --allclean.fmt + clippy.crates/core/src/client/config/builder/tests.rs(checksum_choice_none_promotes_whole_file,checksum_choice_none_overrides_explicit_no_whole_file,checksum_choice_md5_leaves_whole_file_untouched) andcrates/core/src/client/config/enums/checksum.rs(parse_none,transfer_is_none_false_for_other_algorithms).crates/cli/tests/option_combinations_flags.rs(test_checksum_choice_none_parses,test_checksum_choice_none_via_cc_alias).--checksum-choice=noneround-trips against upstream rsync 3.4.1.Diff scope
8 files, +146 / -29.