* 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. Index: quilt/diff.in =================================================================== RCS file: /cvsroot/quilt/quilt/quilt/diff.in,v retrieving revision 1.47 diff -u -r1.47 diff.in --- quilt/diff.in 23 Jan 2005 18:27:47 -0000 1.47 +++ quilt/diff.in 13 Apr 2005 12:17:23 -0000 @@ -302,7 +302,14 @@ done exec 4>&- # close $tmp_files -files=( $(sort -u $tmp_files) ) +files=( $( + awk ' + { if ($0 in seen) + next + seen[$0]=1 + print + } + ' $tmp_files) ) if [ -n "$opt_relative" ] then Index: scripts/patchfns.in =================================================================== RCS file: /cvsroot/quilt/quilt/scripts/patchfns.in,v retrieving revision 1.60 diff -u -r1.60 patchfns.in --- scripts/patchfns.in 6 Feb 2005 00:35:23 -0000 1.60 +++ scripts/patchfns.in 13 Apr 2005 12:17:24 -0000 @@ -506,10 +506,16 @@ } } END { + i = 1 for (file in files) { - if (!(file in printed)) - print file + if (!(file in printed)) { + new_files[i]=file + i++ + } } + n = asort(new_files) + for (i=1; i<=n; i++) + print new_files[i] } ' }