From e7bb642fdbcfa9bb1d7265781f56d89e398f90b9 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Fri, 9 Jul 2004 07:26:21 +0000 Subject: - 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. --- test/two.test | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'test/two.test') diff --git a/test/two.test b/test/two.test index bbacbae..b29e69b 100644 --- a/test/two.test +++ b/test/two.test @@ -3,21 +3,21 @@ $ mkdir -p d/d $ cd d $ quilt new patch1.diff - > Patch patch1.diff is now on top + > Patch %{P}patch1.diff is now on top $ cd d $ mkdir dir $ echo "This is file one." > dir/file1 $ quilt add dir/file1 - > File d/dir/file1 added to patch patch1.diff + > File d/dir/file1 added to patch %{P}patch1.diff $ quilt add file2 - > File d/file2 added to patch patch1.diff + > File d/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.*//" @@ -37,7 +37,7 @@ > +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 @@ -63,49 +63,49 @@ $ cd .. $ quilt refresh - > Refreshed patch patch1.diff + > Refreshed patch %{P}patch1.diff $ cd .. $ quilt new patch2.diff - > Patch patch2.diff is now on top + > Patch %{P}patch2.diff is now on top $ cd d $ quilt add dir/file3 - > File d/dir/file3 added to patch patch2.diff + > File d/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 d/dir/file3 modified by patch patch2.diff + > File d/dir/file3 modified by patch %{P}patch2.diff $ quilt pop -R - > Removing patch2.diff + > Removing patch %{P}patch2.diff > Removing d/dir/file3 > - > Now at patch patch1.diff + > Now at patch %{P}patch1.diff $ quilt add file4 - > File d/file4 added to patch patch1.diff + > File d/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 d/dir/file3 > - > Now at patch patch2.diff + > Now at patch %{P}patch2.diff $ cd .. $ quilt new subdir/patch3.diff - > Patch subdir/patch3.diff is now on top + > Patch %{P}subdir/patch3.diff is now on top $ cd d $ quilt add file4 - > File d/file4 added to patch subdir/patch3.diff + > File d/file4 added to patch %{P}subdir/patch3.diff $ rm file4 $ quilt diff | sed -e "s/\\t.*//" @@ -117,17 +117,18 @@ > -This is file 4. $ quilt add -p patch2 file4 - > File d/file4 modified by patch subdir/patch3.diff + > File d/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/d/file2 > =================================================================== > --- d.orig/d/file2 @@ -135,27 +136,26 @@ > @@ -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 d/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 ../.. -- cgit