extern int am_root;
extern int am_server;
extern int am_daemon;
+extern int do_progress;
extern int recurse;
extern int relative_paths;
extern int keep_dirlinks;
extern int module_id;
extern int ignore_errors;
extern int remove_sent_files;
+extern int delay_updates;
extern int update_only;
extern int opt_ignore_existing;
extern int inplace;
if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
|| (xname && *xname)) && !read_batch) {
if (protocol_version >= 29) {
- if (iflags & (ITEM_LOCAL_CHANGE|ITEM_TRANSFER))/* XXX */
- iflags |= ITEM_DUMMY_BIT; /* XXX Remove soon */
if (ndx >= 0)
write_int(sock_f_out, ndx);
write_shortint(sock_f_out, iflags);
int need_retouch_dir_perms = 0;
int save_only_existing = only_existing;
int save_opt_ignore_existing = opt_ignore_existing;
+ int save_do_progress = do_progress;
allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
lull_mod = allowed_lull * 5;
if (delete_before && !local_name && flist->count > 0)
do_delete_pass(flist);
+ do_progress = 0;
if (whole_file < 0)
whole_file = 0;
rprintf(FINFO,"generate_files phase=%d\n",phase);
write_int(f_out, -1);
+ /* Reduce round-trip lag-time for a useless delay-updates phase. */
+ if (protocol_version >= 29 && !delay_updates)
+ write_int(f_out, -1);
/* Read MSG_DONE for the redo phase (and any prior messages). */
get_redo_num(itemizing, code);
phase++;
if (verbose > 2)
rprintf(FINFO, "generate_files phase=%d\n", phase);
- write_int(f_out, -1);
- /* Read MSG_DONE for delay-update phase & prior messages. */
+ if (delay_updates)
+ write_int(f_out, -1);
+ /* Read MSG_DONE for delay-updates phase & prior messages. */
get_redo_num(itemizing, code);
}
+ do_progress = save_do_progress;
if (delete_after && !local_name && flist->count > 0)
do_delete_pass(flist);