diff options
| -rw-r--r-- | bash_completion | 2 | ||||
| -rw-r--r-- | po/de.po | 22 | ||||
| -rw-r--r-- | po/fr.po | 24 | ||||
| -rw-r--r-- | po/ja.po | 22 | ||||
| -rw-r--r-- | po/quilt.pot | 19 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/delete.in | 33 |
7 files changed, 94 insertions, 34 deletions
diff --git a/bash_completion b/bash_completion index 82ea88b..711b25e 100644 --- a/bash_completion +++ b/bash_completion @@ -139,7 +139,7 @@ _quilt_completion() COMPREPLY=( $( compgen -W "-h $(quilt applied)" -- $cur ) ) ;; delete) - COMPREPLY=( $( compgen -W "-h $(quilt series)" -- $cur ) ) + COMPREPLY=( $( compgen -W "-n -h $(quilt series)" -- $cur ) ) ;; diff) case $prev in @@ -80,7 +80,7 @@ msgstr "" msgid "File \\`%s' is located below \\`%s'\\n" msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n" -#: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76 +#: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:97 #: ../quilt/diff.in:160 ../quilt/diff.in:171 ../quilt/graph.in:116 #: ../quilt/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62 #: ../quilt/push.in:312 ../quilt/refresh.in:148 ../quilt/remove.in:53 @@ -93,7 +93,7 @@ msgstr "Patch %s ist nicht in der series-Datei enthalten\\n" msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:247 +#: ../quilt/add.in:106 ../quilt/delete.in:76 ../quilt/diff.in:247 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:72 #: ../quilt/graph.in:131 ../quilt/pop.in:295 ../quilt/push.in:350 #: ../quilt/refresh.in:162 ../quilt/remove.in:81 @@ -139,31 +139,39 @@ msgid "Patch is not applied\\n" msgstr "Patch ist nicht angewandt\\n" #: ../quilt/delete.in:22 -msgid "Usage: quilt delete [patch]\\n" -msgstr "Verwendung: quilt delete [patch]\\n" +msgid "Usage: quilt delete [patch | -n]\\n" +msgstr "Verwendung: quilt delete [patch | -n]\\n" #: ../quilt/delete.in:25 +#, fuzzy msgid "" "\n" "Remove the specified or topmost patch from the series file. If the\n" "patch is applied, quilt will attempt to remove it first. (Only the\n" "topmost patch can be removed right now.)\n" +"\n" +"-n\tDelete the next patch after topmost, rather than the specified\n" +"\tor topmost patch.\n" msgstr "" "\n" "Löscht den obersten oder angegebenen Patch aus der series-Datei. Falls\n" "dieser Patch angewandt ist, entfernt quilt ihn zuerst. (Momentan kann \n" "nur der oberste Patch entfernt werden.)\n" -#: ../quilt/delete.in:85 +#: ../quilt/delete.in:88 +msgid "No next patch\\n" +msgstr "Kein Patch %s\\n" + +#: ../quilt/delete.in:106 msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" -#: ../quilt/delete.in:92 +#: ../quilt/delete.in:113 #, fuzzy msgid "Removed patch %s\\n" msgstr "Entferne patch %s\\n" -#: ../quilt/delete.in:94 +#: ../quilt/delete.in:115 msgid "Failed to remove patch %s\\n" msgstr "Konnte Patch %s nicht entfernen\\n" @@ -86,7 +86,7 @@ msgstr "" msgid "File \\`%s' is located below \\`%s'\\n" msgstr "Le fichier %s est situé en dessous de %s\\n" -#: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76 +#: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:97 #: ../quilt/diff.in:160 ../quilt/diff.in:171 ../quilt/graph.in:116 #: ../quilt/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62 #: ../quilt/push.in:312 ../quilt/refresh.in:148 ../quilt/remove.in:53 @@ -99,7 +99,7 @@ msgstr "Le patch %s n'est pas dans la série\\n" msgid "Patch %s is not applied\\n" msgstr "Le patch %s n'est pas appliqué\\n" -#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:247 +#: ../quilt/add.in:106 ../quilt/delete.in:76 ../quilt/diff.in:247 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:72 #: ../quilt/graph.in:131 ../quilt/pop.in:295 ../quilt/push.in:350 #: ../quilt/refresh.in:162 ../quilt/remove.in:81 @@ -145,8 +145,8 @@ msgid "Patch is not applied\\n" msgstr "Le patch n'est pas appliqué\\n" #: ../quilt/delete.in:22 -msgid "Usage: quilt delete [patch]\\n" -msgstr "Usage : quilt delete [patch]\\n" +msgid "Usage: quilt delete [patch | -n]\\n" +msgstr "Usage : quilt delete [patch | -n]\\n" #: ../quilt/delete.in:25 msgid "" @@ -154,21 +154,31 @@ msgid "" "Remove the specified or topmost patch from the series file. If the\n" "patch is applied, quilt will attempt to remove it first. (Only the\n" "topmost patch can be removed right now.)\n" +"\n" +"-n\tDelete the next patch after topmost, rather than the specified\n" +"\tor topmost patch.\n" msgstr "" "\n" "Efface le patch spécifié (ou celui au sommet de la pile) de la série \n" "actuelle. Si le patch est appliqué, quilt tentera de le retirer avant.\n" "(Seul le patch au sommet peut être retiré pour l'instant).\n" +"\n" +"-n\tEfface le patch qui suit celui qui est au sommet, au lieu du\n" +"\tpatch spécifié ou de celui qui est au sommet.\n" + +#: ../quilt/delete.in:88 +msgid "No next patch\\n" +msgstr "Pas de patch suivant\\n" -#: ../quilt/delete.in:85 +#: ../quilt/delete.in:106 msgid "Patch %s is currently applied\\n" msgstr "Le patch %s est actuellement appliqué\\n" -#: ../quilt/delete.in:92 +#: ../quilt/delete.in:113 msgid "Removed patch %s\\n" msgstr "Patch %s retiré\\n" -#: ../quilt/delete.in:94 +#: ../quilt/delete.in:115 msgid "Failed to remove patch %s\\n" msgstr "Impossible de retirer le patch %s\\n" @@ -80,7 +80,7 @@ msgstr "" msgid "File \\`%s' is located below \\`%s'\\n" msgstr "ファイル \\`%s'ã¯ã€\\`%s'以下ã«ã‚ã‚Šã¾ã™\\n" -#: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76 +#: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:97 #: ../quilt/diff.in:160 ../quilt/diff.in:171 ../quilt/graph.in:116 #: ../quilt/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62 #: ../quilt/push.in:312 ../quilt/refresh.in:148 ../quilt/remove.in:53 @@ -93,7 +93,7 @@ msgstr "パッム%s 㯠seriesã®ä¸ã«ã‚ã‚Šã¾ã›ã‚“\\n" msgid "Patch %s is not applied\\n" msgstr "パッム%s ã¯é©ç”¨ã•ã‚Œã¦ã„ã¾ã›ã‚“\\n" -#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:247 +#: ../quilt/add.in:106 ../quilt/delete.in:76 ../quilt/diff.in:247 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:72 #: ../quilt/graph.in:131 ../quilt/pop.in:295 ../quilt/push.in:350 #: ../quilt/refresh.in:162 ../quilt/remove.in:81 @@ -139,31 +139,39 @@ msgid "Patch is not applied\\n" msgstr "パッãƒã¯é©ç”¨ã•ã‚Œã¦ã„ã¾ã›ã‚“\\n" #: ../quilt/delete.in:22 -msgid "Usage: quilt delete [patch]\\n" -msgstr "使ã„æ–¹: quilt delete [パッãƒ]\\n" +msgid "Usage: quilt delete [patch | -n]\\n" +msgstr "使ã„æ–¹: quilt delete [パッム| -n]\\n" #: ../quilt/delete.in:25 +#, fuzzy msgid "" "\n" "Remove the specified or topmost patch from the series file. If the\n" "patch is applied, quilt will attempt to remove it first. (Only the\n" "topmost patch can be removed right now.)\n" +"\n" +"-n\tDelete the next patch after topmost, rather than the specified\n" +"\tor topmost patch.\n" msgstr "" "\n" "指定ã•ã‚ŒãŸãƒ‘ッãƒã€ã¾ãŸã¯æœ€ä¸Šä½ã®ãƒ‘ッãƒã‚’シリーズファイルã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã€‚\n" "パッãƒãŒã™ã§ã«é©ç”¨ã•ã‚Œã¦ã„ã‚‹å ´åˆã¯ã€æœ€åˆã«ãƒ‘ッãƒã‚’外ã—ã¾ã™ã€‚( ç¾çŠ¶ã€æœ€\n" "上ä½ã®ãƒ‘ッãƒã—ã‹å‰Šé™¤ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。) \n" -#: ../quilt/delete.in:85 +#: ../quilt/delete.in:88 +msgid "No next patch\\n" +msgstr "" + +#: ../quilt/delete.in:106 msgid "Patch %s is currently applied\\n" msgstr "パッム%s ã¯ç¾åœ¨é©ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚\\n" -#: ../quilt/delete.in:92 +#: ../quilt/delete.in:113 #, fuzzy msgid "Removed patch %s\\n" msgstr "パッム%s を削除ã—ã¾ã™\\n" -#: ../quilt/delete.in:94 +#: ../quilt/delete.in:115 msgid "Failed to remove patch %s\\n" msgstr "パッム%sを削除ã™ã‚‹ã“ã¨ã«å¤±æ•—ã—ã¾ã—ãŸã€‚\\n" diff --git a/po/quilt.pot b/po/quilt.pot index b25b180..92bb7d3 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -48,7 +48,7 @@ msgstr "" msgid "File \\`%s' is located below \\`%s'\\n" msgstr "" -#: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76 +#: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:97 #: ../quilt/diff.in:160 ../quilt/diff.in:171 ../quilt/graph.in:116 #: ../quilt/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62 #: ../quilt/push.in:312 ../quilt/refresh.in:148 ../quilt/remove.in:53 @@ -61,7 +61,7 @@ msgstr "" msgid "Patch %s is not applied\\n" msgstr "" -#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:247 +#: ../quilt/add.in:106 ../quilt/delete.in:76 ../quilt/diff.in:247 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:72 #: ../quilt/graph.in:131 ../quilt/pop.in:295 ../quilt/push.in:350 #: ../quilt/refresh.in:162 ../quilt/remove.in:81 @@ -104,7 +104,7 @@ msgid "Patch is not applied\\n" msgstr "" #: ../quilt/delete.in:22 -msgid "Usage: quilt delete [patch]\\n" +msgid "Usage: quilt delete [patch | -n]\\n" msgstr "" #: ../quilt/delete.in:25 @@ -113,17 +113,24 @@ msgid "" "Remove the specified or topmost patch from the series file. If the\n" "patch is applied, quilt will attempt to remove it first. (Only the\n" "topmost patch can be removed right now.)\n" +"\n" +"-n\tDelete the next patch after topmost, rather than the specified\n" +"\tor topmost patch.\n" +msgstr "" + +#: ../quilt/delete.in:88 +msgid "No next patch\\n" msgstr "" -#: ../quilt/delete.in:85 +#: ../quilt/delete.in:106 msgid "Patch %s is currently applied\\n" msgstr "" -#: ../quilt/delete.in:92 +#: ../quilt/delete.in:113 msgid "Removed patch %s\\n" msgstr "" -#: ../quilt/delete.in:94 +#: ../quilt/delete.in:115 msgid "Failed to remove patch %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index adf2e2f..5f35aee 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 6 23:13:01 CEST 2005 - khali@linux-fr.org + +- quilt delete: Add option -n, which deletes the next patch + after topmost (rather than the specified or topmost patch). + +------------------------------------------------------------------- Tue Jul 5 18:33:15 CEST 2005 - khali@linux-fr.org - fr.po: Add all missing translations. diff --git a/quilt/delete.in b/quilt/delete.in index c8151f8..6154096 100644 --- a/quilt/delete.in +++ b/quilt/delete.in @@ -19,13 +19,16 @@ fi usage() { - printf $"Usage: quilt delete [patch]\n" + printf $"Usage: quilt delete [patch | -n]\n" if [ x$1 = x-h ] then printf $" Remove the specified or topmost patch from the series file. If the patch is applied, quilt will attempt to remove it first. (Only the topmost patch can be removed right now.) + +-n Delete the next patch after topmost, rather than the specified + or topmost patch. " exit 0 @@ -34,7 +37,7 @@ topmost patch can be removed right now.) fi } -options=`getopt -o h -- "$@"` +options=`getopt -o nh -- "$@"` if [ $? -ne 0 ] then @@ -46,6 +49,9 @@ eval set -- "$options" while true do case "$1" in + -n) + opt_next=1 + shift ;; -h) usage -h ;; --) @@ -54,7 +60,7 @@ do esac done -if [ $# -gt 1 ] +if [ $# -gt 1 -o \( -n "$opt_next" -a $# -gt 0 \) ] then usage fi @@ -63,10 +69,25 @@ patch="$1" if [ -z "$patch" ] then patch="$(top_patch)" - if [ -z "$patch" ] + if [ -z "$opt_next" ] then - printf $"No patches applied\n" >&2 - exit 1 + if [ -z "$patch" ] + then + printf $"No patches applied\n" >&2 + exit 1 + fi + else + if [ -z "$patch" ] + then + patch="$(cat_series | head -n 1)" + else + patch="$(patches_after "$patch" | head -n 1)" + fi + if [ -z "$patch" ] + then + printf $"No next patch\n" >&2 + exit 1 + fi fi else save_patch=$patch |