diff options
| -rw-r--r-- | po/de.po | 46 | ||||
| -rw-r--r-- | po/fr.po | 46 | ||||
| -rw-r--r-- | po/ja.po | 46 | ||||
| -rw-r--r-- | po/quilt.pot | 24 | ||||
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt/add.in | 8 | ||||
| -rw-r--r-- | quilt/annotate.in | 8 | ||||
| -rw-r--r-- | quilt/import.in | 10 | ||||
| -rw-r--r-- | quilt/remove.in | 10 | ||||
| -rw-r--r-- | quilt/rename.in | 8 | ||||
| -rw-r--r-- | test/annotate.test | 6 | ||||
| -rw-r--r-- | test/one.test | 4 | ||||
| -rw-r--r-- | test/rename.test | 6 | ||||
| -rw-r--r-- | test/two.test | 4 |
14 files changed, 120 insertions, 113 deletions
@@ -56,8 +56,8 @@ msgstr "" "\tGibt die Versionsummer aus." #: quilt/add.in:22 -msgid "Usage: quilt add [-p patch] {file} ...\\n" -msgstr "Verwendung: quilt add [-p patch] {datei} ...\\n" +msgid "Usage: quilt add [-P patch] {file} ...\\n" +msgstr "Verwendung: quilt add [-P patch] {datei} ...\\n" #: quilt/add.in:25 msgid "" @@ -66,7 +66,7 @@ msgid "" "added to the patch before being modified. Files that are modified by\n" "patches already applied on top of the specified patch cannot be added.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch to add files to.\n" msgstr "" "\n" @@ -75,7 +75,7 @@ msgstr "" "verändert werden. Dateien können einem Patch nur hinzugefügt werden,\n" "solange sie von keinem Patch höher auf dem Stapel verändert werden.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch, zu dem die Dateien hinzugefügt werden sollen.\n" #: quilt/add.in:48 quilt/add.in:54 @@ -103,8 +103,8 @@ msgid "File %s added to patch %s\\n" msgstr "Datei %s zu Patch %s hinzugefügt\\n" #: quilt/annotate.in:22 -msgid "Usage: quilt annotate [-p patch] {file}\\n" -msgstr "Verwendung: quilt annotate [-p patch] {datei}\\n" +msgid "Usage: quilt annotate [-P patch] {file}\\n" +msgstr "Verwendung: quilt annotate [-P patch] {datei}\\n" #: quilt/annotate.in:25 msgid "" @@ -112,7 +112,7 @@ msgid "" "Print an annotated listing of the specified file showing which\n" "patches modify which lines. Only applied patches are included.\n" "\n" -"-p patch\n" +"-P patch\n" "\tStop checking for changes at the specified rather than the\n" "\ttopmost patch.\n" msgstr "" @@ -121,7 +121,7 @@ msgstr "" "Patches welche Zeilen verändern. Nur angewandte Patches werden\n" "angezeigt.\n" "\n" -"-p patch\n" +"-P patch\n" "\tNur bis zum angegebenen Patch anstatt bis zum obersten Patch\n" "\tnach Änderungen suchen.\n" @@ -609,9 +609,9 @@ msgstr "Text an Header von Patch %s angefügt\\n" #: quilt/import.in:22 msgid "" -"Usage: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] patchfile ...\\n" +"Usage: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] patchfile ...\\n" msgstr "" -"Verwendung: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] " +"Verwendung: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] " "[patchdatei] ...\\n" #: quilt/import.in:25 @@ -623,7 +623,7 @@ msgid "" "-p num\n" "\tNumber of directory levels to strip when applying (default=1)\n" "\n" -"-n patch\n" +"-P patch\n" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" @@ -642,7 +642,7 @@ msgstr "" "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n" "\tentfernt werden sollen.\n" "\n" -"-n patch\n" +"-P patch\n" "\tPatch-Dateiname, den Quilt verwenden soll. Diese Option kann nur beim\n" "\tImport eines einzelnen Patches angegeben werden.\n" "\n" @@ -665,9 +665,9 @@ msgstr "" "erhalten bleiben sollen.\\n" #: quilt/import.in:124 -msgid "Option \\`-n' can only be used when importing a single patch\\n" +msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" -"Die Option \\`-n' kann nur beim Importieren eines einzelnen Patches " +"Die Option \\`-P' kann nur beim Importieren eines einzelnen Patches " "verwendet werden\\n" #: quilt/import.in:144 @@ -1140,8 +1140,8 @@ msgid "Refreshed patch %s\\n" msgstr "Patch %s aufgefrischt\\n" #: quilt/remove.in:22 -msgid "Usage: quilt remove [-p patch] {file} ...\\n" -msgstr "Verwendung: quilt remove [-p patch] {datei} ...\\n" +msgid "Usage: quilt remove [-P patch] {file} ...\\n" +msgstr "Verwendung: quilt remove [-P patch] {datei} ...\\n" #: quilt/remove.in:25 msgid "" @@ -1149,15 +1149,15 @@ msgid "" "Remove one or more files from the topmost or named patch. Files that\n" "are modified by patches on top of the specified patch cannot be removed.\n" "\n" -"-p patch\n" -"\tPatch to remove files from.\n" +"-P patch\n" +"\tRemove named files from the named patch.\n" msgstr "" "\n" "Entfernt Dateien aus dem obersten oder angegebenen Patch. Dateien, die\n" "durch Patches über dem angegebenen Patch verändert werden, können nicht\n" "entfernt werden.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch, aus dem Dateien entfernt werden sollen.\n" #: quilt/remove.in:73 @@ -1173,21 +1173,21 @@ msgid "File %s removed from patch %s\\n" msgstr "Datei %s aus Patch %s entfernt\\n" #: quilt/rename.in:22 -msgid "Usage: quilt rename [-p patch] new_name\\n" -msgstr "Verwendung: quilt rename [-p patch] neuer_name\\n" +msgid "Usage: quilt rename [-P patch] new_name\\n" +msgstr "Verwendung: quilt rename [-P patch] neuer_name\\n" #: quilt/rename.in:25 msgid "" "\n" "Rename the topmost or named patch.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch to rename.\n" msgstr "" "\n" "Benennt den obersten oder angegebenen Patch um.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch, der umbenannt werden soll.\n" "\n" @@ -56,8 +56,8 @@ msgstr "" "\tAffiche le numro de version et sort immdiatement." #: quilt/add.in:22 -msgid "Usage: quilt add [-p patch] {file} ...\\n" -msgstr "Usage : quilt add [-p patch] {fichier} ...\\n" +msgid "Usage: quilt add [-P patch] {file} ...\\n" +msgstr "Usage : quilt add [-P patch] {fichier} ...\\n" #: quilt/add.in:25 msgid "" @@ -66,7 +66,7 @@ msgid "" "added to the patch before being modified. Files that are modified by\n" "patches already applied on top of the specified patch cannot be added.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch to add files to.\n" msgstr "" "\n" @@ -75,7 +75,7 @@ msgstr "" "Les fichiers modifis par d'autres patches la fois plus haut dans la pile\n" "et dj appliqus ne peuvent pas tre ajouts.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch auquel les fichiers doivent tre ajouts.\n" #: quilt/add.in:48 quilt/add.in:54 @@ -103,8 +103,8 @@ msgid "File %s added to patch %s\\n" msgstr "Le fichier %s a t ajout au patch %s\\n" #: quilt/annotate.in:22 -msgid "Usage: quilt annotate [-p patch] {file}\\n" -msgstr "Usage : quilt annotate [-p patch] {fichier}\\n" +msgid "Usage: quilt annotate [-P patch] {file}\\n" +msgstr "Usage : quilt annotate [-P patch] {fichier}\\n" #: quilt/annotate.in:25 msgid "" @@ -112,7 +112,7 @@ msgid "" "Print an annotated listing of the specified file showing which\n" "patches modify which lines. Only applied patches are included.\n" "\n" -"-p patch\n" +"-P patch\n" "\tStop checking for changes at the specified rather than the\n" "\ttopmost patch.\n" msgstr "" @@ -121,7 +121,7 @@ msgstr "" "patch modifie chaque ligne. Seuls les patches appliqus sont\n" "pris en compte.\n" "\n" -"-p patch\n" +"-P patch\n" "\tAnnote le fichier tel qu'il se trouve aprs application du patch\n" "\tspcifi plutt que d'aller jusqu'au patch au sommet.\n" @@ -613,9 +613,9 @@ msgstr "Texte ajout la fin de l'en-tte du patch %s\\n" #: quilt/import.in:22 msgid "" -"Usage: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] patchfile ...\\n" +"Usage: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] patchfile ...\\n" msgstr "" -"Usage : quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] " +"Usage : quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] " "fichier_de_patch ...\\n" #: quilt/import.in:25 @@ -627,7 +627,7 @@ msgid "" "-p num\n" "\tNumber of directory levels to strip when applying (default=1)\n" "\n" -"-n patch\n" +"-P patch\n" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" @@ -647,7 +647,7 @@ msgstr "" "\tNombre de niveaux de rpertoires retirer lors de l'application du \n" "\tpatch (1 par dfaut).\n" "\n" -"-n patch\n" +"-P patch\n" "\tNom de fichier utiliser au sein de quilt. Cette option ne peut tre\n" "\tutilise que lors de l'import d'un patch unique.\n" "\n" @@ -669,9 +669,9 @@ msgstr "" "Veuillez utiliser -d {o|a|n} pour spcifier quel(s) en-tte(s) conserver.\\n" #: quilt/import.in:124 -msgid "Option \\`-n' can only be used when importing a single patch\\n" +msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" -"L'option -n ne peut tre utilis que lors de l'import d'un seul patch.\\n" +"L'option -P ne peut tre utilis que lors de l'import d'un seul patch.\\n" #: quilt/import.in:144 msgid "Patch %s is applied\\n" @@ -1151,8 +1151,8 @@ msgid "Refreshed patch %s\\n" msgstr "Patch %s rafrachi\\n" #: quilt/remove.in:22 -msgid "Usage: quilt remove [-p patch] {file} ...\\n" -msgstr "Usage : quilt remove [-p patch] {fichier} ...\\n" +msgid "Usage: quilt remove [-P patch] {file} ...\\n" +msgstr "Usage : quilt remove [-P patch] {fichier} ...\\n" #: quilt/remove.in:25 msgid "" @@ -1160,15 +1160,15 @@ msgid "" "Remove one or more files from the topmost or named patch. Files that\n" "are modified by patches on top of the specified patch cannot be removed.\n" "\n" -"-p patch\n" -"\tPatch to remove files from.\n" +"-P patch\n" +"\tRemove named files from the named patch.\n" msgstr "" "\n" "Retire un ou plusieurs fichiers du patch au sommet ou du patch spcifi.\n" "Des fichiers modifis par des patches plus haut dans la srie ne peuvent\n" "pas tre retirs. \n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch duquel les fichiers doivent tre retirs.\n" #: quilt/remove.in:73 @@ -1184,21 +1184,21 @@ msgid "File %s removed from patch %s\\n" msgstr "Le fichier %s a t enlev du patch %s.\\n" #: quilt/rename.in:22 -msgid "Usage: quilt rename [-p patch] new_name\\n" -msgstr "Usage : quilt rename [-p patch] nouveau_nom\\n" +msgid "Usage: quilt rename [-P patch] new_name\\n" +msgstr "Usage : quilt rename [-P patch] nouveau_nom\\n" #: quilt/rename.in:25 msgid "" "\n" "Rename the topmost or named patch.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch to rename.\n" msgstr "" "\n" "Renomme le patch au sommet ou spcifi.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch renommer.\n" #: quilt/rename.in:84 @@ -55,8 +55,8 @@ msgstr "" "\tバージョン情報を出力して終了。" #: quilt/add.in:22 -msgid "Usage: quilt add [-p patch] {file} ...\\n" -msgstr "使い方: quilt add [-p パッチ] {file} ...\\n" +msgid "Usage: quilt add [-P patch] {file} ...\\n" +msgstr "使い方: quilt add [-P パッチ] {file} ...\\n" #: quilt/add.in:25 msgid "" @@ -65,7 +65,7 @@ msgid "" "added to the patch before being modified. Files that are modified by\n" "patches already applied on top of the specified patch cannot be added.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch to add files to.\n" msgstr "" "\n" @@ -73,7 +73,7 @@ msgstr "" "集する前にかならず追加する必要がある。指定したパッチより上のパッチで変\n" "更されているファイルは追加することができない。\n" "\n" -"-p patch\n" +"-P patch\n" "\tファイルを追加するパッチ\n" #: quilt/add.in:48 quilt/add.in:54 @@ -101,8 +101,8 @@ msgid "File %s added to patch %s\\n" msgstr "ファイル %s をパッチ %s に追加しました\\n" #: quilt/annotate.in:22 -msgid "Usage: quilt annotate [-p patch] {file}\\n" -msgstr "使い方: quilt annotate [-p パッチ] {file}\\n" +msgid "Usage: quilt annotate [-P patch] {file}\\n" +msgstr "使い方: quilt annotate [-P パッチ] {file}\\n" #: quilt/annotate.in:25 msgid "" @@ -110,7 +110,7 @@ msgid "" "Print an annotated listing of the specified file showing which\n" "patches modify which lines. Only applied patches are included.\n" "\n" -"-p patch\n" +"-P patch\n" "\tStop checking for changes at the specified rather than the\n" "\ttopmost patch.\n" msgstr "" @@ -118,7 +118,7 @@ msgstr "" "パッチが変更した行に註釈を付けて表示。適応されるのは、あてられているパッ\n" "チのみ。\n" "\n" -"-p パッチ\n" +"-P パッチ\n" "\t最上位のパッチまで処理を行なわず、指定されたパッチで処理を終了\n" #: quilt/applied.in:22 @@ -591,9 +591,9 @@ msgstr "パッチ %s のヘッダに追加しました\\n" #: quilt/import.in:22 msgid "" -"Usage: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] patchfile ...\\n" +"Usage: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] patchfile ...\\n" msgstr "" -"使い方: quilt import [-p num] [-n パッチ] [-f] [-d {o|a|n}] パッチファイ" +"使い方: quilt import [-p num] [-P パッチ] [-f] [-d {o|a|n}] パッチファイ" "ル ...\\n" #: quilt/import.in:25 @@ -605,7 +605,7 @@ msgid "" "-p num\n" "\tNumber of directory levels to strip when applying (default=1)\n" "\n" -"-n patch\n" +"-P patch\n" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" @@ -623,7 +623,7 @@ msgstr "" "-p num\n" "\tパッチを適用するときに省く、ディレクトリレベルの数 (デフォルトは 1)\n" "\n" -"-n パッチ\n" +"-P パッチ\n" "\tquiltの内部で使用するパッチのファイル名。このオプションはパッチを\n" "\t一つだけ取り込むときに有効。\n" "\n" @@ -645,8 +645,8 @@ msgstr "" "どのパッチヘッダを残すか、オプション -d {o|a|n}を使って指定してください" #: quilt/import.in:124 -msgid "Option \\`-n' can only be used when importing a single patch\\n" -msgstr "オプション \\`-n'は、パッチを一つだけ取り込むときのみ有効です\\n" +msgid "Option \\`-P' can only be used when importing a single patch\\n" +msgstr "オプション \\`-P'は、パッチを一つだけ取り込むときのみ有効です\\n" #: quilt/import.in:144 msgid "Patch %s is applied\\n" @@ -1115,8 +1115,8 @@ msgid "Refreshed patch %s\\n" msgstr "パッチ %s をリフレッシュしました\\n" #: quilt/remove.in:22 -msgid "Usage: quilt remove [-p patch] {file} ...\\n" -msgstr "使い方: quilt remove [-p パッチ] {ファイル} ...\\n" +msgid "Usage: quilt remove [-P patch] {file} ...\\n" +msgstr "使い方: quilt remove [-P パッチ] {ファイル} ...\\n" #: quilt/remove.in:25 msgid "" @@ -1124,14 +1124,14 @@ msgid "" "Remove one or more files from the topmost or named patch. Files that\n" "are modified by patches on top of the specified patch cannot be removed.\n" "\n" -"-p patch\n" -"\tPatch to remove files from.\n" +"-P patch\n" +"\tRemove named files from the named patch.\n" msgstr "" "\n" "指定されたファイルを最上位パッチまたは指定されたパッチから削除する。指\n" "定されたファイルがより上のパッチで変更されている場合は、削除できない。\n" "\n" -"-p パッチ\n" +"-P パッチ\n" "\tファイルを削除するパッチを指定。\n" #: quilt/remove.in:73 @@ -1147,21 +1147,21 @@ msgid "File %s removed from patch %s\\n" msgstr "ファイル %s を、パッチ %s から削除しました\\n" #: quilt/rename.in:22 -msgid "Usage: quilt rename [-p patch] new_name\\n" -msgstr "使い方: quilt rename [-p patch] new_name\\n" +msgid "Usage: quilt rename [-P patch] new_name\\n" +msgstr "使い方: quilt rename [-P patch] new_name\\n" #: quilt/rename.in:25 msgid "" "\n" "Rename the topmost or named patch.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch to rename.\n" msgstr "" "\n" "最上位または指定されたパッチの名前を変更する\n" "\n" -"-p patch\n" +"-P patch\n" "\t名前を変更する patch\n" #: quilt/rename.in:84 diff --git a/po/quilt.pot b/po/quilt.pot index e21c6e6..e0af731 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -28,7 +28,7 @@ msgid "" msgstr "" #: quilt/add.in:22 -msgid "Usage: quilt add [-p patch] {file} ...\\n" +msgid "Usage: quilt add [-P patch] {file} ...\\n" msgstr "" #: quilt/add.in:25 @@ -38,7 +38,7 @@ msgid "" "added to the patch before being modified. Files that are modified by\n" "patches already applied on top of the specified patch cannot be added.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch to add files to.\n" msgstr "" @@ -67,7 +67,7 @@ msgid "File %s added to patch %s\\n" msgstr "" #: quilt/annotate.in:22 -msgid "Usage: quilt annotate [-p patch] {file}\\n" +msgid "Usage: quilt annotate [-P patch] {file}\\n" msgstr "" #: quilt/annotate.in:25 @@ -76,7 +76,7 @@ msgid "" "Print an annotated listing of the specified file showing which\n" "patches modify which lines. Only applied patches are included.\n" "\n" -"-p patch\n" +"-P patch\n" "\tStop checking for changes at the specified rather than the\n" "\ttopmost patch.\n" msgstr "" @@ -403,7 +403,7 @@ msgstr "" #: quilt/import.in:22 msgid "" -"Usage: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] patchfile ...\\n" +"Usage: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] patchfile ...\\n" msgstr "" #: quilt/import.in:25 @@ -415,7 +415,7 @@ msgid "" "-p num\n" "\tNumber of directory levels to strip when applying (default=1)\n" "\n" -"-n patch\n" +"-P patch\n" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" @@ -436,7 +436,7 @@ msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" #: quilt/import.in:124 -msgid "Option \\`-n' can only be used when importing a single patch\\n" +msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" #: quilt/import.in:144 @@ -767,7 +767,7 @@ msgid "Refreshed patch %s\\n" msgstr "" #: quilt/remove.in:22 -msgid "Usage: quilt remove [-p patch] {file} ...\\n" +msgid "Usage: quilt remove [-P patch] {file} ...\\n" msgstr "" #: quilt/remove.in:25 @@ -776,8 +776,8 @@ msgid "" "Remove one or more files from the topmost or named patch. Files that\n" "are modified by patches on top of the specified patch cannot be removed.\n" "\n" -"-p patch\n" -"\tPatch to remove files from.\n" +"-P patch\n" +"\tRemove named files from the named patch.\n" msgstr "" #: quilt/remove.in:73 @@ -793,7 +793,7 @@ msgid "File %s removed from patch %s\\n" msgstr "" #: quilt/rename.in:22 -msgid "Usage: quilt rename [-p patch] new_name\\n" +msgid "Usage: quilt rename [-P patch] new_name\\n" msgstr "" #: quilt/rename.in:25 @@ -801,7 +801,7 @@ msgid "" "\n" "Rename the topmost or named patch.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch to rename.\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 9745efe..59853d4 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 27 05:55:11 CET 2006 - agruen@suse.de + +- 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. + +------------------------------------------------------------------- Thu Jan 26 22:51:10 CET 2006 - khali@linux-fr.org - po/fr.po: Update French translation. 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) diff --git a/test/annotate.test b/test/annotate.test index fb73696..1d84604 100644 --- a/test/annotate.test +++ b/test/annotate.test @@ -63,7 +63,7 @@ > 2 patches/patch2 > 3 patches/patch3 - $ quilt annotate -p patch3 foo + $ quilt annotate -P patch3 foo > foo > 2 baz > @@ -71,7 +71,7 @@ > 2 patches/patch2 > 3 patches/patch3 - $ quilt annotate -p patch2 foo + $ quilt annotate -P patch2 foo > foo > 1 Bar > 2 baz @@ -79,7 +79,7 @@ > 1 patches/patch > 2 patches/patch2 - $ quilt annotate -p patch foo + $ quilt annotate -P patch foo > foo > 1 Bar > 1 Baz diff --git a/test/one.test b/test/one.test index 7e9c44e..5031f35 100644 --- a/test/one.test +++ b/test/one.test @@ -77,7 +77,7 @@ of the installed quilt with `make check'. $ quilt refresh > Refreshed patch %{P}patch2.diff - $ quilt add -p patch1 dir/file3 + $ quilt add -P patch1 dir/file3 > File dir/file3 modified by patch %{P}patch2.diff $ quilt pop -R @@ -114,7 +114,7 @@ of the installed quilt with `make check'. > @@ -1 +0,0 @@ > -This is file 4. - $ quilt add -p patch2 file4 + $ quilt add -P patch2 file4 > File file4 modified by patch %{P}subdir/patch3.diff $ quilt refresh diff --git a/test/rename.test b/test/rename.test index 7d8789d..0894893 100644 --- a/test/rename.test +++ b/test/rename.test @@ -35,16 +35,16 @@ $ quilt series -v > %{P}_tmp_name.diff - $ quilt rename -p random_name.diff final.name.diff + $ quilt rename -P random_name.diff final.name.diff > Patch random_name.diff is not in series $ quilt rename final.name.diff > No patches applied - $ quilt rename -p _tmp_name.diff _tmp_name.diff + $ quilt rename -P _tmp_name.diff _tmp_name.diff > Patch %{P}_tmp_name.diff exists already, please choose a different name - $ quilt rename -p _tmp_name.diff newsubdir/final.name.diff + $ quilt rename -P _tmp_name.diff newsubdir/final.name.diff > Patch %{P}_tmp_name.diff renamed to %{P}newsubdir/final.name.diff $ quilt series -v diff --git a/test/two.test b/test/two.test index b0fe485..a93c4e4 100644 --- a/test/two.test +++ b/test/two.test @@ -78,7 +78,7 @@ $ quilt refresh > Refreshed patch %{_P}patch2.diff - $ quilt add -p patch1 dir/file3 + $ quilt add -P patch1 dir/file3 > File d/dir/file3 modified by patch %{_P}patch2.diff $ quilt pop -R @@ -117,7 +117,7 @@ > @@ -1 +0,0 @@ > -This is file 4. - $ quilt add -p patch2 file4 + $ quilt add -P patch2 file4 > File d/file4 modified by patch %{_P}subdir/patch3.diff $ quilt refresh |