- No longer remove common extensions (.dif, .diff, .patch, .gz,

  .bz2) from patch names. This allows patches in the same series
  that only differ by extension, and cleans up the scripts a
  little. Also don't remove extensions when printing patch names.
- Remove unused diffstat code.

11 files changed, 105 insertions, 109 deletions

diff --git a/test/comments.test b/test/comments.test
index e1f7f0c..680414b 100644
--- a/test/comments.test
+++ b/test/comments.test
@@ -22,13 +22,13 @@ accidentally removed.
 	< test.diff -p0
 
 	$ quilt push
-	> Applying test
+	> Applying test.diff
 	> patching file f
 	>
-	> Now at patch test
+	> Now at patch test.diff
 
 	$ quilt refresh
-	> Refreshed patch test
+	> Refreshed patch test.diff
 	$ sed -e "s/\\t.*//" patches/test.diff
 	> C1
 	>
diff --git a/test/conflicts.test b/test/conflicts.test
index b8c6d11..0581fbd 100644
--- a/test/conflicts.test
+++ b/test/conflicts.test
@@ -23,50 +23,50 @@ anymore, then the patch is fixed.
 	< g
 	
 	$ quilt new a.diff
-	> Patch a is now on top
+	> Patch a.diff is now on top
 	
 	$ quilt add one.txt
-	> File one.txt added to patch a
+	> File one.txt added to patch a.diff
 	
 	$ mv one.txt one.orig
 	$ sed -e "s/4/4+/" -e 's/d/d+/' one.orig > one.txt
 	$ quilt refresh
-	> Refreshed patch a
+	> Refreshed patch a.diff
 
 	$ quilt pop -q
-	> Removing a
+	> Removing a.diff
 	> No patches applied
 
 
 	$ sed -e "s/^\\([17]\\)\$/\\1-/" one.orig > one.txt
 	$ quilt push -q
-	> Applying a
-	> Now at patch a
+	> Applying a.diff
+	> Now at patch a.diff
 
 	$ quilt pop -q
-	> Removing a
+	> Removing a.diff
 	> No patches applied
 
 	$ sed -e "s/^\\([1267]\\)\$/\\1-/" one.orig > one.txt
 	$ quilt push -q
-	> Applying a
-	> Now at patch a
+	> Applying a.diff
+	> Now at patch a.diff
 
 	$ quilt pop -q
-	> Removing a
+	> Removing a.diff
 	> No patches applied
 
 
 	$ sed -e "s/^\\([123567]\\)\$/\\1-/" one.orig > one.txt
 	$ quilt push -q
-	> Applying a
+	> Applying a.diff
 	> 1 out of 2 hunks FAILED -- rejects in file one.txt
-	> Patch a does not apply (enforce with -f)
+	> Patch a.diff does not apply (enforce with -f)
 
 	$ quilt push -qf
-	> Applying a
+	> Applying a.diff
 	> 1 out of 2 hunks FAILED -- saving rejects to file one.txt.rej
-	> Applied a (forced; needs refresh)
+	> Applied a.diff (forced; needs refresh)
 
 	$ mv one.txt one.x
 	$ sed -e "s/4/4+/" one.x > one.txt
@@ -107,7 +107,7 @@ anymore, then the patch is fixed.
 	>  g
 
 	$ quilt refresh
-	> Refreshed patch a
+	> Refreshed patch a.diff
 
 	$ cat patches/a.diff | grep -v "^\\(---\\|+++\\)"
 	> Index: d/one.txt
@@ -132,7 +132,7 @@ anymore, then the patch is fixed.
 	>  g
 
 	$ quilt pop -q
-	> Removing a
+	> Removing a.diff
 	> No patches applied
 
 	$ cd ..
diff --git a/test/failpop.test b/test/failpop.test
index 9b4cc3d..57c3daa 100644
--- a/test/failpop.test
+++ b/test/failpop.test
@@ -5,23 +5,23 @@
 	< This is test.txt.
 
 	$ quilt new test.diff
