From 3ccb16e10b7b4312e9b6096760ddc4c2d90194f2 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@linbit.com>
Date: Tue, 17 Apr 2012 22:37:17 +0200
Subject: Improve messages when in --dry-run mode

* src/patch.c (main): Say that we are checking a file and not that we are
patching it in --dry-run mode.  Don't say "saving rejects to file" when we
don't create reject files.
* tests/reject-format: Add rejects with --dry-run test case.
* tests/bad-filenames, tests/fifo, tests/mixed-patch-types: Update.
---
 src/patch.c             | 7 +++++--
 tests/bad-filenames     | 8 ++++----
 tests/fifo              | 8 ++++----
 tests/mixed-patch-types | 8 ++++----
 tests/reject-format     | 7 +++++++
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/patch.c b/src/patch.c
index 97eea5b..f05e542 100644
--- a/src/patch.c
+++ b/src/patch.c
@@ -345,7 +345,8 @@ main (int argc, char **argv)
 	      {
 		bool renamed = strcmp (inname, outname);
 
-		say ("patching %s %s%c",
+		say ("%s %s %s%c",
+		     dry_run ? "checking" : "patching",
 		     S_ISLNK (file_type) ? "symbolic link" : "file",
 		     quotearg (outname), renamed ? ' ' : '\n');
 		if (renamed)
@@ -602,9 +603,9 @@ main (int argc, char **argv)
 		      rej[len - 1] = '#';
 		    simple_backup_suffix = s;
 		}
-		say (" -- saving rejects to file %s\n", quotearg (rej));
 		if (! dry_run)
 		  {
+		    say (" -- saving rejects to file %s\n", quotearg (rej));
 		    if (rejname)
 		      {
 			if (! written_to_rejname)
@@ -631,6 +632,8 @@ main (int argc, char **argv)
 				     &rejst, rej, S_IFREG | 0666, false);
 		      }
 		  }
+		else
+		  say ("\n");
 		if (!rejname)
 		    free (rej);
 	    } else
diff --git a/tests/bad-filenames b/tests/bad-filenames
index 121cfda..be65ca5 100644
--- a/tests/bad-filenames
+++ b/tests/bad-filenames
@@ -25,7 +25,7 @@ EOF
 # or that contains a ".." component.
 
 check 'emit_patch ../z | patch -f -p1 --dry-run || echo status: $?' <<EOF
-patching file z
+checking file z
 EOF
 
 check 'emit_patch /absolute/path | patch -f -p0 --dry-run || echo status: $?' <<EOF
@@ -50,7 +50,7 @@ for dir in "$TMPDIR" "$TMP" "$TEMP" "/tmp"; do
 done
 
 check 'emit_patch $filename | (cd / && patch -f -p0 --dry-run) || echo status: $?' <<EOF
-patching file $filename
+checking file $filename
 EOF
 
 check 'emit_patch a/../z | patch -f -p0 --dry-run || echo status: $?' <<EOF
@@ -118,12 +118,12 @@ EOF
 
 echo 1 > f
 check 'patch -f -p0 --dry-run < d.diff || echo status: $?' <<EOF
-patching file f
+checking file f
 EOF
 
 echo 1 > g
 check 'patch -f -p1 --dry-run < d.diff || echo status: $?' <<EOF
-patching file g
+checking file g
 EOF
 
 mkdir d
diff --git a/tests/fifo b/tests/fifo
index 8b49003..9e07558 100644
--- a/tests/fifo
+++ b/tests/fifo
@@ -22,21 +22,21 @@ cat > f.diff <<EOF
 EOF
 
 check 'patch --dry-run < f.diff' <<EOF
-patching file f
+checking file f
 EOF
 
 check 'patch --dry-run -i f.diff' <<EOF
-patching file f
+checking file f
 EOF
 
 mkfifo fifo
 
 cat f.diff > fifo &
 check 'patch --dry-run < fifo' <<EOF
-patching file f
+checking file f
 EOF
 
 cat f.diff > fifo &
 check 'patch --dry-run -i fifo' <<EOF
-patching file f
+checking file f
 EOF
diff --git a/tests/mixed-patch-types b/tests/mixed-patch-types
index abd6031..da17c75 100644
--- a/tests/mixed-patch-types
+++ b/tests/mixed-patch-types
@@ -29,8 +29,8 @@ index 0000000..01058d8
 EOF
 
 check 'patch --dry-run < mixed1.diff || echo "Status: $?"' <<EOF
-patching file f
-patching file g
+checking file f
+checking file g
 EOF
 
 # --------------------------------------------------------------
@@ -51,6 +51,6 @@ diff a/g b/g
 EOF
 
 check 'patch --dry-run < mixed2.diff || echo "Status: $?"' <<EOF
-patching file f
-patching file g
+checking file f
+checking file g
 EOF
diff --git a/tests/reject-format b/tests/reject-format
index 2f4a788..be710f5 100644
--- a/tests/reject-format
+++ b/tests/reject-format
@@ -29,6 +29,13 @@ EOF
 sed -e 's/5/5a/' f.orig > f
 diff -p -c -L f.orig -L f f.orig f > f.diff
 
+check 'patch -f -F0 --no-backup-if-mismatch --dry-run f < f.diff || echo "Status: $?"' <<EOF
+checking file f
+Hunk #1 FAILED at 2.
+1 out of 1 hunk FAILED
+Status: 1
+EOF
+
 check 'patch -f -F0 --no-backup-if-mismatch f < f.diff || echo "Status: $?"' <<EOF
 patching file f
 Hunk #1 FAILED at 2.
-- 
cgit v1.2.1