Change `--info=skip2` messages & add info on attr changes.

diff --git a/NEWS.md b/NEWS.md
index d978222c40dd473a26aeb0a64330a1b5a7ce77ae..bbc1b3fe1d64e1326e5ce1bdda8ae3fd395b60f1 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -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.
 

diff --git a/generator.c b/generator.c
index e3bc40a6347a9fbe17277daa02071eae5f9c5509..20599d83d3c3b86140a75d15a890e75935e1783a 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -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);
                }

diff --git a/rsync.1.md b/rsync.1.md
index ba79eb7a6fe40cf5cc091b064a2e3d216a4ec316..3e4a72b0d5797f046e0ef57ad312a499429d2c37 100644 (file)
--- a/rsync.1.md
+++ b/rsync.1.md
@@ -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`