-	> Patch test is now on top
+	> Patch test.diff is now on top
 
 	$ quilt add test.txt
-	> File test.txt added to patch test
+	> File test.txt added to patch test.diff
 
 	$ cat >> test.txt
 	< Line two.
 
 	$ quilt refresh
-	> Refreshed patch test
+	> Refreshed patch test.diff
 
 	$ sleep 2
 
 	$ sed -e "s/ /_/g" patches/test.diff > patches/test.new
 	$ mv patches/test.new patches/test.diff
 	$ quilt pop
-	> Patch test does not remove cleanly (enforce with -f).
+	> Patch test.diff does not remove cleanly (enforce with -f).
 
 	$ cd ..
 	$ rm -rf d
diff --git a/test/fold.test b/test/fold.test
index ec0a256..0695909 100644
--- a/test/fold.test
+++ b/test/fold.test
@@ -27,18 +27,14 @@
 	< +This is file3.txt.
 
 	$ quilt push -q
-	> Applying patch1
-	> Now at patch patch1
+	> Applying patch1.diff
+	> Now at patch patch1.diff
 
 	$ quilt files
 	> file1.txt
 	> file2.txt
 
 	$ quilt fold -q < patches/patch2.diff
-	$ quilt files
-	> dir/file3.txt
-	> file1.txt
-
 	$ quilt diff | sed -e "s/\\t.*//"
 	> Index: d/dir/file3.txt
 	> ===================================================================
diff --git a/test/merge.test b/test/merge.test
index af85b4a..27dcd34 100644
--- a/test/merge.test
+++ b/test/merge.test
@@ -36,10 +36,10 @@ Test the patch merging functionality of `quilt diff'.
 	< +c+
 
 	$ quilt push -qa
-	> Applying a
-	> Applying b
-	> Applying c
-	> Now at patch c
+	> Applying a.diff
+	> Applying b.diff
+	> Applying c.diff
+	> Now at patch c.diff
 
 	$ quilt diff -P b.diff | grep -v "^\\(---\\|+++\\)"
 	> Index: d/abc.txt
@@ -49,7 +49,7 @@ Test the patch merging functionality of `quilt diff'.
 	> -b
 	> +b+
 	>  c
-	> More recent patches modify files in b.
+	> More recent patches modify files in b.diff.
 
 	$ quilt diff -c a.diff -P b.diff | grep -v "^\\(---\\|+++\\)"
 	> Index: d/abc.txt
