mirror of
https://github.com/RsyncProject/rsync.git
synced 2026-10-24 22:58:16 -04:00
Change --info=skip2 messages & add info on attr changes.
This commit is contained in:
1 parent
7eb59a9152
commit
58f464f4da
3 files changed
+12
-8
No files matched your search
@@ -32,7 +32,8 @@
|
||||
|
||||
- Added extra info to the "FILENAME exists" output of `--ignore-existing` when
|
||||
`--info=skip2` is used. The skip message becomes "FILENAME exists (INFO)"
|
||||
where the INFO is one of uptodate, type differs, or differs.
|
||||
where the INFO is one of "type change", "sum change" (requires `-c`), "file
|
||||
change" (based on the quick check), "attr change", or "uptodate".
|
||||
|
||||
- Some manpage improvements.
|
||||
|
||||
|
||||
+6
-4
@@ -1381,11 +1381,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
|
||||
const char *suf = "";
|
||||
if (INFO_GTE(SKIP, 2)) {
|
||||
if (ftype != stype)
|
||||
suf = " (type differs)";
|
||||
else if (quick_check_ok(ftype, fname, file, &sx.st))
|
||||
suf = " (uptodate)";
|
||||
suf = " (type change)";
|
||||
else if (!quick_check_ok(ftype, fname, file, &sx.st))
|
||||
suf = always_checksum ? " (sum change)" : " (file change)";
|
||||
else if (!unchanged_attrs(fname, file, &sx))
|
||||
suf = " (attr change)";
|
||||
else
|
||||
suf = " (differs)";
|
||||
suf = " (uptodate)";
|
||||
}
|
||||
rprintf(FINFO, "%s exists%s\n", fname, suf);
|
||||
}
|
||||
|
||||
+4
-3
@@ -1607,9 +1607,10 @@ your home directory (remove the '=' for that).
|
||||
only looking at the existing files in the destination hierarchy itself.
|
||||
|
||||
When `--info=skip2` is used rsync will output "FILENAME exists (INFO)"
|
||||
messages where the INFO indicates one of "uptodate", "type differs", or
|
||||
"differs". The first level of skip messages (which is also implied by
|
||||
`-vv`) outputs the exists message without the "(INFO)" suffix.
|
||||
messages where the INFO indicates one of "type change", "sum change"
|
||||
(requires `-c`), "file change" (based on the quick check), "attr change",
|
||||
or "uptodate". Using `--info=skip1` (which is also implied by `-vv`)
|
||||
outputs the exists message without the INFO suffix.
|
||||
|
||||
0. `--remove-source-files`
|
||||
|
||||
|
||||
Reference in new issue
Block a user