- Some more QUILT_PATCHES_PREFIX fixes.

13 files changed, 73 insertions, 60 deletions

diff --git a/po/de.po b/po/de.po
index 2dbc875..1ed03a7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -79,7 +79,7 @@ msgstr "Patch %s ist nicht angewandt\\n"
 
 #: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229
 #: ../quilt/files.in:76 ../quilt/fold.in:79 ../quilt/fork.in:65
-#: ../quilt/pop.in:182 ../quilt/push.in:182 ../quilt/push.in:218
+#: ../quilt/pop.in:184 ../quilt/push.in:182 ../quilt/push.in:220
 #: ../quilt/refresh.in:143 ../quilt/remove.in:81
 msgid "No patches applied\\n"
 msgstr "Keine Patches angewandt\\n"
@@ -545,11 +545,11 @@ msgstr ""
 msgid "No patch removed\\n"
 msgstr "Kein Patch entfernt\\n"
 
-#: ../quilt/pop.in:173 ../quilt/push.in:209
+#: ../quilt/pop.in:175 ../quilt/push.in:211
 msgid "Interrupted by user\\n"
 msgstr "Unterbrechung durch Benutzer\\n"
 
-#: ../quilt/pop.in:189 ../quilt/push.in:220
+#: ../quilt/pop.in:191 ../quilt/push.in:222
 msgid "Now at patch %s\\n"
 msgstr "Jetzt in Patch %s\\n"
 
@@ -648,7 +648,8 @@ msgid ""
 "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] "
 "[patch]\\n"
 msgstr ""
-"Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] [patch]\\n"
+"Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--"
+"backup] [patch]\\n"
 
 #: ../quilt/refresh.in:26
 msgid ""
@@ -972,7 +973,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\n"
 
-#: ../scripts/patchfns.in:765
+#: ../scripts/patchfns.in:767
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/po/fr.po b/po/fr.po
index 5ec3d19..f2d0223 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -85,7 +85,7 @@ msgstr "Le patch n'est pas appliqué"
 
 #: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229
 #: ../quilt/files.in:76 ../quilt/fold.in:79 ../quilt/fork.in:65
-#: ../quilt/pop.in:182 ../quilt/push.in:182 ../quilt/push.in:218
+#: ../quilt/pop.in:184 ../quilt/push.in:182 ../quilt/push.in:220
 #: ../quilt/refresh.in:143 ../quilt/remove.in:81
 #, fuzzy
 msgid "No patches applied\\n"
@@ -616,12 +616,12 @@ msgstr ""
 msgid "No patch removed\\n"
 msgstr "Aucun patch retiré"
 
-#: ../quilt/pop.in:173 ../quilt/push.in:209
+#: ../quilt/pop.in:175 ../quilt/push.in:211
 #, fuzzy
 msgid "Interrupted by user\\n"
 msgstr "Interrompu par l'utilisateur"
 
-#: ../quilt/pop.in:189 ../quilt/push.in:220
+#: ../quilt/pop.in:191 ../quilt/push.in:222
 #, fuzzy
 msgid "Now at patch %s\\n"
 msgstr "Le patch $patch est maintenant au sommet"
@@ -1092,7 +1092,7 @@ msgstr ""
 "version utilisée pour les appliquer avant d'installer une version\n"
 "plus ancienne."
 
-#: ../scripts/patchfns.in:765
+#: ../scripts/patchfns.in:767
 #, fuzzy
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
diff --git a/po/quilt.pot b/po/quilt.pot
index 76ea6f8..d944d08 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -49,7 +49,7 @@ msgstr ""
 
 #: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229
 #: ../quilt/files.in:76 ../quilt/fold.in:79 ../quilt/fork.in:65
-#: ../quilt/pop.in:182 ../quilt/push.in:182 ../quilt/push.in:218
+#: ../quilt/pop.in:184 ../quilt/push.in:182 ../quilt/push.in:220
 #: ../quilt/refresh.in:143 ../quilt/remove.in:81
 msgid "No patches applied\\n"
 msgstr ""
@@ -399,11 +399,11 @@ msgstr ""
 msgid "No patch removed\\n"
 msgstr ""
 
-#: ../quilt/pop.in:173 ../quilt/push.in:209
+#: ../quilt/pop.in:175 ../quilt/push.in:211
 msgid "Interrupted by user\\n"
 msgstr ""
 
-#: ../quilt/pop.in:189 ../quilt/push.in:220
+#: ../quilt/pop.in:191 ../quilt/push.in:222
 msgid "Now at patch %s\\n"
 msgstr ""
 
