- Unify existing -p and -n parameters that specify a patch:

  always use -P as the option name. Update test suite and the
  translations accordingly. Patch mostly from Gary V. Vaughan.

5 files changed, 22 insertions, 22 deletions

diff --git a/quilt/add.in b/quilt/add.in
index 4f375d3..bf98e0c 100644
--- a/quilt/add.in
+++ b/quilt/add.in
@@ -19,7 +19,7 @@ fi
 
 usage()
 {
-	printf $"Usage: quilt add [-p patch] {file} ...\n"
+	printf $"Usage: quilt add [-P patch] {file} ...\n"
 	if [ x$1 = x-h ]
 	then
 		printf $"
@@ -27,7 +27,7 @@ Add one or more files to the topmost or named patch.  Files must be
 added to the patch before being modified.  Files that are modified by
 patches already applied on top of the specified patch cannot be added.
 
--p patch
+-P patch
 	Patch to add files to.
 "
 		exit 0
@@ -60,7 +60,7 @@ in_valid_dir()
 	done
 }
 
-options=`getopt -o p:h -- "$@"`
+options=`getopt -o P:h -- "$@"`
 
 if [ $? -ne 0 ]
 then
@@ -72,7 +72,7 @@ eval set -- "$options"
 while true
 do
 	case "$1" in
-	-p)
+	-P)
 		opt_patch="$2"
 		shift 2 ;;
 	-h)
diff --git a/quilt/annotate.in b/quilt/annotate.in
index ceed55d..0ef21b5 100644
--- a/quilt/annotate.in
+++ b/quilt/annotate.in
@@ -19,14 +19,14 @@ fi
 
 usage()
 {
-	printf $"Usage: quilt annotate [-p patch] {file}\n"
+	printf $"Usage: quilt annotate [-P patch] {file}\n"
 	if [ x$1 = x-h ]
 	then
 		printf $"
 Print an annotated listing of the specified file showing which
 patches modify which lines. Only applied patches are included.
 
--p patch
+-P patch
 	Stop checking for changes at the specified rather than the
 	topmost patch.
 "
@@ -85,7 +85,7 @@ merge_files()
 	exec 4<&-
 }
 
-options=`getopt -o p:h -- "$@"`
+options=`getopt -o P:h -- "$@"`
 
 if [ $? -ne 0 ]
 then
@@ -97,7 +97,7 @@ eval set -- "$options"
 while true
 do
 	case "$1" in
-	-p)
+	-P)
 		opt_patch="$2"
 		shift 2 ;;
 	-h)
diff --git a/quilt/import.in b/quilt/import.in
index ace3467..1018411 100644
--- a/quilt/import.in
+++ b/quilt/import.in
@@ -19,7 +19,7 @@ fi
 
 usage()
 {
-	printf $"Usage: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] patchfile ...\n"
+	printf $"Usage: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] patchfile ...\n"
 	if [ x$1 = x-h ]
 	then
 		printf $"
@@ -29,7 +29,7 @@ current top patch, and must be pushed after import to apply them.
 -p num
 	Number of directory levels to strip when applying (default=1)
 
--n patch
+-P patch
 	Patch filename to use inside quilt. This option can only be
 	used when importing a single patch.
 
@@ -84,7 +84,7 @@ $"Please use -d {o|a|n} to specify which patch header(s) to keep.\n" >&2
 	fi
 }
 
-options=`getopt -o d:fn:p:h -- "$@"`
+options=`getopt -o P:d:fp:h -- "$@"`
 
 if [ $? -ne 0 ]
 then
@@ -96,7 +96,7 @@ eval set -- "$options"
 while true
 do
         case "$1" in
-        -n)
+        -P)
 		opt_patch=${2#$QUILT_PATCHES/}
 		shift 2 ;;
 	-p)
@@ -121,7 +121,7 @@ done
 
 if [ $# -gt 1 -a -n "$opt_patch" ]
 then
-	printf $"Option \`-n' can only be used when importing a single patch\n" >&2
+	printf $"Option \`-P' can only be used when importing a single patch\n" >&2
 	exit 1
 fi
 
diff --git a/quilt/remove.in b/quilt/remove.in
index 8932f5e..a11db0a 100644
--- a/quilt/remove.in
+++ b/quilt/remove.in
@@ -19,15 +19,15 @@ fi
 
 usage()
 {
-	printf $"Usage: quilt remove [-p patch] {file} ...\n"
+	printf $"Usage: quilt remove [-P patch] {file} ...\n"
 	if [ x$1 = x-h ]
 	then
 		printf $"
 Remove one or more files from the topmost or named patch.  Files that
 are modified by patches on top of the specified patch cannot be removed.
 
--p patch
-	Patch to remove files from.
+-P patch
+	Remove named files from the named patch.
 "
 		exit 0
 	else
@@ -35,7 +35,7 @@ are modified by patches on top of the specified patch cannot be removed.
 	fi
 }
 
-options=`getopt -o p:h -- "$@"`
+options=`getopt -o P:h -- "$@"`
 
 if [ $? -ne 0 ]
 then
@@ -47,7 +47,7 @@ eval set -- "$options"
 while true
 do
 	case "$1" in
-	-p)
+	-P)
 		opt_patch="$2"
 		shift 2 ;;
 	-h)
diff --git a/quilt/rename.in b/quilt/rename.in
index 61bf5b0..b7aa447 100644
--- a/quilt/rename.in
+++ b/quilt/rename.in
@@ -19,13 +19,13 @@ fi
 
 usage()
 {
-	printf $"Usage: quilt rename [-p patch] new_name\n"
+	printf $"Usage: quilt rename [-P patch] new_name\n"
 	if [ x$1 = x-h ]
 	then
 		printf $"
 Rename the topmost or named patch.
 
--p patch
+-P patch
 	Patch to rename.
 "
 		exit 0
@@ -45,7 +45,7 @@ move_file()
 	return 0
 }
 
-options=`getopt -o p:h -- "$@"`
+options=`getopt -o P:h -- "$@"`
 
 if [ $? -ne 0 ]
 then
@@ -57,7 +57,7 @@ eval set -- "$options"
 while true
 do
 	case "$1" in
-	-p)
+	-P)
 		opt_patch="$2"
 		shift 2 ;;
 	-h)