From: Wayne Davison <wayne@opencoder.net>
Date: Wed, 23 Sep 2020 16:26:10 +0000 (-0700)
Subject: Change `--info=skip2` messages & add info on attr changes.
X-Git-Tag: v3.2.4pre1~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58f464f4daa1b1ee00c6afd898a19ca5cd81bf58;p=thirdparty%2Frsync.git

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

diff --git a/NEWS.md b/NEWS.md
index d978222c..bbc1b3fe 100644
--- 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 e3bc40a6..20599d83 100644
--- 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 ba79eb7a..3e4a72b0 100644
--- 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`