@@ -709,7 +709,7 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: ../scripts/patchfns.in:765
+#: ../scripts/patchfns.in:767
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/quilt.changes b/quilt.changes
index 8210dbc..380d0fe 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Mon Jul 12 02:11:02 CEST 2004 - agruen@suse.de
+
+- Some more QUILT_PATCHES_PREFIX fixes.
+
+-------------------------------------------------------------------
 Tue Jul  6 18:58:00 CEST 2004 - agruen@suse.de
 
 - Switch from echo to printf for all translations: This is more
@@ -24,12 +29,12 @@ Tue Jul  6 19:57:25 PDT 2004 - mquinson@tuxfamily.org
 -------------------------------------------------------------------
 Sun Jul  4 04:29:25 CEST 2004 - agruen@suse.de
 
-- Add common GNU Diff format options to diff and refresH commands:
-  -u, -U num, -c, -C num. REname old -c option (combine patches)
+- Add common GNU diff format options to diff and refresh commands:
+  -u, -U num, -c, -C num. Rename old -c option (combine patches)
   of diff command to --combine.
-- Extend the function that splits comments froM patches and
-  syntax coloring to handLe combined diff format.
-- Honor the LAnG environment variable again; this goT broken at
+- Extend the function that splits comments from patches and
+  syntax coloring to handle combined diff format.
+- Honor the LANG environment variable again; this got broken at
   some point.
 - Set TEXTDOMAINDIR to where the translations are put so that
   Messages are found even when not installing into /usr.