@@ -60,7 +60,7 @@ Test the patch merging functionality of `quilt diff'.
 	> +a+
 	> +b+
 	>  c
-	> More recent patches modify files in b.
+	> More recent patches modify files in b.diff.
 
 	$ quilt diff -c b.diff | grep -v "^\\(---\\|+++\\)"
 	> Index: d/abc.txt
diff --git a/test/one.test b/test/one.test
index 4e7819a..ce29235 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 is now on top
+	> Patch patch1.diff is now on top
 
 	$ quilt add dir/file1
-	> File dir/file1 added to patch patch1
+	> File dir/file1 added to patch patch1.diff
 
 	$ quilt add file2
-	> File file2 added to patch patch1
+	> File file2 added to patch patch1.diff
 
 	$ quilt diff
 	$ quilt diff -z
 	$ quilt refresh
-	> Nothing in patch patch1
+	> Nothing in patch 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
+	> Refreshed patch 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
+	> Refreshed patch patch1.diff
 
 	$ quilt new patch2.diff
-	> Patch patch2 is now on top
+	> Patch patch2.diff is now on top
 
 	$ quilt add dir/file3
-	> File dir/file3 added to patch patch2
+	> File dir/file3 added to patch patch2.diff
 
 	$ echo "This is file three." > dir/file3
 	$ quilt refresh
-	> Refreshed patch patch2
+	> Refreshed patch patch2.diff
 
 	$ quilt add -p patch1 dir/file3
-	> File dir/file3 modified by patch patch2
+	> File dir/file3 modified by patch patch2.diff
 
 	$ quilt pop -R
-	> Removing patch2
+	> Removing patch2.diff
 	> Removing dir/file3
 	>
-	> Now at patch patch1
+	> Now at patch patch1.diff
 
 	$ quilt add file4
-	> File file4 added to patch patch1
+	> File file4 added to patch patch1.diff
 
 	$ echo "This is file 4." > file4
 	$ quilt refresh
-	> Refreshed patch patch1
+	> Refreshed patch patch1.diff
 
 	$ quilt push
-	> Applying patch2
+	> Applying patch2.diff
 	> patching file dir/file3
 	>
-	> Now at patch patch2
+	> Now at patch patch2.diff
 
 	$ quilt new subdir/patch3.diff
-	> Patch subdir/patch3 is now on top
+	> Patch subdir/patch3.diff is now on top
 
 	$ quilt add file4
-	> File file4 added to patch subdir/patch3
+	> File file4 added to patch subdir/patch3.diff
 
 	$ rm file4
 	$ quilt diff | sed -e "s/\\t.*//"
@@ -114,14 +114,14 @@ of the installed quilt with `make check'.
 	> -This is file 4.
 
 	$ quilt add -p patch2 file4
-	> File file4 modified by patch subdir/patch3
+	> File file4 modified by patch subdir/patch3.diff
 
 	$ quilt refresh
-	> Refreshed patch subdir/patch3
+	> Refreshed patch subdir/patch3.diff
 
 	$ echo "Another line here, too." >> dir/file3
 	$ quilt refresh patch2
-	> Refreshed patch patch2
+	> Refreshed patch patch2.diff
 
 	$ echo "Another line added." >> file2
 	$ quilt diff -z -P patch1 | sed -e "s/\\t.*//"
