diff options
| -rw-r--r-- | po/de.po | 36 | ||||
| -rw-r--r-- | po/fr.po | 36 | ||||
| -rw-r--r-- | po/ja.po | 36 | ||||
| -rw-r--r-- | po/quilt.pot | 32 | ||||
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt/push.in | 48 |
6 files changed, 98 insertions, 97 deletions
@@ -248,7 +248,7 @@ msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" msgid "Cannot change into directory %s\\n" msgstr "Kann nicht in Verzeichnis %s wechseln\\n" -#: ../quilt/diff.in:318 ../quilt/pop.in:115 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:318 ../quilt/pop.in:115 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" @@ -256,7 +256,7 @@ msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" msgid "Cannot change to temporary directory\\n" msgstr "Kann nicht in temporäres Verzeichnis wechseln\\n" -#: ../quilt/diff.in:348 ../quilt/pop.in:138 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:348 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" @@ -557,17 +557,17 @@ msgstr "" "\n" "-v\tViele Meldungen ausgeben.\n" -#: ../quilt/pop.in:153 ../scripts/rpatch.in:100 +#: ../quilt/pop.in:153 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "Patch %s kann nicht entfernt werden (Patch auffrischen oder Entfernen " "erzwingen mit -f)\\n" -#: ../quilt/pop.in:176 ../scripts/rpatch.in:123 +#: ../quilt/pop.in:176 msgid "Removing patch %s\\n" msgstr "Entferne patch %s\\n" -#: ../quilt/pop.in:260 ../scripts/rpatch.in:179 +#: ../quilt/pop.in:260 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" @@ -647,27 +647,27 @@ msgstr "" "\tErlaubt GNU patch, interaktiv Fragen zu stellen. Wenn diese Option\n" "\tnicht angegeben wird, wird die Option -f an GNU patch übergeben.\n" -#: ../quilt/push.in:59 ../scripts/apatch.in:29 +#: ../quilt/push.in:59 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n" -#: ../quilt/push.in:71 ../scripts/apatch.in:41 +#: ../quilt/push.in:71 msgid "Patch %s appears to be empty\\n" msgstr "Patch %s scheint leer zu sein\\n" -#: ../quilt/push.in:109 ../scripts/apatch.in:79 +#: ../quilt/push.in:109 msgid "Applying patch %s\\n" msgstr "Wende Patch %s an\\n" -#: ../quilt/push.in:159 ../scripts/apatch.in:130 +#: ../quilt/push.in:159 msgid "Patch %s appears to be empty, applied\\n" msgstr "Patch %s scheint leer zu sein, angewandt\\n" -#: ../quilt/push.in:163 ../scripts/apatch.in:134 +#: ../quilt/push.in:163 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Patch %s angewandt (erzwungen, muß aufgefrischt werden (Refresh))\\n" -#: ../quilt/push.in:168 ../scripts/apatch.in:139 +#: ../quilt/push.in:168 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "Patch %s läßt sich nicht anwenden (erzwingen mit -f)\\n" @@ -679,7 +679,7 @@ msgstr "Patch %s nicht in series-Datei gefunden\\n" msgid "Patch %s is already applied\\n" msgstr "Patch %s ist bereits angewandt\\n" -#: ../quilt/push.in:291 ../scripts/apatch.in:197 +#: ../quilt/push.in:291 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" @@ -982,10 +982,6 @@ msgstr "" "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie " "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n" -#: ../scripts/apatch.in:22 -msgid "Usage: $0 [-fqv] patchname\\n" -msgstr "Verwendung: $0 [-fqv] patchname\\n" - #: ../scripts/patchfns.in:703 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " @@ -1007,9 +1003,11 @@ msgstr "" "Das Arbeitsverzeichnis wurde von einer älteren Version von quilt erstellt. " "Bitte führen Sie \\`quilt upgrade' aus.\\n" -#: ../scripts/rpatch.in:22 -msgid "Usage: %s [-fRq] patchname\\n" -msgstr "Verwendung: %s [-fRq] patchname\\n" +#~ msgid "Usage: $0 [-fqv] patchname\\n" +#~ msgstr "Verwendung: $0 [-fqv] patchname\\n" + +#~ msgid "Usage: %s [-fRq] patchname\\n" +#~ msgstr "Verwendung: %s [-fRq] patchname\\n" #~ msgid "Interrupted by user\\n" #~ msgstr "Unterbrechung durch Benutzer\\n" @@ -257,7 +257,7 @@ msgstr "Le patch %s n'est pas appliqu avant %s\\n." msgid "Cannot change into directory %s\\n" msgstr "Impossible d'entrer dans le rpertoire %s\\n" -#: ../quilt/diff.in:318 ../quilt/pop.in:115 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:318 ../quilt/pop.in:115 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le rpertoire temporaire\\n" @@ -265,7 +265,7 @@ msgstr "Impossible de copier les fichiers dans le rpertoire temporaire\\n" msgid "Cannot change to temporary directory\\n" msgstr "Impossible d'entrer dans le rpertoire temporaire\\n" -#: ../quilt/diff.in:348 ../quilt/pop.in:138 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:348 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" @@ -571,17 +571,17 @@ msgstr "" "\n" "-v\tOpre verbeusement.\n" -#: ../quilt/pop.in:153 ../scripts/rpatch.in:100 +#: ../quilt/pop.in:153 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -f)" "\\n" -#: ../quilt/pop.in:176 ../scripts/rpatch.in:123 +#: ../quilt/pop.in:176 msgid "Removing patch %s\\n" msgstr "Retrait de %s\\n" -#: ../quilt/pop.in:260 ../scripts/rpatch.in:179 +#: ../quilt/pop.in:260 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Le patch %s doit tre rafraichi au pralable.\\n" @@ -667,27 +667,27 @@ msgstr "" "\tSi cette option n'est pas donne, l'option -f sera passe au \n" "\tprogramme patch.\n" -#: ../quilt/push.in:59 ../scripts/apatch.in:29 +#: ../quilt/push.in:59 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas t appliqu.\\n" -#: ../quilt/push.in:71 ../scripts/apatch.in:41 +#: ../quilt/push.in:71 msgid "Patch %s appears to be empty\\n" msgstr "Le patch %s semble vide.\\n" -#: ../quilt/push.in:109 ../scripts/apatch.in:79 +#: ../quilt/push.in:109 msgid "Applying patch %s\\n" msgstr "Application de %s\\n" -#: ../quilt/push.in:159 ../scripts/apatch.in:130 +#: ../quilt/push.in:159 msgid "Patch %s appears to be empty, applied\\n" msgstr "Le patch %s semble vide. Il a t appliqu.\\n" -#: ../quilt/push.in:163 ../scripts/apatch.in:134 +#: ../quilt/push.in:163 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "%s a t appliqu (forc ; vous devriez le rafrachir)\\n" -#: ../quilt/push.in:168 ../scripts/apatch.in:139 +#: ../quilt/push.in:168 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "" "Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n" @@ -700,7 +700,7 @@ msgstr "Le patch %s est introuvable dans le fichier de srie\\n" msgid "Patch %s is already applied\\n" msgstr "Le patch %s est dj appliqu.\\n" -#: ../quilt/push.in:291 ../scripts/apatch.in:197 +#: ../quilt/push.in:291 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Le patch au sommet %s doit tre rafraichi au pralable.\\n" @@ -1003,10 +1003,6 @@ msgstr "" "version utilise pour crer cet arbre de travail, ou effacez le rpertoire\n" "%s et rappliquez compltement vos patchs.\\n" -#: ../scripts/apatch.in:22 -msgid "Usage: $0 [-fqv] patchname\\n" -msgstr "Usage : $0 [-fqv] patchname\\n" - #: ../scripts/patchfns.in:703 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " @@ -1027,9 +1023,11 @@ msgstr "" "Votre arbre a t cr par une vieille version de quilt. Veuillez \n" "utiliser quilt upgrade .\\n" -#: ../scripts/rpatch.in:22 -msgid "Usage: %s [-fRq] patchname\\n" -msgstr "Usage: %s [-fRq] nom_de_patch\\n" +#~ msgid "Usage: $0 [-fqv] patchname\\n" +#~ msgstr "Usage : $0 [-fqv] patchname\\n" + +#~ msgid "Usage: %s [-fRq] patchname\\n" +#~ msgstr "Usage: %s [-fRq] nom_de_patch\\n" #~ msgid "Interrupted by user\\n" #~ msgstr "Interrompu par l'utilisateur\\n" @@ -243,7 +243,7 @@ msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" msgid "Cannot change into directory %s\\n" msgstr "ディレクトリ %s に移動できません\\n" -#: ../quilt/diff.in:318 ../quilt/pop.in:115 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:318 ../quilt/pop.in:115 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" @@ -251,7 +251,7 @@ msgstr "テンポラリディレクトリへのファイルコピーに失敗し msgid "Cannot change to temporary directory\\n" msgstr "テンポラリディレクトリに移動できません\\n" -#: ../quilt/diff.in:348 ../quilt/pop.in:138 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:348 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" @@ -548,17 +548,17 @@ msgstr "" "\n" "-v\t詳細に表示。\n" -#: ../quilt/pop.in:153 ../scripts/rpatch.in:100 +#: ../quilt/pop.in:153 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "パッチ %s を、正常にはずすことができません (リフレッシュするか -fを付\n" "けてはずしてください)\\n" -#: ../quilt/pop.in:176 ../scripts/rpatch.in:123 +#: ../quilt/pop.in:176 msgid "Removing patch %s\\n" msgstr "パッチ %s を削除します\\n" -#: ../quilt/pop.in:260 ../scripts/rpatch.in:179 +#: ../quilt/pop.in:260 msgid "Patch %s needs to be refreshed first.\\n" msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" @@ -635,28 +635,28 @@ msgstr "" "\tまま残す。\n" "\n" -#: ../quilt/push.in:59 ../scripts/apatch.in:29 +#: ../quilt/push.in:59 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "ユーザによって中断されました。パッチ % は適用されていません。\\n" -#: ../quilt/push.in:71 ../scripts/apatch.in:41 +#: ../quilt/push.in:71 msgid "Patch %s appears to be empty\\n" msgstr "パッチ %sは、空のようです\\n" -#: ../quilt/push.in:109 ../scripts/apatch.in:79 +#: ../quilt/push.in:109 msgid "Applying patch %s\\n" msgstr "パッチ %s を適用しています\\n" -#: ../quilt/push.in:159 ../scripts/apatch.in:130 +#: ../quilt/push.in:159 msgid "Patch %s appears to be empty, applied\\n" msgstr "パッチ %s は、空のようですが、適用しました\\n" -#: ../quilt/push.in:163 ../scripts/apatch.in:134 +#: ../quilt/push.in:163 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" "パッチ % を適用しました (強制適用したために、リフレッシュが必要です)\\n" -#: ../quilt/push.in:168 ../scripts/apatch.in:139 +#: ../quilt/push.in:168 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "パッチ %sが適用できません (強制適用する場合は -fを付けてください)\\n" @@ -668,7 +668,7 @@ msgstr "パッチ %s が seriesファイル内で見つかりません。\\n" msgid "Patch %s is already applied\\n" msgstr "パッチ %s は、すでに適用済です\\n" -#: ../quilt/push.in:291 ../scripts/apatch.in:197 +#: ../quilt/push.in:291 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "最上位パッチのリフレッシュが最初に必要です。\\n" @@ -967,10 +967,6 @@ msgstr "" "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n" "トリを削除し、最初からパッチをあて直してください。\\n" -#: ../scripts/apatch.in:22 -msgid "Usage: $0 [-fqv] patchname\\n" -msgstr "使い方: $0 [-fqv] パッチ名\\n" - #: ../scripts/patchfns.in:703 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " @@ -991,9 +987,11 @@ msgstr "" "現在作業中のディレクトリは古いバージョンの quiltによって作られたもので" "す。'quilt upgrade'を実行してください。\\n" -#: ../scripts/rpatch.in:22 -msgid "Usage: %s [-fRq] patchname\\n" -msgstr "使い方: %s [-fRq] パッチ名\\n" +#~ msgid "Usage: $0 [-fqv] patchname\\n" +#~ msgstr "使い方: $0 [-fqv] パッチ名\\n" + +#~ msgid "Usage: %s [-fRq] patchname\\n" +#~ msgstr "使い方: %s [-fRq] パッチ名\\n" #~ msgid "Interrupted by user\\n" #~ msgstr "ユーザによって中断されました\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 3d5c429..f2e0a53 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -168,7 +168,7 @@ msgstr "" msgid "Cannot change into directory %s\\n" msgstr "" -#: ../quilt/diff.in:318 ../quilt/pop.in:115 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:318 ../quilt/pop.in:115 msgid "Failed to copy files to temporary directory\\n" msgstr "" @@ -176,7 +176,7 @@ msgstr "" msgid "Cannot change to temporary directory\\n" msgstr "" -#: ../quilt/diff.in:348 ../quilt/pop.in:138 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:348 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "" @@ -401,15 +401,15 @@ msgid "" "-v\tVerbose operation.\n" msgstr "" -#: ../quilt/pop.in:153 ../scripts/rpatch.in:100 +#: ../quilt/pop.in:153 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" -#: ../quilt/pop.in:176 ../scripts/rpatch.in:123 +#: ../quilt/pop.in:176 msgid "Removing patch %s\\n" msgstr "" -#: ../quilt/pop.in:260 ../scripts/rpatch.in:179 +#: ../quilt/pop.in:260 msgid "Patch %s needs to be refreshed first.\\n" msgstr "" @@ -464,27 +464,27 @@ msgid "" "\tpatch program.\n" msgstr "" -#: ../quilt/push.in:59 ../scripts/apatch.in:29 +#: ../quilt/push.in:59 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "" -#: ../quilt/push.in:71 ../scripts/apatch.in:41 +#: ../quilt/push.in:71 msgid "Patch %s appears to be empty\\n" msgstr "" -#: ../quilt/push.in:109 ../scripts/apatch.in:79 +#: ../quilt/push.in:109 msgid "Applying patch %s\\n" msgstr "" -#: ../quilt/push.in:159 ../scripts/apatch.in:130 +#: ../quilt/push.in:159 msgid "Patch %s appears to be empty, applied\\n" msgstr "" -#: ../quilt/push.in:163 ../scripts/apatch.in:134 +#: ../quilt/push.in:163 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" -#: ../quilt/push.in:168 ../scripts/apatch.in:139 +#: ../quilt/push.in:168 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "" @@ -496,7 +496,7 @@ msgstr "" msgid "Patch %s is already applied\\n" msgstr "" -#: ../quilt/push.in:291 ../scripts/apatch.in:197 +#: ../quilt/push.in:291 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "" @@ -712,10 +712,6 @@ msgid "" "patches from scratch.\\n" msgstr "" -#: ../scripts/apatch.in:22 -msgid "Usage: $0 [-fqv] patchname\\n" -msgstr "" - #: ../scripts/patchfns.in:703 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " @@ -729,7 +725,3 @@ msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" msgstr "" - -#: ../scripts/rpatch.in:22 -msgid "Usage: %s [-fRq] patchname\\n" -msgstr "" diff --git a/quilt.changes b/quilt.changes index a75dce2..40acd49 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 19 13:02:32 CET 2004 - agruen@suse.de + +- Push command: Write out output of patch process immediately + instead of reading into a variable and then printing that + variable. This helps to see what's happening with large patches. + +------------------------------------------------------------------- Mon Nov 15 23:36:40 CET 2004 - agruen@suse.de - Get rid of the apatch and rpatch helper scripts: Integrate them diff --git a/quilt/push.in b/quilt/push.in index d4e9ea7..e70839d 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -101,6 +101,32 @@ rollback_patch() @LIB@/backup-files $silent_unless_verbose -r -B $QUILT_PC/$patch/ - } +cleanup_patch_output() { + if [ -z "$opt_leave_rejects" ] + then + if [ -n "$opt_quiet" ]; then + # In this case, patch does not allow us to find out + # which file contains the rejects; it only tells us + # which reject file is used. We use a single temporary + # reject file, so this does not help us. + + @AWK@ ' + { gsub(/ -- saving rejects to file .*/, "") } + { print } + ' + else + @AWK@ ' + /^patching file / { filename = substr($0, 15) } + { gsub(/ -- saving rejects to file .*/, + " -- rejects in file " filename) } + { print } + ' + fi + else + cat + fi +} + add_patch() { local patch=$1 @@ -116,29 +142,11 @@ add_patch() no_reject_files="-r $tmp" fi - output="$(apply_patch $patch)" + apply_patch $patch \ + | cleanup_patch_output status=${PIPESTATUS[0]} trap "" SIGINT - if [ $status -ne 0 -a -z "$opt_leave_rejects" ] - then - # The reject files are removed in rollback_patch. - echo "$output" \ - | @AWK@ ' - /^patching file / { filename = substr($0, 15) } - { if ('${#silent}' != 0) - gsub(/ -- saving rejects to file .*/, "") - else - gsub(/ -- saving rejects to file .*/, - " -- rejects in file " filename) - } - { print } - ' - elif [ -n "$output" ] - then - echo "$output" - fi - if [ $status -eq 0 -o -n "$opt_force" ] then add_to_db $patch |