diff --git a/quilt/new.in b/quilt/new.in
index ede3967..331995c 100644
--- a/quilt/new.in
+++ b/quilt/new.in
@@ -62,7 +62,7 @@ patch=${1#$QUILT_PATCHES/}
 if [ -n "$SUBDIR" ]
 then
 	printf $"Warning: directory %s exists; ignoring\n" \
-	       "$(echo $SUBDIR | sed -e 's:[^/]\+:..:g')$QUILT_PATCHES" >&2
+	       "$SUBDIR_DOWN$QUILT_PATCHES" >&2
 	cd $SUBDIR
 	unset SUBDIR
 fi
diff --git a/quilt/pop.in b/quilt/pop.in
index 8c3e1d4..8ec3144 100644
--- a/quilt/pop.in
+++ b/quilt/pop.in
@@ -164,10 +164,12 @@ trap "interrupted=1" SIGINT
 
 for patch in $patches
 do
+	[ -n "$SUBDIR" ] && pushd $SUBDIR > /dev/null
 	if ! @SCRIPTS@/rpatch $rpatch_options $patch
 	then
 		exit 1
 	fi
+	[ -n "$SUBDIR" ] && popd > /dev/null
 	if [ -n "$interrupted" ]
 	then
 		printf $"Interrupted by user\n" >&2
diff --git a/quilt/push.in b/quilt/push.in
index 35c3077..b23b9d5 100644
--- a/quilt/push.in
+++ b/quilt/push.in
@@ -200,10 +200,12 @@ trap "interrupted=1" SIGINT
 create_db
 for patch in $patches
 do
+	[ -n "$SUBDIR" ] && pushd $SUBDIR > /dev/null
 	if ! @SCRIPTS@/apatch $apatch_options $patch
 	then
 		exit 1
 	fi
+	[ -n "$SUBDIR" ] && popd > /dev/null
 	if [ -n "$interrupted" ]
 	then
 		printf $"Interrupted by user\n" >&2
diff --git a/scripts/patchfns.in b/scripts/patchfns.in
index 66755e5..202a114 100644
--- a/scripts/patchfns.in
+++ b/scripts/patchfns.in
@@ -708,7 +708,7 @@ version_check() {
 }
 
 print_patch() {
-	echo -n "${QUILT_PATCHES_PREFIX:+$QUILT_PATCHES/}$1"
+	echo -n "${QUILT_PATCHES_PREFIX:+$SUBDIR_DOWN$QUILT_PATCHES/}$1"
 }
 
 #
@@ -724,16 +724,18 @@ print_patch() {
 # and the base direcory is /usr/src/linux, $SUBDIR is set to
 # drivers/net/.
 
-unset SUBDIR
+unset SUBDIR SUBDIR_DOWN
 if ! [ -d "$QUILT_PATCHES" ]
 then
     basedir=$PWD
     while [ -n "$basedir" ]
     do
 	basedir=${basedir%/*}
+	down=$down../
 	if [ -d "$basedir/$QUILT_PATCHES" ]
 	then
 	    SUBDIR="${PWD#$basedir/}/"
+	    SUBDIR_DOWN=$down
 	    if ! cd $basedir/
 	    then
 		echo "Cannot change into parent directory $basedir/" >&2
@@ -742,7 +744,7 @@ then
 	    break
 	fi
     done
-    unset basedir
+    unset basedir down
 fi
 
 if [ -n "$QUILT_SERIES" ]
diff --git a/test/Makefile b/test/Makefile
index 86a3031..ca75741 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,6 +3,7 @@ TESTS=$(shell ls -tr *.test)
 export QUILTRC=$(CURDIR)/test.quiltrc
 ifneq ($(shell source $(QUILTRC) ;  echo $$QUILT_PATCHES_PREFIX),)
 export P=patches/
+export _P=../patches/
 endif
 $(warning P=$(P))
 
diff --git a/test/new-nosubdir.test b/test/new-nosubdir.test
index ab3f854..176cfcf 100644
--- a/test/new-nosubdir.test
+++ b/test/new-nosubdir.test
@@ -5,7 +5,7 @@
 	$ cd sub
 	$ quilt new here.diff
 	> Warning: directory ../patches exists; ignoring
-	> Patch %{P}here.diff is now on top
+	> Patch %{_P}here.diff is now on top
 
 	$ cd ../..
 	$ rm -rf d
diff --git a/test/snapshot2.test b/test/snapshot2.test
index 238d8c5..a0ea9e4 100644
--- a/test/snapshot2.test
+++ b/test/snapshot2.test
@@ -5,26 +5,26 @@
 
 	$ cd d
 	$ quilt add f.txt
-	> File d/f.txt added to patch %{P}snapshot
+	> File d/f.txt added to patch %{_P}snapshot
 	$ cat > f.txt
 	< f.txt
 
 	$ quilt add g.txt
-	> File d/g.txt added to patch %{P}snapshot
+	> File d/g.txt added to patch %{_P}snapshot
 	$ cat > g.txt
 	< g.txt
 
 	$ quilt refresh
-	> Refreshed patch %{P}snapshot
+	> Refreshed patch %{_P}snapshot
 	$ quilt snapshot
 	$ quilt fork
-	> Fork of patch %{P}snapshot created as %{P}snapshot-2
+	> Fork of patch %{_P}snapshot created as %{_P}snapshot-2
 
 	$ quilt remove g.txt
-	> File d/g.txt removed from patch %{P}snapshot-2
+	> File d/g.txt removed from patch %{_P}snapshot-2
 
 	$ quilt add h.txt
-	> File d/h.txt added to patch %{P}snapshot-2
+	> File d/h.txt added to patch %{_P}snapshot-2
 
 	$ cat > h.txt
 	< h.txt
@@ -33,7 +33,7 @@
 	< more changes
 
 	$ quilt refresh
-	> Refreshed patch %{P}snapshot-2
+	> Refreshed patch %{_P}snapshot-2
 
 	$ quilt diff --snapshot | grep -v "^\\(---\\|+++\\)"
 	> Index: d/d/f.txt
diff --git a/test/subdir.test b/test/subdir.test
index 46ac36e..118b775 100644
--- a/test/subdir.test
+++ b/test/subdir.test
@@ -21,7 +21,7 @@
 
 	$ cd subdir
 	$ quilt add file2
-	> File subdir/file2 added to patch %{P}test.patch
+	> File subdir/file2 added to patch %{_P}test.patch
 
 	$ cat > file2
 	< another file
@@ -30,7 +30,7 @@
 	< yet another file
 
 	$ quilt add file3
-	> File subdir/file3 added to patch %{P}test.patch
+	> File subdir/file3 added to patch %{_P}test.patch
 
 	$ rm file3
 	$ quilt files
@@ -60,10 +60,10 @@
 	> -yet another file
 
 	$ quilt refresh
-	> Refreshed patch %{P}test.patch
+	> Refreshed patch %{_P}test.patch
 
 	$ quilt remove file2
-	> File subdir/file2 removed from patch %{P}test.patch
+	> File subdir/file2 removed from patch %{_P}test.patch
 
 	$ quilt files
 	> subdir/file
diff --git a/test/two.test b/test/two.test
index b29e69b..0659486 100644
--- a/test/two.test
+++ b/test/two.test
@@ -9,15 +9,15 @@
 	$ mkdir dir
 	$ echo "This is file one." > dir/file1
 	$ quilt add dir/file1
-	> File d/dir/file1 added to patch %{P}patch1.diff
+	> File d/dir/file1 added to patch %{_P}patch1.diff
 
 	$ quilt add file2
-	> File d/file2 added to patch %{P}patch1.diff
+	> File d/file2 added to patch %{_P}patch1.diff
 
 	$ quilt diff
 	$ quilt diff -z
 	$ quilt refresh
-	> Nothing in patch %{P}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 %{P}patch1.diff
+	> Refreshed patch %{_P}patch1.diff
 
 	$ quilt diff -z
 	$ echo "Another line has been added." >> dir/file1
@@ -63,7 +63,7 @@
 	$ cd ..
 	
 	$ quilt refresh
-	> Refreshed patch %{P}patch1.diff
+	> Refreshed patch %{_P}patch1.diff
 
 	$ cd ..
 	$ quilt new patch2.diff
@@ -71,33 +71,33 @@
 
 	$ cd d
 	$ quilt add dir/file3
-	> File d/dir/file3 added to patch %{P}patch2.diff
+	> File d/dir/file3 added to patch %{_P}patch2.diff
 
 	$ echo "This is file three." > dir/file3
 	$ quilt refresh
-	> Refreshed patch %{P}patch2.diff
+	> Refreshed patch %{_P}patch2.diff
 
 	$ quilt add -p patch1 dir/file3
-	> File d/dir/file3 modified by patch %{P}patch2.diff
+	> File d/dir/file3 modified by patch %{_P}patch2.diff
 
 	$ quilt pop -R
-	> Removing patch %{P}patch2.diff
+	> Removing patch %{_P}patch2.diff
 	> Removing d/dir/file3
 	>
-	> Now at patch %{P}patch1.diff
+	> Now at patch %{_P}patch1.diff
 
 	$ quilt add file4
-	> File d/file4 added to patch %{P}patch1.diff
+	> File d/file4 added to patch %{_P}patch1.diff
 
 	$ echo "This is file 4." > file4
 	$ quilt refresh
-	> Refreshed patch %{P}patch1.diff
+	> Refreshed patch %{_P}patch1.diff
 
 	$ quilt push
-	> Applying patch %{P}patch2.diff
+	> Applying patch %{_P}patch2.diff
 	> patching file d/dir/file3
 	>
-	> Now at patch %{P}patch2.diff
+	> Now at patch %{_P}patch2.diff
 
 	$ cd ..
 	$ quilt new subdir/patch3.diff
@@ -105,7 +105,7 @@
 
 	$ cd d
 	$ quilt add file4
-	> File d/file4 added to patch %{P}subdir/patch3.diff
+	> File d/file4 added to patch %{_P}subdir/patch3.diff
 
 	$ rm file4
 	$ quilt diff | sed -e "s/\\t.*//"
@@ -117,18 +117,18 @@
 	> -This is file 4.
 
 	$ quilt add -p patch2 file4
-	> File d/file4 modified by patch %{P}subdir/patch3.diff
+	> File d/file4 modified by patch %{_P}subdir/patch3.diff
 
 	$ quilt refresh
-	> Refreshed patch %{P}subdir/patch3.diff
+	> Refreshed patch %{_P}subdir/patch3.diff
 
 	$ echo "Another line here, too." >> dir/file3
 	$ quilt refresh patch2
-	> Refreshed patch %{P}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
+	> More recent patches modify files in patch %{_P}patch1.diff
 	> Index: d/d/file2
 	> ===================================================================
 	> --- d.orig/d/file2
@@ -138,24 +138,24 @@
 	> +Another line added.
 	
 	$ quilt refresh patch1
-	> More recent patches modify files in patch %{P}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 %{P}patch1.diff
+	> Refreshed patch %{_P}patch1.diff
 	
 	$ echo "Another line here, too." >> dir/file3
 	$ quilt pop -R
-	> Removing patch %{P}subdir/patch3.diff
+	> Removing patch %{_P}subdir/patch3.diff
 	> Restoring d/file4
 	>
-	> Now at patch %{P}patch2.diff
+	> Now at patch %{_P}patch2.diff
 
 	$ quilt refresh patch2
-	> Refreshed patch %{P}patch2.diff
+	> Refreshed patch %{_P}patch2.diff
 
 	$ quilt pop -qaR
-	> Removing patch %{P}patch2.diff
-	> Removing patch %{P}patch1.diff
+	> Removing patch %{_P}patch2.diff
+	> Removing patch %{_P}patch1.diff
 	> No patches applied
 
 	$ cd ../..