@@ -132,27 +132,27 @@ of the installed quilt with `make check'.
 	> @@ -1 +1,2 @@
 	>  This is file two.
 	> +Another line added.
-	> More recent patches modify files in patch1.
+	> More recent patches modify files in patch1.diff.
 	
 	$ quilt refresh patch1
-	> More recent patches modify files in patch1. Enforce refresh with -f.
+	> More recent patches modify files in patch1.diff. Enforce refresh with -f.
 	
 	$ quilt refresh -f patch1
-	> Refreshed patch patch1
+	> Refreshed patch patch1.diff
 	
 	$ echo "Another line here, too." >> dir/file3
 	$ quilt pop -R
-	> Removing subdir/patch3
+	> Removing subdir/patch3.diff
 	> Restoring file4
 	>
-	> Now at patch patch2
+	> Now at patch patch2.diff
 
 	$ quilt refresh patch2
-	> Refreshed patch patch2
+	> Refreshed patch patch2.diff
 
 	$ quilt pop -qaR
-	> Removing patch2
-	> Removing patch1
+	> Removing patch2.diff
+	> Removing patch1.diff
 	> No patches applied
 
 	$ cd ..
diff --git a/test/reorder.test b/test/reorder.test
index 7acdf45..154e2e9 100644
--- a/test/reorder.test
+++ b/test/reorder.test
@@ -20,11 +20,11 @@ Regression test: Quilt did reorder files in patches.
 	$ cat > patches/series
 	< test.diff -p0
 	$ quilt push -q
-	> Applying test
-	> Now at patch test
+	> Applying test.diff
+	> Now at patch test.diff
 
 	$ quilt pop -q
-	> Removing test
+	> Removing test.diff
 	> No patches applied
 
 	$ echo one > h
@@ -37,8 +37,8 @@ Regression test: Quilt did reorder files in patches.
 	< +two
 
 	$ quilt push -q
-	> Applying test
-	> Now at patch test
+	> Applying test.diff
+	> Now at patch test.diff
 
 	$ quilt files
 	> g
diff --git a/test/snapshot.test b/test/snapshot.test
index 8ae8d29..1c0abf6 100644
--- a/test/snapshot.test
+++ b/test/snapshot.test
@@ -21,7 +21,7 @@
 	> No patches applied
 
 	$ quilt fork
-	> Fork of patches/snapshot created as patches/snapshot-2
+	> Fork of snapshot created as snapshot-2
 
 	$ quilt push -q
 	> Applying snapshot-2
diff --git a/test/snapshot2.test b/test/snapshot2.test
index 89daa32..e8aa8a8 100644
--- a/test/snapshot2.test
+++ b/test/snapshot2.test
@@ -21,7 +21,7 @@
 	> No patches applied
 
 	$ quilt fork
-	> Fork of patches/snapshot created as patches/snapshot-2
+	> Fork of snapshot created as snapshot-2
 
 	$ quilt push -q
 	> Applying snapshot-2
diff --git a/test/subdir.test b/test/subdir.test
index 2763b8f..5e6bbda 100644
--- a/test/subdir.test
+++ b/test/subdir.test
@@ -5,11 +5,11 @@
 	$ cat > subdir/file
 	< old file
 
-	$ quilt new test
-	> Patch test is now on top
+	$ quilt new test.patch
+	> Patch test.patch is now on top
 
 	$ quilt add subdir/file
-	> File subdir/file added to patch test
+	> File subdir/file added to patch test.patch
 
 	$ cat > subdir/file
 	< new contents
@@ -17,11 +17,11 @@
 	This creates the patches/ directory:
 
 	$ quilt refresh
-	> Refreshed patch test
+	> Refreshed patch test.patch
 
 	$ cd subdir
 	$ quilt add file2
-	> File subdir/file2 added to patch test
+	> File subdir/file2 added to patch test.patch
 
 	$ cat > file2
 	< another file
@@ -30,7 +30,7 @@
 	< yet another file
 
 	$ quilt add file3
-	> File subdir/file3 added to patch test
+	> File subdir/file3 added to patch test.patch
 
 	$ rm file3
 	$ quilt files
@@ -60,10 +60,10 @@
 	> -yet another file
 
 	$ quilt refresh
-	> Refreshed patch test
+	> Refreshed patch test.patch
 
 	$ quilt remove file2
-	> File subdir/file2 removed from patch test
+	> File subdir/file2 removed from patch test.patch
 
 	$ quilt files
 	> subdir/file
diff --git a/test/two.test b/test/two.test
index 4d48467..e365afe 100644
--- a/test/two.test
+++ b/test/two.test
@@ -5,18 +5,18 @@
 	$ mkdir dir
 	$ echo "This is file one." > dir/file1
 	$ quilt new patch1.diff
-	> Patch patch1 is now on top
+	> Patch patch1.diff is now on top
 
 	$ quilt add dir/file1
-	> File d/dir/file1 added to patch patch1
+	> File d/dir/file1 added to patch patch1.diff
 
 	$ quilt add file2
-	> File d/file2 added to patch patch1
+	> File d/file2 added to patch patch1.diff
 
 	$ quilt diff
 	$ quilt diff -z
 	$ quilt refresh
-	> Nothing in patch patch1
+	> Nothing in patch patch1.diff
 
 	$ echo "This is file two." > file2
 	$ quilt diff | sed -e "s/\\t.*//"
@@ -36,7 +36,7 @@
 	> +This is file two.
 
 	$ quilt refresh
-	> Refreshed patch patch1
+	> Refreshed patch patch1.diff
 
 	$ quilt diff -z
 	$ echo "Another line has been added." >> dir/file1
@@ -50,7 +50,7 @@
 	> +Another line has been added.
 
 	$ cd dir
-	$ quilt diff -z file1
+	$ quilt diff -z file1 | sed -e "s/\\t.*//"
 	> Index: d/d/dir/file1
 	> ===================================================================
 	> --- d.orig/d/dir/file1
@@ -62,45 +62,45 @@
 	$ cd ..
 	
 	$ quilt refresh
-	> Refreshed patch patch1
+	> Refreshed patch patch1.diff
 
 	$ quilt new patch2.diff
-	> Patch patch2 is now on top
+	> Patch patch2.diff is now on top
 
 	$ quilt add dir/file3
-	> File d/dir/file3 added to patch patch2
+	> File d/dir/file3 added to patch patch2.diff
 
 	$ echo "This is file three." > dir/file3
 	$ quilt refresh
-	> Refreshed patch patch2
+	> Refreshed patch patch2.diff
 
 	$ quilt add -p patch1 dir/file3
-	> File d/dir/file3 modified by patch patch2
+	> File d/dir/file3 modified by patch patch2.diff
 
 	$ quilt pop -R
-	> Removing patch2
+	> Removing patch2.diff
 	> Removing d/dir/file3
 	>
-	> Now at patch patch1
+	> Now at patch patch1.diff
 
 	$ quilt add file4
-	> File d/file4 added to patch patch1
+	> File d/file4 added to patch patch1.diff
 
 	$ echo "This is file 4." > file4
 	$ quilt refresh
-	> Refreshed patch patch1
+	> Refreshed patch patch1.diff
 
 	$ quilt push
-	> Applying patch2
+	> Applying patch2.diff
 	> patching file d/dir/file3
 	>
-	> Now at patch patch2
+	> Now at patch patch2.diff
 
 	$ quilt new subdir/patch3.diff
-	> Patch subdir/patch3 is now on top
+	> Patch subdir/patch3.diff is now on top
 
 	$ quilt add file4
-	> File d/file4 added to patch subdir/patch3
+	> File d/file4 added to patch subdir/patch3.diff
 
 	$ rm file4
 	$ quilt diff | sed -e "s/\\t.*//"
@@ -112,14 +112,14 @@
 	> -This is file 4.
 
 	$ quilt add -p patch2 file4
-	> File d/file4 modified by patch subdir/patch3
+	> File d/file4 modified by patch subdir/patch3.diff
 
 	$ quilt refresh
-	> Refreshed patch subdir/patch3
+	> Refreshed patch subdir/patch3.diff
 
 	$ echo "Another line here, too." >> dir/file3
 	$ quilt refresh patch2
-	> Refreshed patch patch2
+	> Refreshed patch patch2.diff
 
 	$ echo "Another line added." >> file2
 	$ quilt diff -z -P patch1 | sed -e "s/\\t.*//"
@@ -130,27 +130,27 @@
 	> @@ -1 +1,2 @@
 	>  This is file two.
 	> +Another line added.
-	> More recent patches modify files in patch1.
+	> More recent patches modify files in patch1.diff.
 	
 	$ quilt refresh patch1
-	> More recent patches modify files in patch1. Enforce refresh with -f.
+	> More recent patches modify files in patch1.diff. Enforce refresh with -f.
 	
 	$ quilt refresh -f patch1
-	> Refreshed patch patch1
+	> Refreshed patch patch1.diff
 	
 	$ echo "Another line here, too." >> dir/file3
 	$ quilt pop -R
-	> Removing subdir/patch3
+	> Removing subdir/patch3.diff
 	> Restoring d/file4
 	>
-	> Now at patch patch2
+	> Now at patch patch2.diff
 
 	$ quilt refresh patch2
-	> Refreshed patch patch2
+	> Refreshed patch patch2.diff
 
 	$ quilt pop -qaR
-	> Removing patch2
-	> Removing patch1
+	> Removing patch2.diff
+	> Removing patch1.diff
 	> No patches applied
 
 	$ cd ../..