TapTap/FastSync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

rsync 3.4.1 drop-in parity (#285-#297) + parity completion (protocol 2.26.0) #298

Merged
TapTap merged 77 commits from feat/rsync-parity into dev 2026-09-17 20:33:17 +02:00
Conversation 0 Commits 77 Files Changed 99
+12 -4
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e771cc9da6 - Show all commits
src/client/client_send.c
+9 -3
View File
@@ -2479,7 +2479,10 @@ int send_files(Config* config) {
ArrayList* size_skipped = NULL; ArrayList* size_skipped = NULL;
ArrayList* synced_dirs = NULL; ArrayList* synced_dirs = NULL;
bool delete_early = config->use_delete && config_delete_timing_early(config); bool delete_early = config->use_delete && config_delete_timing_early(config);
bool delete_per_dir = config->use_delete && config_delete_timing_per_dir(config); /* -d/--dirs does not recurse, so a per-directory plan would carry no child
information and could delete the contents of an untraversed directory;
fall back to the whole-tree end-of-transfer commit for that mode. */
bool delete_per_dir = config->use_delete && config_delete_timing_per_dir(config) && !config->dirs;
bool send_failed = false; bool send_failed = false;
bool had_scan_io = false; bool had_scan_io = false;
PreparedScanner prepared; PreparedScanner prepared;
@@ -2915,12 +2918,15 @@ int send_files_multithreaded(Config** config_ptr) {
return 1; return 1;
} }
} }
if (config_delete_timing_early(config) || config_delete_timing_per_dir(config)) { /* -d/--dirs does not recurse, so a per-directory plan would carry no child
information and could delete the contents of an untraversed directory;
fall back to the whole-tree end-of-transfer commit for that mode. */
bool per_dir = config_delete_timing_per_dir(config) && !config->dirs;
if (config_delete_timing_early(config) || per_dir) {
/* --delete-before / --delete-during / --delete-delay: build the keep-set /* --delete-before / --delete-during / --delete-delay: build the keep-set
(paths only, nothing loaded or sent) up front so the sender thread can (paths only, nothing loaded or sent) up front so the sender thread can
transmit it before/with the data. The path-only pre-scan also fills the transmit it before/with the data. The path-only pre-scan also fills the
protected excluded prefixes and synchronized directories. */ protected excluded prefixes and synchronized directories. */
bool per_dir = config_delete_timing_per_dir(config);
PreparedScanner prepared; PreparedScanner prepared;
memset(&prepared, 0, sizeof(prepared)); memset(&prepared, 0, sizeof(prepared));
bool prepared_ok = prepare_scanner(config, config->scanner_threads, &prepared); bool prepared_ok = prepare_scanner(config, config->scanner_threads, &prepared);
src/shared/delete_plan.c
+3 -1
View File
@@ -718,7 +718,9 @@ static bool apply_missing(DeletePlanSession* session, const Config* config) {
if (session->missing_applied) if (session->missing_applied)
return true; return true;
session->missing_applied = true; session->missing_applied = true;
if (session->missing->size == 0) /* The server clears delete_missing_args when its --allow-delete policy is
off; never honor the client's exact-path requests then. */
if (!config->delete_missing_args || session->missing->size == 0)
return true; return true;
DeleteManifest manifest = { DeleteManifest manifest = {
.keeps = NULL, .protected = NULL, .missing = session->missing, .dirs = NULL}; .keeps = NULL, .protected = NULL, .missing = session->missing, .dirs = NULL};