- Add --sort options to the diff and refresh commands which

  sorts files by filename. The default is to keep files in their
  original order whenever possible.
- refresh command: add new files in sort order instead of the
  filesystem order.
- diff command: output files in the order in which they show up
  in the patch instead of sorting them alphabetically.
- Add sort testcase.

1 files changed, 52 insertions, 0 deletions

diff --git a/test/sort.test b/test/sort.test
new file mode 100644
index 0000000..0e0a23f
--- /dev/null
+++ b/test/sort.test
@@ -0,0 +1,52 @@
+	$ mkdir d
+	$ cd d
+
+	$ quilt new sort.diff
+	> Patch patches/sort.diff is now on top
+
+	$ quilt add b c
+	> File b added to patch patches/sort.diff
+	> File c added to patch patches/sort.diff
+
+	$ echo b > b
+	$ echo c > c
+	$ quilt refresh
+	> Refreshed patch patches/sort.diff
+
+	$ quilt add a
+	> File a added to patch patches/sort.diff
+
+	$ echo a > a
+	$ quilt files
+	> b
+	> c
+	> a
+
+	$ quilt diff | grep ^Index
+	> Index: d/b
+	> Index: d/c
+	> Index: d/a
+
+	$ quilt refresh
+	> Refreshed patch patches/sort.diff
+
+	$ grep ^Index patches/sort.diff
+	> Index: d/b
+	> Index: d/c
+	> Index: d/a
+
+	$ quilt diff --sort | grep ^Index
+	> Index: d/a
+	> Index: d/b
+	> Index: d/c
+
+	$ quilt refresh --sort
+	> Refreshed patch patches/sort.diff
+
+	$ grep ^Index patches/sort.diff
+	> Index: d/a
+	> Index: d/b
+	> Index: d/c
+	
+	$ cd ..
+	$ rm -rf d