Merge remote-tracking branch 'origin/feat/whole-file' into dev

# Conflicts:
#	tests/test_client_cli.c
#	tests/test_config.c

tests/integration/test_features.py

@@ -331,6 +331,27 @@ class TestIncremental:
         with open(received_file, "rb") as f:
             assert f.read() == b"hello world\n"
 
+    def test_whole_file_disables_delta_and_keeps_compression(self, shared_server):
+        clean_dir(DEST_DIR)
+        result, _ = run_client(SOURCE_DIR, DEST_DIR, flags=["-M"], port=shared_server.port)
+        assert result.returncode == 0
+
+        source_file = os.path.join(SOURCE_DIR, "medium.txt")
+        with open(source_file, "wb") as f:
+            f.write(b"whole-file replacement\n" * 5000)
+
+        result, _ = run_client(
+            SOURCE_DIR,
+            DEST_DIR,
+            flags=["-M", "--incremental", "--delta", "-W", "-c"],
+            port=shared_server.port,
+        )
+        assert result.returncode == 0, f"Whole-file sync failed: {(result.stderr or result.stdout)[:200]}"
+        received = get_dest_received_dir(DEST_DIR, SOURCE_DIR)
+        mismatches, missing = verify_transfer(SOURCE_DIR, received)
+        assert not missing, f"Missing: {missing}"
+        assert not mismatches, f"Mismatch: {mismatches}"
+
 
 class TestDelete:
     def test_delete_removes_extra_files(self, shared_server):

tests/test_client_cli.c

@@ -60,6 +60,13 @@ static void test_validate_config_delta_sendfile_constraints() {
   cfg->use_incremental = true;
   cfg->use_sendfile = true;
   EXPECT_FALSE(validate_config(cfg));
+
+  /* Whole-file makes delta selection inactive, so these combinations are valid. */
+  cfg->whole_file = true;
+  EXPECT_TRUE(validate_config(cfg));
+
+  cfg->use_incremental = false;
+  EXPECT_TRUE(validate_config(cfg));
   config_delete(cfg);
 }
 
@@ -507,6 +514,27 @@ static void test_parse_args_rejects_unsupported_stderr_modes() {
   }
   log_set_stderr_mode(LOG_STDERR_ERRORS);
 }
+
+/* Test both whole-file spellings and its precedence over delta selection. */
+static void test_parse_args_whole_file() {
+  Config* cfg = config_create();
+  char* argv[] = {"fastsync", "--delta", "--incremental", "-W", "/src", "/dst"};
+  int positional_args[2];
+  int positional_count = 0;
+
+  EXPECT_EQ_INT(parse_args(cfg, 6, argv, positional_args, &positional_count), 0);
+  EXPECT_TRUE(cfg->whole_file);
+  EXPECT_TRUE(cfg->use_delta);
+
+  config_delete(cfg);
+  cfg = config_create();
+  char* long_argv[] = {"fastsync", "--whole-file", "/src", "/dst"};
+  positional_count = 0;
+  EXPECT_EQ_INT(parse_args(cfg, 4, long_argv, positional_args, &positional_count), 0);
+  EXPECT_TRUE(cfg->whole_file);
+  config_delete(cfg);
+}
+
 void test_client_cli() {
   test_validate_config_required_paths();
   test_validate_config_incompatible_options();
@@ -541,4 +569,5 @@ void test_client_cli() {
   test_parse_args_rejects_unsupported_stderr_modes();
   test_parse_args_secluded_args();
   test_parse_args_short_s_remains_chunk_serialization();
+  test_parse_args_whole_file();
 }

tests/test_config.c

@@ -125,6 +125,8 @@ static void test_config_send_receive() {
   send_cfg->use_compression = true;
   send_cfg->use_metadata = true;
   send_cfg->use_fsync = true;
+  send_cfg->use_delta = true;
+  send_cfg->whole_file = true;
   send_cfg->compression_level = 5;
   send_cfg->chunk_size = 1024;
   send_cfg->eight_bit_output = true;
@@ -165,6 +167,11 @@ static void test_config_send_receive() {
       if (!recv_cfg->use_fsync)
         ok = false;
       if (!recv_cfg->eight_bit_output)
+        ok = false;
+      if (recv_cfg->use_delta)
+        ok = false;
+      if (!recv_cfg->whole_file)
+        ok = false;
     }
     config_delete(recv_cfg);
     close(p[0]);