diff options
33 files changed, 352 insertions, 352 deletions
diff --git a/test/add-filename-check.test b/test/add-filename-check.test index 0c15563..d61225b 100644 --- a/test/add-filename-check.test +++ b/test/add-filename-check.test @@ -1,11 +1,11 @@ $ mkdir patches $ quilt new test.diff -> Patch patches/test.diff is now on top +> Patch %{P}test.diff is now on top $ echo foo > foo $ quilt add foo -> File foo added to patch patches/test.diff +> File foo added to patch %{P}test.diff $ quilt add patches/bar > File patches/bar is located below patches/ diff --git a/test/altered-series.test b/test/altered-series.test index 3c1bf71..68e55cf 100644 --- a/test/altered-series.test +++ b/test/altered-series.test @@ -7,24 +7,24 @@ $ cat > patches/series < 03.patch $ quilt push -q 2 -> Applying patch patches/01.patch -> Patch patches/01.patch does not exist; applied empty patch -> Applying patch patches/02.patch -> Patch patches/02.patch does not exist; applied empty patch -> Now at patch patches/02.patch +> Applying patch %{P}01.patch +> Patch %{P}01.patch does not exist; applied empty patch +> Applying patch %{P}02.patch +> Patch %{P}02.patch does not exist; applied empty patch +> Now at patch %{P}02.patch $ quilt series -v -> + patches/01.patch -> = patches/02.patch -> patches/03.patch +> + %{P}01.patch +> = %{P}02.patch +> %{P}03.patch # Touch the series file but preserve the order -> OK $ touch patches/series $ quilt series -v -> + patches/01.patch -> = patches/02.patch -> patches/03.patch +> + %{P}01.patch +> = %{P}02.patch +> %{P}03.patch # Change the order of the patch series -> complain $ cat > patches/series @@ -36,20 +36,20 @@ $ quilt series -v > The series file no longer matches the applied patches. Please run 'quilt pop -a'. $ quilt pop -> Patch patches/02.patch appears to be empty, removing +> Patch %{P}02.patch appears to be empty, removing > -> Now at patch patches/01.patch +> Now at patch %{P}01.patch # That wasn't enough, keep complaining $ quilt series -v > The series file no longer matches the applied patches. Please run 'quilt pop -a'. $ quilt pop -a -> Patch patches/01.patch appears to be empty, removing +> Patch %{P}01.patch appears to be empty, removing > > No patches applied $ quilt series -v -> patches/03.patch -> patches/01.patch -> patches/02.patch +> %{P}03.patch +> %{P}01.patch +> %{P}02.patch diff --git a/test/annotate.test b/test/annotate.test index bca376f..495275c 100644 --- a/test/annotate.test +++ b/test/annotate.test @@ -6,94 +6,94 @@ < baz $ quilt new patch - > Patch patches/patch is now on top + > Patch %{P}patch is now on top $ quilt add foo - > File foo added to patch patches/patch + > File foo added to patch %{P}patch $ sed -e 's:b:B:' foo > foo.new $ mv foo.new foo $ quilt refresh - > Refreshed patch patches/patch + > Refreshed patch %{P}patch $ quilt annotate foo > foo > 1 Bar > 1 Baz > - > 1 patches/patch + > 1 %{P}patch $ quilt new patch2 - > Patch patches/patch2 is now on top + > Patch %{P}patch2 is now on top $ quilt add foo - > File foo added to patch patches/patch2 + > File foo added to patch %{P}patch2 $ sed -e 's:Baz:baz:' foo > foo.new $ mv foo.new foo $ quilt refresh - > Refreshed patch patches/patch2 + > Refreshed patch %{P}patch2 $ quilt annotate foo > foo > 1 Bar > 2 baz > - > 1 patches/patch - > 2 patches/patch2 + > 1 %{P}patch + > 2 %{P}patch2 $ quilt new patch3 - > Patch patches/patch3 is now on top + > Patch %{P}patch3 is now on top $ quilt add foo - > File foo added to patch patches/patch3 + > File foo added to patch %{P}patch3 $ sed -e '/Bar/d' foo > foo.new $ mv foo.new foo $ quilt refresh - > Refreshed patch patches/patch3 + > Refreshed patch %{P}patch3 $ quilt annotate foo > foo > 2 baz > - > 1 patches/patch - > 2 patches/patch2 - > 3 patches/patch3 + > 1 %{P}patch + > 2 %{P}patch2 + > 3 %{P}patch3 $ quilt annotate -P patch3 foo > foo > 2 baz > - > 1 patches/patch - > 2 patches/patch2 - > 3 patches/patch3 + > 1 %{P}patch + > 2 %{P}patch2 + > 3 %{P}patch3 $ quilt annotate -P patch2 foo > foo > 1 Bar > 2 baz > - > 1 patches/patch - > 2 patches/patch2 + > 1 %{P}patch + > 2 %{P}patch2 $ quilt annotate -P patch foo > foo > 1 Bar > 1 Baz > - > 1 patches/patch + > 1 %{P}patch $ quilt new patch4 - > Patch patches/patch4 is now on top + > Patch %{P}patch4 is now on top $ cat > jkl < abc < def $ quilt add jkl wrz - > File jkl added to patch patches/patch4 - > File wrz added to patch patches/patch4 + > File jkl added to patch %{P}patch4 + > File wrz added to patch %{P}patch4 $ rm -f jkl $ cat > wrz @@ -101,14 +101,14 @@ < two $ quilt refresh - > Refreshed patch patches/patch4 + > Refreshed patch %{P}patch4 $ quilt annotate jkl > - > 1 patches/patch4 + > 1 %{P}patch4 $ quilt annotate wrz > 1 one > 1 two > - > 1 patches/patch4 + > 1 %{P}patch4 diff --git a/test/applied.test b/test/applied.test index 272f6bc..e2cba08 100644 --- a/test/applied.test +++ b/test/applied.test @@ -6,30 +6,30 @@ $ echo patch -p0 > patches/series $ rm -f b $ quilt push -q - > Applying patch patches/patch - > Now at patch patches/patch + > Applying patch %{P}patch + > Now at patch %{P}patch $ quilt pop -q - > Removing patch patches/patch + > Removing patch %{P}patch > No patches applied $ patch -s -p0 < patches/patch $ quilt push -q - > Applying patch patches/patch + > Applying patch %{P}patch > 1 out of 1 hunk FAILED - > Patch patches/patch can be reverse-applied + > Patch %{P}patch can be reverse-applied $ echo patch -p0 -R > patches/series $ quilt push -q - > Applying patch patches/patch - > Now at patch patches/patch + > Applying patch %{P}patch + > Now at patch %{P}patch $ quilt pop -q - > Removing patch patches/patch + > Removing patch %{P}patch > No patches applied $ patch -s -p0 -R < patches/patch $ quilt push -q - > Applying patch patches/patch + > Applying patch %{P}patch > 1 out of 1 hunk FAILED - > Patch patches/patch can be reverse-applied + > Patch %{P}patch can be reverse-applied diff --git a/test/auto-refresh.test b/test/auto-refresh.test index 1367a82..e60d802 100644 --- a/test/auto-refresh.test +++ b/test/auto-refresh.test @@ -4,52 +4,52 @@ $ echo a > a $ echo b > b $ quilt new a.patch -> Patch patches/a.patch is now on top +> Patch %{P}a.patch is now on top $ quilt add a -> File a added to patch patches/a.patch +> File a added to patch %{P}a.patch $ echo A > a $ quilt new b.patch -> Patch patches/b.patch is now on top +> Patch %{P}b.patch is now on top $ quilt add b -> File b added to patch patches/b.patch +> File b added to patch %{P}b.patch $ echo B > b $ quilt pop -fa --refresh > Options -f and --refresh are mutually exclusive $ quilt pop -a --refresh -> Refreshed patch patches/b.patch -> Removing patch patches/b.patch +> Refreshed patch %{P}b.patch +> Removing patch %{P}b.patch > Restoring b > -> Refreshed patch patches/a.patch -> Removing patch patches/a.patch +> Refreshed patch %{P}a.patch +> Removing patch %{P}a.patch > Restoring a > > No patches applied $ quilt push -a --refresh -> Applying patch patches/a.patch +> Applying patch %{P}a.patch > patching file a -> Patch patches/a.patch is unchanged +> Patch %{P}a.patch is unchanged > -> Applying patch patches/b.patch +> Applying patch %{P}b.patch > patching file b -> Patch patches/b.patch is unchanged +> Patch %{P}b.patch is unchanged > -> Now at patch patches/b.patch +> Now at patch %{P}b.patch $ quilt push -fa --refresh > Options -f and --refresh are mutually exclusive $ quilt pop -a --refresh -> Patch patches/b.patch is unchanged -> Removing patch patches/b.patch +> Patch %{P}b.patch is unchanged +> Removing patch %{P}b.patch > Restoring b > -> Patch patches/a.patch is unchanged -> Removing patch patches/a.patch +> Patch %{P}a.patch is unchanged +> Removing patch %{P}a.patch > Restoring a > > No patches applied diff --git a/test/basedir.no-test b/test/basedir.no-test index 8799585..25d71f9 100644 --- a/test/basedir.no-test +++ b/test/basedir.no-test @@ -19,6 +19,6 @@ < bar.diff -p0 -d subdir $ quilt push -qa - > Applying patch patches/foo.diff - > Applying patch patches/bar.diff - > Now at patch patches/bar.diff + > Applying patch %{P}foo.diff + > Applying patch %{P}bar.diff + > Now at patch %{P}bar.diff diff --git a/test/colon-in-patch-name.test b/test/colon-in-patch-name.test index 5af36c0..5d0a27b 100644 --- a/test/colon-in-patch-name.test +++ b/test/colon-in-patch-name.test @@ -4,11 +4,11 @@ $ mkdir patches $ quilt new "patch_with:strange[name]" -> Patch patches/patch_with:strange[name] is now on top +> Patch %{P}patch_with:strange[name] is now on top $ echo foo > foo $ quilt add foo -> File foo added to patch patches/patch_with:strange[name] +> File foo added to patch %{P}patch_with:strange[name] $ quilt files > foo @@ -24,45 +24,45 @@ $ quilt diff -p ab -P "patch_with:strange[name]" > +bar $ quilt refresh -p ab -> Refreshed patch patches/patch_with:strange[name] +> Refreshed patch %{P}patch_with:strange[name] $ quilt applied -> patches/patch_with:strange[name] +> %{P}patch_with:strange[name] $ quilt pop -q -> Removing patch patches/patch_with:strange[name] +> Removing patch %{P}patch_with:strange[name] > No patches applied $ quilt next -> patches/patch_with:strange[name] +> %{P}patch_with:strange[name] $ quilt push -q "patch_with:strange[name]" -> Applying patch patches/patch_with:strange[name] -> Now at patch patches/patch_with:strange[name] +> Applying patch %{P}patch_with:strange[name] +> Now at patch %{P}patch_with:strange[name] $ quilt top -> patches/patch_with:strange[name] +> %{P}patch_with:strange[name] $ quilt rename "another:strange(name)" -> Patch patches/patch_with:strange[name] renamed to patches/another:strange(name) +> Patch %{P}patch_with:strange[name] renamed to %{P}another:strange(name) $ quilt new "{%'}.patch" -> Patch patches/{%'}.patch is now on top +> Patch %{P}{%'}.patch is now on top $ quilt add foo -> File foo added to patch patches/{%'}.patch +> File foo added to patch %{P}{%'}.patch $ echo baz > foo " $ quilt previous -> patches/another:strange(name) +> %{P}another:strange(name) $ quilt series -> patches/another:strange(name) -> patches/{%'}.patch +> %{P}another:strange(name) +> %{P}{%'}.patch $ quilt refresh -p0 "{%'}.patch" -> Refreshed patch patches/{%'}.patch +> Refreshed patch %{P}{%'}.patch $ cat "patches/{%'}.patch" > Index: foo @@ -74,10 +74,10 @@ $ cat "patches/{%'}.patch" > +baz $ quilt pop "another:strange(name)" -> Removing patch patches/{%'}.patch +> Removing patch %{P}{%'}.patch > Restoring foo > -> Now at patch patches/another:strange(name) +> Now at patch %{P}another:strange(name) $ quilt remove foo -> File foo removed from patch patches/another:strange(name) +> File foo removed from patch %{P}another:strange(name) diff --git a/test/dir-a-b.test b/test/dir-a-b.test index d921079..326d482 100644 --- a/test/dir-a-b.test +++ b/test/dir-a-b.test @@ -21,8 +21,8 @@ $ echo "ab.diff" > patches/series $ quilt push -q - > Applying patch patches/ab.diff - > Now at patch patches/ab.diff + > Applying patch %{P}ab.diff + > Now at patch %{P}ab.diff $ quilt diff -p ab --no-index > --- a/test.txt @@ -41,7 +41,7 @@ $ rm -f patches/ab.diff $ quilt refresh -p ab --no-index - > Refreshed patch patches/ab.diff + > Refreshed patch %{P}ab.diff $ cat patches/ab.diff > --- a/test.txt @@ -59,5 +59,5 @@ > -d $ quilt pop -qR - > Removing patch patches/ab.diff + > Removing patch %{P}ab.diff > No patches applied diff --git a/test/dotglob.test b/test/dotglob.test index d190226..04d28c4 100644 --- a/test/dotglob.test +++ b/test/dotglob.test @@ -1,19 +1,19 @@ $ mkdir patches $ quilt new dotglob.diff - > Patch patches/dotglob.diff is now on top + > Patch %{P}dotglob.diff is now on top $ quilt add .foo - > File .foo added to patch patches/dotglob.diff + > File .foo added to patch %{P}dotglob.diff $ echo dot-foo > .foo $ quilt refresh - > Refreshed patch patches/dotglob.diff + > Refreshed patch %{P}dotglob.diff $ quilt pop -q - > Removing patch patches/dotglob.diff + > Removing patch %{P}dotglob.diff > No patches applied $ quilt push -q - > Applying patch patches/dotglob.diff - > Now at patch patches/dotglob.diff + > Applying patch %{P}dotglob.diff + > Now at patch %{P}dotglob.diff diff --git a/test/edit.test b/test/edit.test index 2091305..98fd393 100644 --- a/test/edit.test +++ b/test/edit.test @@ -10,11 +10,11 @@ $ chmod +x editor $ export EDITOR=%{PWD}/editor $ quilt new patch -> Patch patches/patch is now on top +> Patch %{P}patch is now on top $ echo foobar > foobar $ quilt edit foobar -> File foobar added to patch patches/patch +> File foobar added to patch %{P}patch > Editing foobar $ cat foobar @@ -23,7 +23,7 @@ $ cat foobar $ cd subdir $ echo foo > foo $ quilt edit foo -> File subdir/foo added to patch ../patches/patch +> File subdir/foo added to patch %{_P}patch > Editing subdir/foo $ cd .. @@ -35,7 +35,7 @@ $ quilt files > subdir/foo $ quilt refresh -> Refreshed patch patches/patch +> Refreshed patch %{P}patch # Test the behavior if the editor deletes a file completely $ echo foobaz > foobaz @@ -45,7 +45,7 @@ $ cat > editor < rm -f $1 $ quilt edit foobaz -> File foobaz added to patch patches/patch +> File foobaz added to patch %{P}patch > Deleting foobaz $ [ ! -e foobaz ] || echo "File foobaz shouldn't exist" @@ -57,15 +57,15 @@ $ cat > editor < echo Doing nothing to $1 $ quilt edit nofoo -> File nofoo added to patch patches/patch +> File nofoo added to patch %{P}patch > Doing nothing to nofoo -> File nofoo removed from patch patches/patch +> File nofoo removed from patch %{P}patch # Test the behavior if the patch is deleting a file and the # user calls "quilt edit" on that file but makes no change to it $ rm -f foobar $ quilt refresh -> Refreshed patch patches/patch +> Refreshed patch %{P}patch $ quilt diff -p ab --no-index foobar > --- a/foobar > +++ /dev/null @@ -73,7 +73,7 @@ $ quilt diff -p ab --no-index foobar > -foobar $ quilt edit foobar -> File foobar is already in patch patches/patch +> File foobar is already in patch %{P}patch > Doing nothing to foobar $ [ ! -e foobar ] || echo "File foobar shouldn't exist" @@ -85,7 +85,7 @@ $ cat > editor < echo "new line" > $1 $ quilt edit foo2 -> File foo2 added to patch patches/patch +> File foo2 added to patch %{P}patch > Creating foo2 $ cat foo2 > new line diff --git a/test/empty-files.test b/test/empty-files.test index eb2c1e6..7e5724d 100644 --- a/test/empty-files.test +++ b/test/empty-files.test @@ -38,11 +38,11 @@ # Test quilt push $ quilt push - > Applying patch patches/using-filenames.patch + > Applying patch %{P}using-filenames.patch > patching file deleted1 > patching file emptied1 > - > Now at patch patches/using-filenames.patch + > Now at patch %{P}using-filenames.patch $ [ ! -e deleted1 ] && echo "File deleted1 does not exist" > File deleted1 does not exist $ [ -e deleted1 -a ! -s deleted1 ] && echo "File deleted1 is empty" @@ -51,11 +51,11 @@ > File emptied1 is empty $ quilt push - > Applying patch patches/using-timestamps.patch + > Applying patch %{P}using-timestamps.patch > patching file deleted2 > patching file emptied2 > - > Now at patch patches/using-timestamps.patch + > Now at patch %{P}using-timestamps.patch $ [ ! -e deleted2 ] && echo "File deleted2 does not exist" > File deleted2 does not exist $ [ -e deleted2 -a ! -s deleted2 ] && echo "File deleted2 is empty" @@ -65,12 +65,12 @@ # Test quilt fold $ quilt pop -aq - > Removing patch patches/using-timestamps.patch - > Removing patch patches/using-filenames.patch + > Removing patch %{P}using-timestamps.patch + > Removing patch %{P}using-filenames.patch > No patches applied $ quilt new fold.patch - > Patch patches/fold.patch is now on top + > Patch %{P}fold.patch is now on top $ quilt fold < patches/using-filenames.patch > patching file deleted1 @@ -94,25 +94,25 @@ # Test quilt refresh $ quilt delete - > Removing patch patches/fold.patch + > Removing patch %{P}fold.patch > No patches applied - > Removed patch patches/fold.patch + > Removed patch %{P}fold.patch $ quilt push -q - > Applying patch patches/using-filenames.patch - > Now at patch patches/using-filenames.patch + > Applying patch %{P}using-filenames.patch + > Now at patch %{P}using-filenames.patch $ quilt refresh -pab --sort --no-index - > Refreshed patch patches/using-filenames.patch + > Refreshed patch %{P}using-filenames.patch $ quilt pop -q - > Removing patch patches/using-filenames.patch + > Removing patch %{P}using-filenames.patch > No patches applied $ quilt push - > Applying patch patches/using-filenames.patch + > Applying patch %{P}using-filenames.patch > patching file deleted1 > patching file emptied1 > - > Now at patch patches/using-filenames.patch + > Now at patch %{P}using-filenames.patch $ [ ! -e deleted1 ] && echo "File deleted1 does not exist" > File deleted1 does not exist $ [ -e deleted1 -a ! -s deleted1 ] && echo "File deleted1 is empty" diff --git a/test/example1.test b/test/example1.test index 09e9edc..d55ef30 100644 --- a/test/example1.test +++ b/test/example1.test @@ -81,7 +81,7 @@ Or ``quilt edit Oberon.txt'' > Oberon.txt $ quilt patches Oberon.txt - > patches/flower.diff + > %{P}flower.diff $ quilt pop -f > Removing patch %{P}flower.diff > Restoring Oberon.txt diff --git a/test/failbackup.test b/test/failbackup.test index d89444f..5f0f54f 100644 --- a/test/failbackup.test +++ b/test/failbackup.test @@ -8,7 +8,7 @@ $ cat > test.txt < This is test.txt. $ quilt refresh - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff What happens when refresh fails because of a permission error? diff --git a/test/half-applies.test b/test/half-applies.test index 243f6c3..1afddeb 100644 --- a/test/half-applies.test +++ b/test/half-applies.test @@ -10,29 +10,29 @@ $ mv foo.orig foo $ mv bar.orig bar $ echo foorab.diff -p0 > patches/series $ quilt push -> Applying patch patches/foorab.diff +> Applying patch %{P}foorab.diff >~ patching file `?foo'? >~ patching file `?bar'? > Hunk #1 FAILED at 1. >~ 1 out of 1 hunk FAILED -- rejects in file `?bar'? -> Patch patches/foorab.diff does not apply (enforce with -f) +> Patch %{P}foorab.diff does not apply (enforce with -f) $ echo %{?} > 1 $ quilt push -> Applying patch patches/foorab.diff +> Applying patch %{P}foorab.diff >~ patching file `?foo'? >~ patching file `?bar'? > Hunk #1 FAILED at 1. >~ 1 out of 1 hunk FAILED -- rejects in file `?bar'? -> Patch patches/foorab.diff does not apply (enforce with -f) +> Patch %{P}foorab.diff does not apply (enforce with -f) $ echo %{?} > 1 $ quilt push -qf -> Applying patch patches/foorab.diff +> Applying patch %{P}foorab.diff >~ 1 out of 1 hunk FAILED( -- saving rejects to( file)? bar.rej)? -> Applied patch patches/foorab.diff (forced; needs refresh) +> Applied patch %{P}foorab.diff (forced; needs refresh) $ echo %{?} > 1 diff --git a/test/hard-linked-patch.test b/test/hard-linked-patch.test index 279c595..10f5f9d 100644 --- a/test/hard-linked-patch.test +++ b/test/hard-linked-patch.test @@ -14,12 +14,12 @@ $ ln patches/patch hardlink $ echo a > file $ quilt push -q -> Applying patch patches/patch -> Now at patch patches/patch +> Applying patch %{P}patch +> Now at patch %{P}patch $ echo c > file $ quilt refresh --no-index -> Refreshed patch patches/patch +> Refreshed patch %{P}patch $ cat patches/patch > --- file.orig @@ -42,7 +42,7 @@ $ ln patches/patch hardlink $ quilt header -r < c is so much better than a -> Replaced header of patch patches/patch +> Replaced header of patch %{P}patch $ cat patches/patch > c is so much better than a diff --git a/test/header.test b/test/header.test index 7e0cbca..fdc6e47 100644 --- a/test/header.test +++ b/test/header.test @@ -2,14 +2,14 @@ $ echo foo > foo $ quilt new patch - > Patch patches/patch is now on top + > Patch %{P}patch is now on top $ quilt add foo - > File foo added to patch patches/patch + > File foo added to patch %{P}patch $ echo bar > foo $ quilt refresh -p ab - > Refreshed patch patches/patch + > Refreshed patch %{P}patch $ mv patches/patch patches/patch~ $ echo Header > patches/patch @@ -19,14 +19,14 @@ $ quilt header -r < Header2 - > Replaced header of patch patches/patch + > Replaced header of patch %{P}patch $ quilt header > Header2 $ quilt header -a < Appended - > Appended text to header of patch patches/patch + > Appended text to header of patch %{P}patch $ quilt header > Header2 diff --git a/test/import.test b/test/import.test index 3a11930..dd4247a 100644 --- a/test/import.test +++ b/test/import.test @@ -29,10 +29,10 @@ > Refreshed patch %{P}patchRp0.diff $ quilt pop -a - > Removing patch patches/patchRp0.diff + > Removing patch %{P}patchRp0.diff > Restoring f > - > Removing patch patches/patch1.diff + > Removing patch %{P}patch1.diff > Removing f > > No patches applied @@ -46,13 +46,13 @@ $ rm -rf patches/ .pc/ $ mkdir patches $ quilt import t/patch1.diff - > Importing patch t/patch1.diff (stored as patches/patch1.diff) + > Importing patch t/patch1.diff (stored as %{P}patch1.diff) $ quilt push - > Applying patch patches/patch1.diff + > Applying patch %{P}patch1.diff >~ patching file `?f'? > - > Now at patch patches/patch1.diff + > Now at patch %{P}patch1.diff $ quilt new patch2.diff > Patch %{P}patch2.diff is now on top @@ -66,23 +66,23 @@ > Refreshed patch %{P}patch2.diff $ quilt pop - > Removing patch patches/patch2.diff + > Removing patch %{P}patch2.diff > Removing g > - > Now at patch patches/patch1.diff + > Now at patch %{P}patch1.diff $ quilt header -a < original description - > Appended text to header of patch patches/patch1.diff + > Appended text to header of patch %{P}patch1.diff $ quilt pop - > Removing patch patches/patch1.diff + > Removing patch %{P}patch1.diff > Removing f > > No patches applied $ quilt delete patch1 - > Removed patch patches/patch1.diff + > Removed patch %{P}patch1.diff $ cat patches/series > patch2.diff @@ -93,23 +93,23 @@ > Patch missing.diff does not exist $ quilt import patches/patch1.diff - > Importing patch patches/patch1.diff + > Importing patch %{P}patch1.diff $ quilt import patches/patch2.diff - > Patch patches/patch2.diff already exists in series. + > Patch %{P}patch2.diff already exists in series. # a simple use of import $ quilt import t/patch1.diff - > Patch patches/patch1.diff exists. Replace with -f. + > Patch %{P}patch1.diff exists. Replace with -f. $ quilt import -f t/patch1.diff - > Replacing patch patches/patch1.diff with new version + > Replacing patch %{P}patch1.diff with new version # an import requiring a description merge $ sed -e 's/original/new/' patches/patch1.diff > t/patch1.diff $ quilt import t/patch1.diff - > Patch patches/patch1.diff exists. Replace with -f. + > Patch %{P}patch1.diff exists. Replace with -f. $ quilt import -f t/patch1.diff > Patch headers differ: @@ -119,7 +119,7 @@ > Please use -d {o|a|n} to specify which patch header(s) to keep. $ quilt import -d a -f t/patch1.diff - > Replacing patch patches/patch1.diff with new version + > Replacing patch %{P}patch1.diff with new version # quilt header does not work in this case because it stops at '---' $ head -n 3 patches/patch1.diff @@ -128,20 +128,20 @@ > new description $ quilt import -d n -f t/patch1.diff - > Replacing patch patches/patch1.diff with new version + > Replacing patch %{P}patch1.diff with new version $ quilt header patch1 > new description $ quilt delete patch1 - > Removed patch patches/patch1.diff + > Removed patch %{P}patch1.diff # make sure it accepts non-conflicting names # a small presentation problem here $ cp patches/patch1.diff t/patch1.patch $ quilt import t/patch1.patch - > Importing patch t/patch1.patch (stored as patches/patch1.patch) + > Importing patch t/patch1.patch (stored as %{P}patch1.patch) $ ls patches/ > patch1.diff @@ -160,13 +160,13 @@ $ rm -rf patches/ .pc/ $ mkdir patches $ quilt import -R t/patchR.diff - > Importing patch t/patchR.diff (stored as patches/patchR.diff) + > Importing patch t/patchR.diff (stored as %{P}patchR.diff) $ quilt push - > Applying patch patches/patchR.diff + > Applying patch %{P}patchR.diff >~ patching file `?f'? > - > Now at patch patches/patchR.diff + > Now at patch %{P}patchR.diff $ cat f > f @@ -188,7 +188,7 @@ $ touch f $ quilt pop - > Removing patch patches/patchR.diff + > Removing patch %{P}patchR.diff > Removing f > > No patches applied @@ -197,13 +197,13 @@ $ rm -rf patches/ .pc/ $ mkdir patches $ quilt import -R -p0 t/patchRp0.diff - > Importing patch t/patchRp0.diff (stored as patches/patchRp0.diff) + > Importing patch t/patchRp0.diff (stored as %{P}patchRp0.diff) $ quilt push - > Applying patch patches/patchRp0.diff + > Applying patch %{P}patchRp0.diff >~ patching file `?f'? > - > Now at patch patches/patchRp0.diff + > Now at patch %{P}patchRp0.diff $ cat f > f @@ -220,7 +220,7 @@ $ touch f $ quilt pop - > Removing patch patches/patchRp0.diff + > Removing patch %{P}patchRp0.diff > Removing f > > No patches applied @@ -229,8 +229,8 @@ $ rm -rf patches/ .pc/ $ mkdir patches $ quilt import t/patch1.diff t/patchR.diff - > Importing patch t/patch1.diff (stored as patches/patch1.diff) - > Importing patch t/patchR.diff (stored as patches/patchR.diff) + > Importing patch t/patch1.diff (stored as %{P}patch1.diff) + > Importing patch t/patchR.diff (stored as %{P}patchR.diff) $ cat patches/series > patch1.diff @@ -239,9 +239,9 @@ $ rm -rf patches/ .pc/ $ mkdir patches $ quilt import t/patchR.diff - > Importing patch t/patchR.diff (stored as patches/patchR.diff) + > Importing patch t/patchR.diff (stored as %{P}patchR.diff) $ quilt import t/patch1.diff - > Importing patch t/patch1.diff (stored as patches/patch1.diff) + > Importing patch t/patch1.diff (stored as %{P}patch1.diff) $ cat patches/series > patch1.diff @@ -252,6 +252,6 @@ $ cd t $ touch empty2.patch $ quilt import ../empty.patch - > Importing patch ../empty.patch (stored as ../patches/empty.patch) + > Importing patch ../empty.patch (stored as %{_P}empty.patch) $ quilt import %{PWD}/empty2.patch - > Importing patch %{PWD}/empty2.patch (stored as ../patches/empty2.patch) + > Importing patch %{PWD}/empty2.patch (stored as %{_P}empty2.patch) diff --git a/test/mail.test b/test/mail.test index 735a983..762854b 100644 --- a/test/mail.test +++ b/test/mail.test @@ -11,7 +11,7 @@ $ cat no-subject > patches/1.diff $ ls patches/ > series $ quilt mail --mbox mbox --prefix "test" --subject "This is a test" -m "Message" - > Unable to extract a subject header from patches/1.diff + > Unable to extract a subject header from %{P}1.diff $ cat - no-subject > patches/1.diff < Subject: Subject of 1.diff @@ -59,13 +59,13 @@ # Test 3 duplicate headers $ ls patches/ > series $ quilt mail --mbox mbox --prefix "test" --subject "This is a test" -m "Message" - > Patches patches/1.diff, patches/5.diff, patches/6.diff have duplicate subject headers. + > Patches %{P}1.diff, %{P}5.diff, %{P}6.diff have duplicate subject headers. # Test 2 duplicate headers $ rm patches/6.diff $ ls patches/ > series $ quilt mail --mbox mbox --prefix "test" --subject "This is a test" -m "Message" - > Patches patches/1.diff, patches/5.diff have duplicate subject headers. + > Patches %{P}1.diff, %{P}5.diff have duplicate subject headers. $ cat - no-subject > patches/5.diff < Aw: [patch] Fwd: Re: [patch 5/7] Fw: Subject of 5.diff diff --git a/test/missing.test b/test/missing.test index 74db5c0..f7160f8 100644 --- a/test/missing.test +++ b/test/missing.test @@ -5,16 +5,16 @@ < missing2.diff $ quilt push -qa - > Applying patch patches/missing1.diff - > Patch patches/missing1.diff does not exist; applied empty patch - > Applying patch patches/missing2.diff - > Patch patches/missing2.diff does not exist; applied empty patch - > Now at patch patches/missing2.diff + > Applying patch %{P}missing1.diff + > Patch %{P}missing1.diff does not exist; applied empty patch + > Applying patch %{P}missing2.diff + > Patch %{P}missing2.diff does not exist; applied empty patch + > Now at patch %{P}missing2.diff $ quilt rename missing3.diff > Patch %{P}missing2.diff renamed to %{P}missing3.diff $ quilt pop -qa > Patch %{P}missing3.diff appears to be empty, removing - > Patch patches/missing1.diff appears to be empty, removing + > Patch %{P}missing1.diff appears to be empty, removing > No patches applied diff --git a/test/no-file-to-patch.test b/test/no-file-to-patch.test index d7ffaa4..fd2b347 100644 --- a/test/no-file-to-patch.test +++ b/test/no-file-to-patch.test @@ -12,7 +12,7 @@ $ cat > patches/one.patch < -foo < +bar $ quilt push -q -> Applying patch patches/one.patch +> Applying patch %{P}one.patch > The text leading up to this was: > -------------------------- > |--- a/foo @@ -20,6 +20,6 @@ $ quilt push -q > -------------------------- > No file to patch. Skipping patch. > 1 out of 1 hunk ignored -> Patch patches/one.patch does not apply (enforce with -f) +> Patch %{P}one.patch does not apply (enforce with -f) $ echo %{?} > 1 diff --git a/test/nolink.test b/test/nolink.test index 5ac9473..47b8d51 100644 --- a/test/nolink.test +++ b/test/nolink.test @@ -7,10 +7,10 @@ > 2 $ quilt new test.diff - > Patch patches/test.diff is now on top + > Patch %{P}test.diff is now on top $ quilt add foo - > File foo added to patch patches/test.diff + > File foo added to patch %{P}test.diff $ ls -l foo | awk '{ print $2 }' > 1 @@ -20,13 +20,13 @@ $ echo "foo changed" > foo $ quilt refresh - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ quilt new test2.diff - > Patch patches/test2.diff is now on top + > Patch %{P}test2.diff is now on top $ quilt add foo - > File foo added to patch patches/test2.diff + > File foo added to patch %{P}test2.diff $ ls -l foo | awk '{ print $2 }' > 1 @@ -36,11 +36,11 @@ $ echo "foo changed again" > foo $ quilt refresh - > Refreshed patch patches/test2.diff + > Refreshed patch %{P}test2.diff $ quilt pop -q - > Removing patch patches/test2.diff - > Now at patch patches/test.diff + > Removing patch %{P}test2.diff + > Now at patch %{P}test.diff $ ls -l foo | awk '{ print $2 }' > 1 @@ -49,7 +49,7 @@ > 2 $ quilt pop -q - > Removing patch patches/test.diff + > Removing patch %{P}test.diff > No patches applied $ ls -l foo | awk '{ print $2 }' @@ -58,18 +58,18 @@ # quilt revert should not create hard links $ echo bar > bar $ quilt push -q - > Applying patch patches/test.diff - > Now at patch patches/test.diff + > Applying patch %{P}test.diff + > Now at patch %{P}test.diff $ quilt add bar - > File bar added to patch patches/test.diff + > File bar added to patch %{P}test.diff $ echo "bar changed" > bar $ quilt revert bar - > Changes to bar in patch patches/test.diff reverted + > Changes to bar in patch %{P}test.diff reverted $ ls -l bar | awk '{ print $2 }' > 1 $ quilt pop -q - > Removing patch patches/test.diff + > Removing patch %{P}test.diff > No patches applied diff --git a/test/null-bug.test b/test/null-bug.test index aa926f9..223706c 100644 --- a/test/null-bug.test +++ b/test/null-bug.test @@ -2,10 +2,10 @@ $ echo file > file $ quilt new remove.diff - > Patch patches/remove.diff is now on top + > Patch %{P}remove.diff is now on top $ quilt add file - > File file added to patch patches/remove.diff + > File file added to patch %{P}remove.diff In this case, the original file in the --- line must not have .orig appended or else patch won't know the real original filename anymore. @@ -20,12 +20,12 @@ or else patch won't know the real original filename anymore. > -file $ quilt refresh -p0 - > Refreshed patch patches/remove.diff + > Refreshed patch %{P}remove.diff $ quilt pop -q - > Removing patch patches/remove.diff + > Removing patch %{P}remove.diff > No patches applied $ quilt push -q - > Applying patch patches/remove.diff - > Now at patch patches/remove.diff + > Applying patch %{P}remove.diff + > Now at patch %{P}remove.diff diff --git a/test/patch-wrapper.test b/test/patch-wrapper.test index 93fd50a..69b41d1 100644 --- a/test/patch-wrapper.test +++ b/test/patch-wrapper.test @@ -13,7 +13,7 @@ $ mv foo.orig foo $ mkdir ${QUILT_PATCHES:-patches} $ patch-wrapper -s -p0 < foo.diff $ quilt pop -q -> Removing patch patches/foo.diff +> Removing patch %{P}foo.diff > No patches applied $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc} @@ -22,14 +22,14 @@ $ patch-wrapper --backup -B xxx/ -s -p0 < foo.diff $ find xxx -type f > xxx/foo $ quilt pop -q -> Removing patch patches/foo.diff +> Removing patch %{P}foo.diff > No patches applied $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc} $ mkdir ${QUILT_PATCHES:-patches} $ patch-wrapper -s -p0 -i foo.diff $ quilt pop -q -> Removing patch patches/foo.diff +> Removing patch %{P}foo.diff > No patches applied $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc} @@ -37,7 +37,7 @@ $ mkdir ${QUILT_PATCHES:-patches} $ patch-wrapper -p0 < foo.diff > patching file foo $ quilt pop -q -> Removing patch patches/foo.diff +> Removing patch %{P}foo.diff > No patches applied $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc} @@ -46,7 +46,7 @@ $ mkdir ${QUILT_PATCHES:-patches} $ patch-wrapper -p0 < somewhere/foo.diff > patching file foo $ quilt pop -q -> Removing patch patches/somewhere/foo.diff +> Removing patch %{P}somewhere/foo.diff > No patches applied $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc} @@ -54,7 +54,7 @@ $ mkdir ${QUILT_PATCHES:-patches} $ patch-wrapper -p0 -i somewhere/foo.diff > patching file foo $ quilt pop -q -> Removing patch patches/somewhere/foo.diff +> Removing patch %{P}somewhere/foo.diff > No patches applied $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc} @@ -71,6 +71,6 @@ $ cat foo.orig > > 5b $ quilt pop -q -> Removing patch patches/somewhere/foo.diff +> Removing patch %{P}somewhere/foo.diff > No patches applied $ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc} diff --git a/test/refresh-z.test b/test/refresh-z.test index 0916e6f..296b92a 100644 --- a/test/refresh-z.test +++ b/test/refresh-z.test @@ -1,24 +1,24 @@ $ mkdir patches $ quilt new test.diff - > Patch patches/test.diff is now on top + > Patch %{P}test.diff is now on top $ quilt add foo - > File foo added to patch patches/test.diff + > File foo added to patch %{P}test.diff $ echo foo > foo $ quilt refresh - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ echo bar >> foo $ quilt refresh -z - > Fork of patch patches/test.diff created as patches/test-2.diff + > Fork of patch %{P}test.diff created as %{P}test-2.diff $ echo baz >> foo $ quilt refresh -zbaz.diff - > Fork of patch patches/test-2.diff created as patches/baz.diff + > Fork of patch %{P}test-2.diff created as %{P}baz.diff $ quilt series - > patches/test.diff - > patches/test-2.diff - > patches/baz.diff + > %{P}test.diff + > %{P}test-2.diff + > %{P}baz.diff diff --git a/test/refresh.test b/test/refresh.test index 7bfcaae..bdab21d 100644 --- a/test/refresh.test +++ b/test/refresh.test @@ -6,14 +6,14 @@ $ echo patch -p0 > patches/series $ rm -f b $ quilt push -q - > Applying patch patches/patch - > Now at patch patches/patch + > Applying patch %{P}patch + > Now at patch %{P}patch $ echo a > a $ quilt refresh - > Nothing in patch patches/patch + > Nothing in patch %{P}patch $ quilt pop - > Removing patch patches/patch + > Removing patch %{P}patch > Restoring a > > No patches applied diff --git a/test/revert.test b/test/revert.test index 02d0c6c..d86dcd6 100644 --- a/test/revert.test +++ b/test/revert.test @@ -4,16 +4,16 @@ $ echo f1 > sub/f $ echo g1 > sub/g $ quilt new p.diff - > Patch patches/p.diff is now on top + > Patch %{P}p.diff is now on top $ quilt add sub/f sub/g sub/h - > File sub/f added to patch patches/p.diff - > File sub/g added to patch patches/p.diff - > File sub/h added to patch patches/p.diff + > File sub/f added to patch %{P}p.diff + > File sub/g added to patch %{P}p.diff + > File sub/h added to patch %{P}p.diff $ echo h1 > sub/h $ quilt revert sub/h - > Changes to sub/h in patch patches/p.diff reverted + > Changes to sub/h in patch %{P}p.diff reverted $ quilt diff -z @@ -22,16 +22,16 @@ $ rm -f sub/g $ echo h2 > sub/h $ quilt refresh - > Refreshed patch patches/p.diff + > Refreshed patch %{P}p.diff # Check if we can revert modifications $ cd sub $ echo f3 > f $ echo h3 > h $ quilt revert f g h - > Changes to sub/f in patch ../patches/p.diff reverted + > Changes to sub/f in patch %{_P}p.diff reverted > File sub/g is unchanged - > Changes to sub/h in patch ../patches/p.diff reverted + > Changes to sub/h in patch %{_P}p.diff reverted $ quilt diff -z @@ -39,7 +39,7 @@ $ echo g3 > g $ quilt revert f g > File sub/f is unchanged - > Changes to sub/g in patch ../patches/p.diff reverted + > Changes to sub/g in patch %{_P}p.diff reverted $ quilt diff -z $ [ ! -e g ] || echo "File sub/g shouldn't exist" @@ -47,8 +47,8 @@ # Check if we can revert file deletion $ rm f h $ quilt revert f h - > Changes to sub/f in patch ../patches/p.diff reverted - > Changes to sub/h in patch ../patches/p.diff reverted + > Changes to sub/f in patch %{_P}p.diff reverted + > Changes to sub/h in patch %{_P}p.diff reverted $ quilt diff -z $ [ -e f ] || echo "File sub/f should exist" diff --git a/test/setup.test b/test/setup.test index 69725ec..690008e 100644 --- a/test/setup.test +++ b/test/setup.test @@ -26,10 +26,10 @@ $ ls -l patches series | sed -e 's:.* -> ::' > .. > ../series $ quilt push -qa -> Applying patch patches/foo.diff -> Applying patch patches/revert.diff -> Applying patch patches/again.diff -> Now at patch patches/again.diff +> Applying patch %{P}foo.diff +> Applying patch %{P}revert.diff +> Applying patch %{P}again.diff +> Now at patch %{P}again.diff $ cd .. $ rm -rf dir @@ -46,10 +46,10 @@ $ ls -l patches series | sed -e 's:.* -> ::' > ../.. > ../../series $ quilt push -qa -> Applying patch patches/foo.diff -> Applying patch patches/revert.diff -> Applying patch patches/again.diff -> Now at patch patches/again.diff +> Applying patch %{P}foo.diff +> Applying patch %{P}revert.diff +> Applying patch %{P}again.diff +> Now at patch %{P}again.diff $ cd ../.. $ rm -rf other $ mkdir dir1 @@ -64,10 +64,10 @@ $ ls -l patches series | sed -e 's:.* -> ::' > ../.. > ../../dir1/series $ quilt push -qa -> Applying patch patches/foo.diff -> Applying patch patches/revert.diff -> Applying patch patches/again.diff -> Now at patch patches/again.diff +> Applying patch %{P}foo.diff +> Applying patch %{P}revert.diff +> Applying patch %{P}again.diff +> Now at patch %{P}again.diff $ cd ../.. $ rm -rf "dir" @@ -122,9 +122,9 @@ $ ls -l patches series | sed -e 's:.* -> ::' > .. > ../series $ quilt push -qa -> Applying patch patches/foo.diff -> Applying patch patches/revert.diff -> Applying patch patches/again.diff -> Now at patch patches/again.diff +> Applying patch %{P}foo.diff +> Applying patch %{P}revert.diff +> Applying patch %{P}again.diff +> Now at patch %{P}again.diff $ cd .. $ rm -rf "space [dir]" diff --git a/test/sort.test b/test/sort.test index c3a66c4..41182f0 100644 --- a/test/sort.test +++ b/test/sort.test @@ -1,23 +1,23 @@ $ mkdir patches $ quilt new sort.diff - > Patch patches/sort.diff is now on top + > Patch %{P}sort.diff is now on top $ quilt add b f - > File b added to patch patches/sort.diff - > File f added to patch patches/sort.diff + > File b added to patch %{P}sort.diff + > File f added to patch %{P}sort.diff $ echo b > b $ echo f > f $ quilt refresh - > Refreshed patch patches/sort.diff + > Refreshed patch %{P}sort.diff $ quilt add c - > File c added to patch patches/sort.diff + > File c added to patch %{P}sort.diff $ echo c > c $ quilt refresh - > Refreshed patch patches/sort.diff + > Refreshed patch %{P}sort.diff $ quilt files > b @@ -30,8 +30,8 @@ >~ Index: [^/]+/c $ quilt add z x - > File z added to patch patches/sort.diff - > File x added to patch patches/sort.diff + > File z added to patch %{P}sort.diff + > File x added to patch %{P}sort.diff $ echo z > z $ echo x > x @@ -50,7 +50,7 @@ >~ Index: [^/]+/z $ quilt add a - > File a added to patch patches/sort.diff + > File a added to patch %{P}sort.diff $ echo a > a $ quilt files @@ -70,7 +70,7 @@ >~ Index: [^/]+/z $ quilt refresh - > Refreshed patch patches/sort.diff + > Refreshed patch %{P}sort.diff $ grep '^Index' patches/sort.diff >~ Index: [^/]+/b @@ -89,7 +89,7 @@ >~ Index: [^/]+/z $ quilt refresh --sort - > Refreshed patch patches/sort.diff + > Refreshed patch %{P}sort.diff $ grep '^Index' patches/sort.diff >~ Index: [^/]+/a diff --git a/test/space-in-filenames.test b/test/space-in-filenames.test index 33c6726..2005d00 100644 --- a/test/space-in-filenames.test +++ b/test/space-in-filenames.test @@ -1,39 +1,39 @@ $ mkdir patches $ quilt new test.diff -> Patch patches/test.diff is now on top +> Patch %{P}test.diff is now on top $ echo foo > foo $ quilt add foo -> File foo added to patch patches/test.diff +> File foo added to patch %{P}test.diff $ quilt files > foo $ quilt patches foo -> patches/test.diff +> %{P}test.diff $ quilt patches "foo bar" $ echo foo > "foo bar" $ quilt add "foo bar" -> File foo bar added to patch patches/test.diff +> File foo bar added to patch %{P}test.diff $ quilt files > foo > foo bar $ quilt patches "foo bar" -> patches/test.diff +> %{P}test.diff $ quilt patches bar $ quilt patches "foo bar baz" $ quilt add "a: b [c]" -> File a: b [c] added to patch patches/test.diff +> File a: b [c] added to patch %{P}test.diff $ quilt files > a: b [c] > foo > foo bar $ quilt patches 'a: b [c]' -> patches/test.diff +> %{P}test.diff $ quilt patches a $ quilt patches b $ quilt patches 'a: b c' @@ -56,7 +56,7 @@ $ quilt diff -p ab > +bar $ quilt refresh -p ab -> Refreshed patch patches/test.diff +> Refreshed patch %{P}test.diff $ cat patches/test.diff > Index: b/a: b [c] > =================================================================== @@ -73,7 +73,7 @@ $ cat patches/test.diff > +bar $ quilt refresh -p ab --sort -> Patch patches/test.diff is unchanged +> Patch %{P}test.diff is unchanged $ cat patches/test.diff > Index: b/a: b [c] > =================================================================== @@ -97,14 +97,14 @@ $ quilt grep " " > a: b [c]:new line $ quilt remove "a: b [c]" -> File a: b [c] removed from patch patches/test.diff +> File a: b [c] removed from patch %{P}test.diff $ quilt files > foo > foo bar $ quilt remove "foo bar" -> File foo bar removed from patch patches/test.diff +> File foo bar removed from patch %{P}test.diff $ quilt files > foo diff --git a/test/symlink.test b/test/symlink.test index 342ec10..3b05cb4 100644 --- a/test/symlink.test +++ b/test/symlink.test @@ -3,14 +3,14 @@ # quilt should not remove symlinks to patch files $ echo foo > foo $ quilt new test.diff - > Patch patches/test.diff is now on top + > Patch %{P}test.diff is now on top $ quilt add foo - > File foo added to patch patches/test.diff + > File foo added to patch %{P}test.diff $ echo "foo changed" > foo $ quilt refresh - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff # Setup a symlink $ mv patches/test.diff . @@ -21,7 +21,7 @@ # Test the refresh $ echo "foo changed 2" > foo $ quilt refresh --no-index -p ab - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ readlink patches/test.diff > ../test.diff @@ -30,7 +30,7 @@ $ echo "foo changed 3" > foo $ touch -r patches/test.diff test.timeref $ quilt refresh --backup --no-index -p ab - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ readlink patches/test.diff > ../test.diff @@ -58,7 +58,7 @@ # Test the header update $ quilt header -a < A test patch - > Appended text to header of patch patches/test.diff + > Appended text to header of patch %{P}test.diff $ readlink patches/test.diff > ../test.diff @@ -66,7 +66,7 @@ # Test the header update with a backup $ touch -r patches/test.diff test.timeref $ quilt header -r --backup - > Replaced header of patch patches/test.diff + > Replaced header of patch %{P}test.diff $ readlink patches/test.diff > ../test.diff @@ -96,7 +96,7 @@ $ chmod -w test.diff $ echo "foo changed 4" > foo $ quilt refresh --no-index -p ab - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ readlink patches/test.diff $ echo %{?} @@ -117,7 +117,7 @@ $ echo "foo changed 5" > foo $ quilt refresh --backup --no-index -p ab - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ readlink patches/test.diff $ echo %{?} diff --git a/test/three.test b/test/three.test index 364506f..02ecaf5 100644 --- a/test/three.test +++ b/test/three.test @@ -37,7 +37,7 @@ > Patch %{P}patch1.diff is now on top $ quilt top - > patches/patch1.diff + > %{P}patch1.diff $ quilt add f > File f added to patch %{P}patch1.diff @@ -51,7 +51,7 @@ > Patch %{P}patch2.diff is now on top $ quilt previous - > patches/patch1.diff + > %{P}patch1.diff $ quilt add g > File g added to patch %{P}patch2.diff @@ -80,21 +80,21 @@ > +g $ quilt pop - > Removing patch patches/patch2.diff + > Removing patch %{P}patch2.diff > Removing g > - > Now at patch patches/patch1.diff + > Now at patch %{P}patch1.diff $ ls patches/ > patch2.diff > series $ quilt next - > patches/patch2.diff + > %{P}patch2.diff $ quilt previous $ quilt previous patch2 - > patches/patch1.diff + > %{P}patch1.diff $ quilt pop > Patch %{P}patch1.diff does not remove cleanly (refresh it or enforce with -f) @@ -103,10 +103,10 @@ > Refreshed patch %{P}patch1.diff $ quilt refresh patch2 - > Patch patches/patch2.diff is not applied + > Patch %{P}patch2.diff is not applied $ quilt pop - > Removing patch patches/patch1.diff + > Removing patch %{P}patch1.diff > Removing f > > No patches applied @@ -123,21 +123,21 @@ > No patches applied $ quilt unapplied - > patches/patch1.diff - > patches/patch2.diff + > %{P}patch1.diff + > %{P}patch2.diff $ quilt previous > No patches applied $ quilt next - > patches/patch1.diff + > %{P}patch1.diff $ quilt applied patch1 - > Patch patches/patch1.diff is not applied + > Patch %{P}patch1.diff is not applied $ quilt unapplied patch2 $ quilt unapplied patch1 - > patches/patch2.diff + > %{P}patch2.diff $ quilt revert f > No patches applied @@ -146,15 +146,15 @@ > Patch patch3.diff is not in series $ quilt push -qa - > Applying patch patches/patch1.diff - > Applying patch patches/patch2.diff - > Now at patch patches/patch2.diff + > Applying patch %{P}patch1.diff + > Applying patch %{P}patch2.diff + > Now at patch %{P}patch2.diff $ quilt push patch2 - > Patch patches/patch2.diff is currently applied + > Patch %{P}patch2.diff is currently applied $ quilt push - > File series fully applied, ends at patch patches/patch2.diff + > File series fully applied, ends at patch %{P}patch2.diff $ echo %{?} > 2 @@ -173,11 +173,11 @@ > +g $ quilt diff -P patch1 --combine patch2 - > Patch patches/patch2.diff not applied before patch patches/patch1.diff + > Patch %{P}patch2.diff not applied before patch %{P}patch1.diff $ echo patch3.diff >> patches/series $ quilt diff -P patch1 --combine patch3 - > Patch patches/patch3.diff is not applied + > Patch %{P}patch3.diff is not applied $ quilt pop -qaR > Removing patch %{P}patch2.diff @@ -193,26 +193,26 @@ $ quilt grep "not there" $ quilt push -q 2 - > Applying patch patches/patch1.diff - > Applying patch patches/patch2.diff - > Now at patch patches/patch2.diff + > Applying patch %{P}patch1.diff + > Applying patch %{P}patch2.diff + > Now at patch %{P}patch2.diff $ quilt pop -q 2 - > Removing patch patches/patch2.diff - > Removing patch patches/patch1.diff + > Removing patch %{P}patch2.diff + > Removing patch %{P}patch1.diff > No patches applied $ quilt push -q 10 - > Applying patch patches/patch1.diff - > Applying patch patches/patch2.diff - > Applying patch patches/patch3.diff - > Patch patches/patch3.diff does not exist; applied empty patch - > Now at patch patches/patch3.diff + > Applying patch %{P}patch1.diff + > Applying patch %{P}patch2.diff + > Applying patch %{P}patch3.diff + > Patch %{P}patch3.diff does not exist; applied empty patch + > Now at patch %{P}patch3.diff $ quilt pop -q 10 - > Patch patches/patch3.diff appears to be empty, removing - > Removing patch patches/patch2.diff - > Removing patch patches/patch1.diff + > Patch %{P}patch3.diff appears to be empty, removing + > Removing patch %{P}patch2.diff + > Removing patch %{P}patch1.diff > No patches applied $ quilt push 0 diff --git a/test/timestamps.test b/test/timestamps.test index f6772b3..09d1504 100644 --- a/test/timestamps.test +++ b/test/timestamps.test @@ -59,30 +59,30 @@ $ cat > patches/context-delete.patch # Test unapplied patches $ quilt patches file -> patches/unified-create.patch -> patches/unified-update.patch -> patches/unified-delete.patch -> patches/context-create.patch -> patches/context-update.patch -> patches/context-delete.patch +> %{P}unified-create.patch +> %{P}unified-update.patch +> %{P}unified-delete.patch +> %{P}context-create.patch +> %{P}context-update.patch +> %{P}context-delete.patch # Make sure we don't take line counts as file names $ quilt patches 1 $ quilt push -qa -> Applying patch patches/unified-create.patch -> Applying patch patches/unified-update.patch -> Applying patch patches/unified-delete.patch -> Applying patch patches/context-create.patch -> Applying patch patches/context-update.patch -> Applying patch patches/context-delete.patch -> Now at patch patches/context-delete.patch +> Applying patch %{P}unified-create.patch +> Applying patch %{P}unified-update.patch +> Applying patch %{P}unified-delete.patch +> Applying patch %{P}context-create.patch +> Applying patch %{P}context-update.patch +> Applying patch %{P}context-delete.patch +> Now at patch %{P}context-delete.patch # Test applied patches $ quilt patches file -> patches/unified-create.patch -> patches/unified-update.patch -> patches/unified-delete.patch -> patches/context-create.patch -> patches/context-update.patch -> patches/context-delete.patch +> %{P}unified-create.patch +> %{P}unified-update.patch +> %{P}unified-delete.patch +> %{P}context-create.patch +> %{P}context-update.patch +> %{P}context-delete.patch diff --git a/test/trailing-ws.test b/test/trailing-ws.test index 7043872..ef7cc08 100644 --- a/test/trailing-ws.test +++ b/test/trailing-ws.test @@ -6,10 +6,10 @@ < c $ quilt new test.diff - > Patch patches/test.diff is now on top + > Patch %{P}test.diff is now on top $ quilt add a - > File a added to patch patches/test.diff + > File a added to patch %{P}test.diff $ cat > a < a @@ -18,7 +18,7 @@ $ quilt refresh > Warning: trailing whitespace in lines 1,3 of a - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ grep '[ \t]$' patches/test.diff > +a @@ -26,16 +26,16 @@ $ quilt refresh -U0 > Warning: trailing whitespace in lines 1,3 of a - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ quilt refresh --strip-trailing-whitespace > Removing trailing whitespace from lines 1,3 of a - > Refreshed patch patches/test.diff + > Refreshed patch %{P}test.diff $ grep '[ \t]$' patches/test.diff $ quilt pop -q - > Removing patch patches/test.diff + > Removing patch %{P}test.diff > No patches applied $ cat > a @@ -44,10 +44,10 @@ < c $ quilt new test2.diff - > Patch patches/test2.diff is now on top + > Patch %{P}test2.diff is now on top $ quilt add a - > File a added to patch patches/test2.diff + > File a added to patch %{P}test2.diff $ cat > a < a @@ -56,7 +56,7 @@ $ quilt refresh -c > Warning: trailing whitespace in lines 1,3 of a - > Refreshed patch patches/test2.diff + > Refreshed patch %{P}test2.diff $ grep '[ \t]$' patches/test2.diff > ! a @@ -64,14 +64,14 @@ $ quilt refresh -C0 > Warning: trailing whitespace in lines 1,3 of a - > Refreshed patch patches/test2.diff + > Refreshed patch %{P}test2.diff $ quilt refresh -c --strip-trailing-whitespace > Removing trailing whitespace from lines 1,3 of a - > Refreshed patch patches/test2.diff + > Refreshed patch %{P}test2.diff $ grep '[ \t]$' patches/test2.diff $ quilt pop -q - > Removing patch patches/test2.diff + > Removing patch %{P}test2.diff > No patches applied |