- Switch from echo to printf for all translations: This is more

  stable than having expansions in messages that might change
  independent of the message.
- Add print_patch function and always use it when printing patch
  names. Remove -n options from various scripts and use a global
  switch QUILT_PATCHES_PREFIX in .quiltrc to decide between patch
  names with and without directory prefix. Depending on user
  experience this switch may eventually go away.
- Add --diffstat option to refresh command: If given, this option
  inserts diffstat statistics at the end of the patch header, or
  refreshes the existing diffstat output. No special tags in the
  path file (%diffstat or the like) are needed.
- Minor fix inserting changelog into RPM specfile.

1 files changed, 29 insertions, 29 deletions

diff --git a/test/one.test b/test/one.test
index 6d92dcb..0bf0b70 100644
--- a/test/one.test
+++ b/test/one.test
@@ -10,18 +10,18 @@ of the installed quilt with `make check'.
 	$ mkdir dir
 	$ echo "This is file one." > dir/file1
 	$ quilt new patch1.diff
-	> Patch patch1.diff is now on top
+	> Patch %{P}patch1.diff is now on top
 
 	$ quilt add dir/file1
-	> File dir/file1 added to patch patch1.diff
+	> File dir/file1 added to patch %{P}patch1.diff
 
 	$ quilt add file2
-	> File file2 added to patch patch1.diff
+	> File file2 added to patch %{P}patch1.diff
 
 	$ quilt diff
 	$ quilt diff -z
 	$ quilt refresh
-	> Nothing in patch patch1.diff
+	> Nothing in patch %{P}patch1.diff
 
 	$ echo "This is file two." > file2
 	$ quilt diff | sed -e "s/\\t.*//"
@@ -41,7 +41,7 @@ of the installed quilt with `make check'.
 	> +This is file two.
 
 	$ quilt refresh
-	> Refreshed patch patch1.diff
+	> Refreshed patch %{P}patch1.diff
 
 	$ quilt diff -z
 	$ echo "Another line has been added." >> dir/file1
@@ -64,45 +64,45 @@ of the installed quilt with `make check'.
 	> +Another line has been added.
 
 	$ quilt refresh
-	> Refreshed patch patch1.diff
+	> Refreshed patch %{P}patch1.diff
 
 	$ quilt new patch2.diff
-	> Patch patch2.diff is now on top
+	> Patch %{P}patch2.diff is now on top
 
 	$ quilt add dir/file3
-	> File dir/file3 added to patch patch2.diff
+	> File dir/file3 added to patch %{P}patch2.diff
 
 	$ echo "This is file three." > dir/file3
 	$ quilt refresh
-	> Refreshed patch patch2.diff
+	> Refreshed patch %{P}patch2.diff
 
 	$ quilt add -p patch1 dir/file3
-	> File dir/file3 modified by patch patch2.diff
+	> File dir/file3 modified by patch %{P}patch2.diff
 
 	$ quilt pop -R
-	> Removing patch2.diff
+	> Removing patch %{P}patch2.diff
 	> Removing dir/file3
 	>
-	> Now at patch patch1.diff
+	> Now at patch %{P}patch1.diff
 
 	$ quilt add file4
-	> File file4 added to patch patch1.diff
+	> File file4 added to patch %{P}patch1.diff
 
 	$ echo "This is file 4." > file4
 	$ quilt refresh
-	> Refreshed patch patch1.diff
+	> Refreshed patch %{P}patch1.diff
 
 	$ quilt push
-	> Applying patch2.diff
+	> Applying patch %{P}patch2.diff
 	> patching file dir/file3
 	>
-	> Now at patch patch2.diff
+	> Now at patch %{P}patch2.diff
 
 	$ quilt new subdir/patch3.diff
-	> Patch subdir/patch3.diff is now on top
+	> Patch %{P}subdir/patch3.diff is now on top
 
 	$ quilt add file4
-	> File file4 added to patch subdir/patch3.diff
+	> File file4 added to patch %{P}subdir/patch3.diff
 
 	$ rm file4
 	$ quilt diff | sed -e "s/\\t.*//"
@@ -114,17 +114,18 @@ of the installed quilt with `make check'.
 	> -This is file 4.
 
 	$ quilt add -p patch2 file4
-	> File file4 modified by patch subdir/patch3.diff
+	> File file4 modified by patch %{P}subdir/patch3.diff
 
 	$ quilt refresh
-	> Refreshed patch subdir/patch3.diff
+	> Refreshed patch %{P}subdir/patch3.diff
 
 	$ echo "Another line here, too." >> dir/file3
 	$ quilt refresh patch2
-	> Refreshed patch patch2.diff
+	> Refreshed patch %{P}patch2.diff
 
 	$ echo "Another line added." >> file2
 	$ quilt diff -z -P patch1 | sed -e "s/\\t.*//"
+	> More recent patches modify files in patch %{P}patch1.diff
 	> Index: d/file2
 	> ===================================================================
 	> --- d.orig/file2
@@ -132,27 +133,26 @@ of the installed quilt with `make check'.
 	> @@ -1 +1,2 @@
 	>  This is file two.
 	> +Another line added.
-	> More recent patches modify files in patch1.diff.
 	
 	$ quilt refresh patch1
-	> More recent patches modify files in patch1.diff. Enforce refresh with -f.
+	> More recent patches modify files in patch %{P}patch1.diff. Enforce refresh with -f.
 	
 	$ quilt refresh -f patch1
-	> Refreshed patch patch1.diff
+	> Refreshed patch %{P}patch1.diff
 	
 	$ echo "Another line here, too." >> dir/file3
 	$ quilt pop -R
-	> Removing subdir/patch3.diff
+	> Removing patch %{P}subdir/patch3.diff
 	> Restoring file4
 	>
-	> Now at patch patch2.diff
+	> Now at patch %{P}patch2.diff
 
 	$ quilt refresh patch2
-	> Refreshed patch patch2.diff
+	> Refreshed patch %{P}patch2.diff
 
 	$ quilt pop -qaR
-	> Removing patch2.diff
-	> Removing patch1.diff
+	> Removing patch %{P}patch2.diff
+	> Removing patch %{P}patch1.diff
 	> No patches applied
 
 	$ cd ..