diff options
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | po/de.po | 160 | ||||
| -rw-r--r-- | po/fr.po | 160 | ||||
| -rw-r--r-- | po/ja.po | 162 | ||||
| -rw-r--r-- | po/quilt.pot | 150 | ||||
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt/add.in | 22 | ||||
| -rw-r--r-- | quilt/annotate.in | 13 | ||||
| -rw-r--r-- | quilt/applied.in | 16 | ||||
| -rw-r--r-- | quilt/delete.in | 37 | ||||
| -rw-r--r-- | quilt/diff.in | 31 | ||||
| -rw-r--r-- | quilt/files.in | 22 | ||||
| -rw-r--r-- | quilt/fold.in | 7 | ||||
| -rw-r--r-- | quilt/fork.in | 7 | ||||
| -rw-r--r-- | quilt/graph.in | 23 | ||||
| -rw-r--r-- | quilt/header.in | 18 | ||||
| -rw-r--r-- | quilt/next.in | 17 | ||||
| -rw-r--r-- | quilt/pop.in | 15 | ||||
| -rw-r--r-- | quilt/previous.in | 11 | ||||
| -rw-r--r-- | quilt/push.in | 44 | ||||
| -rw-r--r-- | quilt/refresh.in | 28 | ||||
| -rw-r--r-- | quilt/remove.in | 22 | ||||
| -rw-r--r-- | quilt/rename.in | 16 | ||||
| -rw-r--r-- | quilt/scripts/patchfns.in | 112 | ||||
| -rw-r--r-- | quilt/top.in | 10 | ||||
| -rw-r--r-- | quilt/unapplied.in | 21 | ||||
| -rw-r--r-- | test/three.test | 29 |
27 files changed, 494 insertions, 670 deletions
@@ -40,6 +40,10 @@ Documentation: - Subdirectory support +quilt new: + + - Prevent spaces in patch names. + quilt push: - Add option to print the reject to stdout @@ -82,43 +82,23 @@ 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/annotate.in:103 quilt/applied.in:62 -#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:172 quilt/graph.in:116 -#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62 -#: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53 -#: quilt/rename.in:63 quilt/unapplied.in:62 -msgid "Patch %s is not in series\\n" -msgstr "Patch %s ist nicht in der series-Datei enthalten\\n" - -#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:240 quilt/graph.in:121 -#: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74 -msgid "Patch %s is not applied\\n" -msgstr "Patch %s ist nicht angewandt\\n" - -#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:248 quilt/files.in:102 -#: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142 -#: quilt/pop.in:282 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 -#: quilt/rename.in:85 -msgid "No patches applied\\n" -msgstr "Keine Patches angewandt\\n" - -#: quilt/add.in:121 +#: quilt/add.in:103 msgid "File %s is already in patch %s\\n" msgstr "Datei %s ist bereits in Patch $patch enthalten\\n" -#: quilt/add.in:129 quilt/remove.in:100 +#: quilt/add.in:111 quilt/remove.in:82 msgid "File %s modified by patch %s\\n" msgstr "Datei %s wird von Patch %s verändert\\n" -#: quilt/add.in:137 +#: quilt/add.in:119 msgid "Cannot add symbolic link %s\\n" msgstr "Kann symbolische Verknüpfung %s nicht hinzufügen\\n" -#: quilt/add.in:144 +#: quilt/add.in:126 msgid "Failed to back up file %s\\n" msgstr "Konnte Datei %s nicht sichern\\n" -#: quilt/add.in:155 +#: quilt/add.in:137 msgid "File %s added to patch %s\\n" msgstr "Datei %s zu Patch %s hinzugefügt\\n" @@ -159,10 +139,6 @@ msgstr "" "Gibt eine Liste der angewandten Patches aus, oder eine Liste aller Patches\n" "vom Anfang der series-Datei bis zum angegebenen Patch.\n" -#: quilt/applied.in:67 -msgid "Patch is not applied\\n" -msgstr "Patch ist nicht angewandt\\n" - #: quilt/delete.in:22 msgid "Usage: quilt delete [-r] [--backup] [patch|-n]\\n" msgstr "Verwendung: quilt delete [-r] [--backup] [patch|-n]\\n" @@ -197,27 +173,27 @@ msgstr "" "\tBenenne den Patch auf patch~, anstatt ihn zu löschen.\n" "\tHat nur in Kompination mit -r eine Wirkung.\n" -#: quilt/delete.in:100 +#: quilt/delete.in:86 msgid "No next patch\\n" msgstr "Kein Patch %s\\n" -#: quilt/delete.in:118 +#: quilt/delete.in:94 msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" -#: quilt/delete.in:125 +#: quilt/delete.in:102 msgid "Removed patch %s\\n" msgstr "Entferne Patch %s\\n" -#: quilt/delete.in:127 +#: quilt/delete.in:104 msgid "Failed to remove patch %s\\n" msgstr "Konnte Patch %s nicht entfernen\\n" -#: quilt/delete.in:138 +#: quilt/delete.in:115 msgid "Failed to backup patch file \\\"%s\\\"\\n" msgstr "Konnte Datei %s nicht sichern\\n" -#: quilt/delete.in:145 +#: quilt/delete.in:122 msgid "Failed to remove patch file \\\"%s\\\"\\n" msgstr "Konnte Patch %s nicht entfernen\\n" @@ -321,40 +297,40 @@ msgstr "" "--sort\tSortiere Dateien im Patch nach ihrem namen, statt die ursprüngliche\n" "\tReihenfolge zu erhalten.\n" -#: quilt/diff.in:232 +#: quilt/diff.in:224 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Die Optionen \\`--combine', \\`--snapshot', und \\`-z' können nicht " "kombiniert werden.\\n" -#: quilt/diff.in:259 +#: quilt/diff.in:236 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden." "\\n" -#: quilt/diff.in:294 quilt/files.in:121 +#: quilt/diff.in:271 quilt/files.in:105 msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: quilt/diff.in:344 quilt/pop.in:101 +#: quilt/diff.in:321 quilt/pop.in:101 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" -#: quilt/diff.in:368 quilt/pop.in:125 +#: quilt/diff.in:345 quilt/pop.in:125 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" -#: quilt/diff.in:387 +#: quilt/diff.in:364 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: quilt/diff.in:407 quilt/refresh.in:201 +#: quilt/diff.in:384 quilt/refresh.in:177 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: quilt/diff.in:414 +#: quilt/diff.in:391 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Warnung: später angewandte Patches verändern Dateien von %s\\n" @@ -409,10 +385,6 @@ msgstr "" "\tersten angewandten Patch.\n" "\n" -#: quilt/files.in:76 quilt/files.in:95 -msgid "Patch %s is not in series file\\n" -msgstr "Patch %s ist nicht in der series-Datei enthalten\\n" - #: quilt/fold.in:22 msgid "Usage: quilt fold [-p strip-level]\\n" msgstr "Verwendung: quilt fold [-p strip-ebenen]\\n" @@ -439,7 +411,7 @@ msgstr "" "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n" "\tentfernt werden sollen.\n" -#: quilt/fold.in:117 +#: quilt/fold.in:112 msgid "File %s may be corrupted\\n" msgstr "Datei %s ist möglicherweise defekt\\n" @@ -476,15 +448,15 @@ msgstr "" "die\n" "Nummer erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff).\n" -#: quilt/fork.in:99 +#: quilt/fork.in:94 msgid "Patch %s exists already, please choose a new name\\n" msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n" -#: quilt/fork.in:111 +#: quilt/fork.in:106 msgid "Fork of patch %s to patch %s failed\\n" msgstr "Fehler beim Aufspalten von %s auf %s\\n" -#: quilt/fork.in:117 +#: quilt/fork.in:112 msgid "Fork of patch %s created as %s\\n" msgstr "Neue Version von %s erstellt als %s\\n" @@ -623,11 +595,11 @@ msgstr "" "--backup\n" "\tErzeuge eine Sicherungskopie von patch als patch~.\n" -#: quilt/header.in:192 +#: quilt/header.in:176 msgid "Replaced header of patch %s\\n" msgstr "Header von Patch %s ersetzt\\n" -#: quilt/header.in:195 +#: quilt/header.in:179 msgid "Appended text to header of patch %s\\n" msgstr "Text an Header von Patch %s angefügt\\n" @@ -875,15 +847,19 @@ msgstr "Patch %s scheint leer zu sein; wird entfernt\\n" msgid "Removing patch %s\\n" msgstr "Entferne patch %s\\n" -#: quilt/pop.in:256 +#: quilt/pop.in:243 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" -#: quilt/pop.in:266 +#: quilt/pop.in:253 msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: quilt/pop.in:289 quilt/push.in:372 +#: quilt/pop.in:269 quilt/scripts/patchfns.in:455 +msgid "No patches applied\\n" +msgstr "Keine Patches angewandt\\n" + +#: quilt/pop.in:276 quilt/push.in:340 msgid "Now at patch %s\\n" msgstr "Jetzt in Patch %s\\n" @@ -989,22 +965,10 @@ msgstr "Patch %s angewandt (erzwungen, muss aufgefrischt werden (Refresh))\\n" msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "Patch %s lässt sich nicht anwenden (erzwingen mit -f)\\n" -#: quilt/push.in:241 -msgid "Patch %s not found in file series\\n" -msgstr "Patch %s nicht in series-Datei gefunden\\n" - -#: quilt/push.in:329 -msgid "Patch %s is already applied\\n" -msgstr "Patch %s ist bereits angewandt\\n" - -#: quilt/push.in:338 +#: quilt/push.in:320 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" -#: quilt/push.in:352 -msgid "File series fully applied, ends at patch %s\\n" -msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" - #: quilt/refresh.in:22 msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] " @@ -1102,35 +1066,35 @@ msgstr "" "--strip-trailing-whitespace\n" "\tEntferne Whitespace an Zeilenenden.\n" -#: quilt/refresh.in:173 +#: quilt/refresh.in:149 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Kann Patches mit Level -p$opt_strip_level nicht auffrischen, bitte -p0 oder -" "p1 angeben\\n" -#: quilt/refresh.in:207 +#: quilt/refresh.in:183 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Später angewandte Patches verändern Dateien von %s. Auffrischen mit -f " "erzwingen.\\n" -#: quilt/refresh.in:213 +#: quilt/refresh.in:189 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "Kann --strip-trailing-whitespace nicht für Patches verwenden, die Dateien " "enthalten, die danach von anderen Patches weiter verändert werden.\\n" -#: quilt/refresh.in:219 +#: quilt/refresh.in:195 msgid "Nothing in patch %s\\n" msgstr "Patch %s ist leer\\n" -#: quilt/refresh.in:295 +#: quilt/refresh.in:271 msgid "Patch %s is unchanged\\n" msgstr "Patch %s ist unverändert\\n" -#: quilt/refresh.in:300 +#: quilt/refresh.in:276 msgid "Refreshed patch %s\\n" msgstr "Patch %s aufgefrischt\\n" @@ -1155,15 +1119,15 @@ msgstr "" "-p patch\n" "\tPatch, aus dem Dateien entfernt werden sollen.\n" -#: quilt/remove.in:91 +#: quilt/remove.in:73 msgid "File %s is not in patch %s\\n" msgstr "Datei %s ist nicht in Patch %s enthalten\\n" -#: quilt/remove.in:109 +#: quilt/remove.in:91 msgid "Failed to remove file %s from patch %s\\n" msgstr "Konnte Datei %s nicht aus Patch %s entfernen\\n" -#: quilt/remove.in:123 +#: quilt/remove.in:105 msgid "File %s removed from patch %s\\n" msgstr "Datei %s aus Patch %s entfernt\\n" @@ -1186,15 +1150,15 @@ msgstr "" "\tPatch, der umbenannt werden soll.\n" "\n" -#: quilt/rename.in:96 +#: quilt/rename.in:84 msgid "Patch %s exists already, please choose a different name\\n" msgstr "Patch %s existiert bereits, bitte einen anderen Namen wählen\\n" -#: quilt/rename.in:110 +#: quilt/rename.in:98 msgid "Renaming of patch %s to %s failed\\n" msgstr "Fehler beim Umbenennen von Patch %s auf %s\\n" -#: quilt/rename.in:116 +#: quilt/rename.in:104 msgid "Patch %s renamed to %s\\n" msgstr "Patch %s auf %s umbenannt\\n" @@ -1233,7 +1197,28 @@ msgstr "Datei %s ist verschwunden\n" msgid "Failed to rename %s to %s: %s\n" msgstr "Konnte %s nicht auf %s umbenennen: %s\n" -#: quilt/scripts/patchfns.in:693 +#: quilt/scripts/patchfns.in:442 +#, fuzzy +msgid "No patches in series\\n" +msgstr "Keine Patches angewandt\\n" + +#: quilt/scripts/patchfns.in:491 +msgid "Patch %s is not in series\\n" +msgstr "Patch %s ist nicht in der series-Datei enthalten\\n" + +#: quilt/scripts/patchfns.in:518 +msgid "Patch %s is not applied\\n" +msgstr "Patch %s ist nicht angewandt\\n" + +#: quilt/scripts/patchfns.in:539 +msgid "Patch %s is already applied\\n" +msgstr "Patch %s ist bereits angewandt\\n" + +#: quilt/scripts/patchfns.in:555 +msgid "File series fully applied, ends at patch %s\\n" +msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" + +#: quilt/scripts/patchfns.in:795 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1246,7 +1231,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:778 +#: quilt/scripts/patchfns.in:880 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1449,3 +1434,12 @@ msgstr "" "Bitte entfernen Sie alle Patches mit \\`quilt pop -a' der quilt-Version, die " "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie " "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n" + +#~ msgid "Patch is not applied\\n" +#~ msgstr "Patch ist nicht angewandt\\n" + +#~ msgid "Patch %s is not in series file\\n" +#~ msgstr "Patch %s ist nicht in der series-Datei enthalten\\n" + +#~ msgid "Patch %s not found in file series\\n" +#~ msgstr "Patch %s nicht in series-Datei gefunden\\n" @@ -82,43 +82,23 @@ 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/annotate.in:103 quilt/applied.in:62 -#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:172 quilt/graph.in:116 -#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62 -#: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53 -#: quilt/rename.in:63 quilt/unapplied.in:62 -msgid "Patch %s is not in series\\n" -msgstr "Le patch %s n'est pas dans la srie\\n" - -#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:240 quilt/graph.in:121 -#: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74 -msgid "Patch %s is not applied\\n" -msgstr "Le patch %s n'est pas appliqu\\n" - -#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:248 quilt/files.in:102 -#: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142 -#: quilt/pop.in:282 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 -#: quilt/rename.in:85 -msgid "No patches applied\\n" -msgstr "Aucun patch n'est appliqu\\n" - -#: quilt/add.in:121 +#: quilt/add.in:103 msgid "File %s is already in patch %s\\n" msgstr "Le fichier %s est dj dans le patch %s\\n" -#: quilt/add.in:129 quilt/remove.in:100 +#: quilt/add.in:111 quilt/remove.in:82 msgid "File %s modified by patch %s\\n" msgstr "Le fichier %s est modifi par le patch %s\\n" -#: quilt/add.in:137 +#: quilt/add.in:119 msgid "Cannot add symbolic link %s\\n" msgstr "Impossible d'ajouter le lien symbolique %s\\n" -#: quilt/add.in:144 +#: quilt/add.in:126 msgid "Failed to back up file %s\\n" msgstr "Impossible de faire une copie de scurit de %s\\n" -#: quilt/add.in:155 +#: quilt/add.in:137 msgid "File %s added to patch %s\\n" msgstr "Le fichier %s a t ajout au patch %s\\n" @@ -159,10 +139,6 @@ msgstr "" "Affiche la liste des patches appliqus, ou la liste de tous les patches\n" "jusqu' celui pass en paramtre (inclus).\n" -#: quilt/applied.in:67 -msgid "Patch is not applied\\n" -msgstr "Le patch n'est pas appliqu\\n" - #: quilt/delete.in:22 msgid "Usage: quilt delete [-r] [--backup] [patch|-n]\\n" msgstr "Usage : quilt delete [-r] [--backup] [patch|-n]\\n" @@ -197,27 +173,27 @@ msgstr "" "\tRenomme le fichier en patch~ au lieu de le supprimer.\n" "\tIgnor si \\\"-r\\\" n'est pas galement utilis.\n" -#: quilt/delete.in:100 +#: quilt/delete.in:86 msgid "No next patch\\n" msgstr "Pas de patch suivant\\n" -#: quilt/delete.in:118 +#: quilt/delete.in:94 msgid "Patch %s is currently applied\\n" msgstr "Le patch %s est actuellement appliqu\\n" -#: quilt/delete.in:125 +#: quilt/delete.in:102 msgid "Removed patch %s\\n" msgstr "Patch %s retir\\n" -#: quilt/delete.in:127 +#: quilt/delete.in:104 msgid "Failed to remove patch %s\\n" msgstr "Impossible de retirer le patch %s\\n" -#: quilt/delete.in:138 +#: quilt/delete.in:115 msgid "Failed to backup patch file \\\"%s\\\"\\n" msgstr "Impossible de faire une copie de scurit du fichier \\\"%s\\\"\\n" -#: quilt/delete.in:145 +#: quilt/delete.in:122 msgid "Failed to remove patch file \\\"%s\\\"\\n" msgstr "Impossible de retirer le patch \\\"%s\\\"\\n" @@ -323,40 +299,40 @@ msgstr "" "--sort\tTrie les fichiers par leur nom au lieu de prserver leur ordre\n" "\td'origine.\n" -#: quilt/diff.in:232 +#: quilt/diff.in:224 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Les options --combine, --snapshot et -z ne peuvent pas tre combines." "\\n" -#: quilt/diff.in:259 +#: quilt/diff.in:236 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Impossible de crer des patches avec -p%s. Veuillez spcifier -p0 ou -p1 " "la place\\n" -#: quilt/diff.in:294 quilt/files.in:121 +#: quilt/diff.in:271 quilt/files.in:105 msgid "Patch %s not applied before patch %s\\n" msgstr "Le patch %s n'est pas appliqu avant %s\\n." -#: quilt/diff.in:344 quilt/pop.in:101 +#: quilt/diff.in:321 quilt/pop.in:101 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le rpertoire temporaire\\n" -#: quilt/diff.in:368 quilt/pop.in:125 +#: quilt/diff.in:345 quilt/pop.in:125 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" -#: quilt/diff.in:387 +#: quilt/diff.in:364 msgid "File %s is not being modified\\n" msgstr "Le fichier %s n'est pas modifi.\\n" -#: quilt/diff.in:407 quilt/refresh.in:201 +#: quilt/diff.in:384 quilt/refresh.in:177 msgid "Diff failed, aborting\\n" msgstr "Le diff a chou. Abandon.\\n" -#: quilt/diff.in:414 +#: quilt/diff.in:391 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Attention: un patch plus recent modifie des fichiers communs %s\\n" @@ -410,10 +386,6 @@ msgstr "" "\tcelui appliqu en dernier. Le nom de fichier - correspond au \n" "\tpremier patch appliqu.\n" -#: quilt/files.in:76 quilt/files.in:95 -msgid "Patch %s is not in series file\\n" -msgstr "Le patch %s n'est pas dans le fichier series\\n" - #: quilt/fold.in:22 msgid "Usage: quilt fold [-p strip-level]\\n" msgstr "Usage : quilt fold [-p strip-level]\\n" @@ -440,7 +412,7 @@ msgstr "" "\tNombre de niveaux de rpertoires retirer lors de l'application du \n" "\tpatch.\n" -#: quilt/fold.in:117 +#: quilt/fold.in:112 msgid "File %s may be corrupted\\n" msgstr "Le fichier %s est peut-tre corrompu\\n" @@ -479,15 +451,15 @@ msgstr "" "tiret suivi d'un nombre, ce nombre est augment la place (par\n" "exemple : patch.diff, patch-2.diff, patch-3.diff).\n" -#: quilt/fork.in:99 +#: quilt/fork.in:94 msgid "Patch %s exists already, please choose a new name\\n" msgstr "Le patch %s existe dj, veuillez choisir un nouveau nom\\n" -#: quilt/fork.in:111 +#: quilt/fork.in:106 msgid "Fork of patch %s to patch %s failed\\n" msgstr "Le fork de %s en %s a chou\\n" -#: quilt/fork.in:117 +#: quilt/fork.in:112 msgid "Fork of patch %s created as %s\\n" msgstr "Le fork de %s a t cr en tant que %s\\n" @@ -627,11 +599,11 @@ msgstr "" "\tCre une sauvegarde de la version originale du patch en tant\n" "\tque patch~.\n" -#: quilt/header.in:192 +#: quilt/header.in:176 msgid "Replaced header of patch %s\\n" msgstr "En-tte du patch %s remplac\\n" -#: quilt/header.in:195 +#: quilt/header.in:179 msgid "Appended text to header of patch %s\\n" msgstr "Texte ajout la fin de l'en-tte du patch %s\\n" @@ -884,15 +856,19 @@ msgstr "Le patch %s semble vide, enlev\\n" msgid "Removing patch %s\\n" msgstr "Retrait de %s\\n" -#: quilt/pop.in:256 +#: quilt/pop.in:243 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Le patch %s doit tre rafraichi au pralable.\\n" -#: quilt/pop.in:266 +#: quilt/pop.in:253 msgid "No patch removed\\n" msgstr "Aucun patch retir\\n" -#: quilt/pop.in:289 quilt/push.in:372 +#: quilt/pop.in:269 quilt/scripts/patchfns.in:455 +msgid "No patches applied\\n" +msgstr "Aucun patch n'est appliqu\\n" + +#: quilt/pop.in:276 quilt/push.in:340 msgid "Now at patch %s\\n" msgstr "Le patch %s est maintenant au sommet\\n" @@ -1006,22 +982,10 @@ 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" -#: quilt/push.in:241 -msgid "Patch %s not found in file series\\n" -msgstr "Le patch %s est introuvable dans le fichier de srie\\n" - -#: quilt/push.in:329 -msgid "Patch %s is already applied\\n" -msgstr "Le patch %s est dj appliqu.\\n" - -#: quilt/push.in:338 +#: quilt/push.in:320 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Le patch au sommet %s doit tre rafraichi au pralable.\\n" -#: quilt/push.in:352 -msgid "File series fully applied, ends at patch %s\\n" -msgstr "La srie est compltement applique. Le dernier patch est %s.\\n" - #: quilt/refresh.in:22 msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] " @@ -1115,35 +1079,35 @@ msgstr "" "--strip-trailing-whitespace\n" "\tSupprime les espaces la fin des lignes.\n" -#: quilt/refresh.in:173 +#: quilt/refresh.in:149 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Impossible de rafrachir des patchs avec -p%s. Veuillez spcifier -p0 ou -p1 " " la place.\\n" -#: quilt/refresh.in:207 +#: quilt/refresh.in:183 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Des fichiers plus rcents modifient les mmes fichiers que %s.\n" "Forcez le rafrachissement avec -f.\\n" -#: quilt/refresh.in:213 +#: quilt/refresh.in:189 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "Impossible d'utiliser --strip-trailing-whitespace sur un patch dont\n" "certains fichiers sont masqus.\\n" -#: quilt/refresh.in:219 +#: quilt/refresh.in:195 msgid "Nothing in patch %s\\n" msgstr "Le patch %s ne contient rien\\n" -#: quilt/refresh.in:295 +#: quilt/refresh.in:271 msgid "Patch %s is unchanged\\n" msgstr "Patch %s inchang\\n" -#: quilt/refresh.in:300 +#: quilt/refresh.in:276 msgid "Refreshed patch %s\\n" msgstr "Patch %s rafrachi\\n" @@ -1168,15 +1132,15 @@ msgstr "" "-p patch\n" "\tPatch duquel les fichiers doivent tre retirs.\n" -#: quilt/remove.in:91 +#: quilt/remove.in:73 msgid "File %s is not in patch %s\\n" msgstr "Le fichier %s n'est pas dans le patch %s.\\n" -#: quilt/remove.in:109 +#: quilt/remove.in:91 msgid "Failed to remove file %s from patch %s\\n" msgstr "Impossible d'enlever le fichier %s du patch %s.\\n" -#: quilt/remove.in:123 +#: quilt/remove.in:105 msgid "File %s removed from patch %s\\n" msgstr "Le fichier %s a t enlev du patch %s.\\n" @@ -1198,15 +1162,15 @@ msgstr "" "-p patch\n" "\tPatch renommer.\n" -#: quilt/rename.in:96 +#: quilt/rename.in:84 msgid "Patch %s exists already, please choose a different name\\n" msgstr "Le patch %s existe dj, veuillez choisir un nom diffrent\\n" -#: quilt/rename.in:110 +#: quilt/rename.in:98 msgid "Renaming of patch %s to %s failed\\n" msgstr "Le renommage de %s en %s a chou\\n" -#: quilt/rename.in:116 +#: quilt/rename.in:104 msgid "Patch %s renamed to %s\\n" msgstr "Patch %s renomm en %s\\n" @@ -1245,7 +1209,28 @@ msgstr "Le fichier %s a disparu !\n" msgid "Failed to rename %s to %s: %s\n" msgstr "Impossible de renommer %s en %s : %s\n" -#: quilt/scripts/patchfns.in:693 +#: quilt/scripts/patchfns.in:442 +#, fuzzy +msgid "No patches in series\\n" +msgstr "Aucun patch n'est appliqu\\n" + +#: quilt/scripts/patchfns.in:491 +msgid "Patch %s is not in series\\n" +msgstr "Le patch %s n'est pas dans la srie\\n" + +#: quilt/scripts/patchfns.in:518 +msgid "Patch %s is not applied\\n" +msgstr "Le patch %s n'est pas appliqu\\n" + +#: quilt/scripts/patchfns.in:539 +msgid "Patch %s is already applied\\n" +msgstr "Le patch %s est dj appliqu.\\n" + +#: quilt/scripts/patchfns.in:555 +msgid "File series fully applied, ends at patch %s\\n" +msgstr "La srie est compltement applique. Le dernier patch est %s.\\n" + +#: quilt/scripts/patchfns.in:795 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1257,7 +1242,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilise pour les appliquer avant d'installer une version plus ancienne.\\n" -#: quilt/scripts/patchfns.in:778 +#: quilt/scripts/patchfns.in:880 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1462,6 +1447,15 @@ msgstr "" "version utilise pour crer cet arbre de travail, ou effacez le rpertoire\n" "%s et rappliquez compltement vos patchs.\\n" +#~ msgid "Patch is not applied\\n" +#~ msgstr "Le patch n'est pas appliqu\\n" + +#~ msgid "Patch %s is not in series file\\n" +#~ msgstr "Le patch %s n'est pas dans le fichier series\\n" + +#~ msgid "Patch %s not found in file series\\n" +#~ msgstr "Le patch %s est introuvable dans le fichier de srie\\n" + #, fuzzy #~ msgid "" #~ "\n" @@ -80,43 +80,23 @@ msgstr "" msgid "File \\`%s' is located below \\`%s'\\n" msgstr "ファイル \\`%s'は、\\`%s'以下にあります\\n" -#: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62 -#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:172 quilt/graph.in:116 -#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62 -#: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53 -#: quilt/rename.in:63 quilt/unapplied.in:62 -msgid "Patch %s is not in series\\n" -msgstr "パッチ %s は seriesの中にありません\\n" - -#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:240 quilt/graph.in:121 -#: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74 -msgid "Patch %s is not applied\\n" -msgstr "パッチ %s は適用されていません\\n" - -#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:248 quilt/files.in:102 -#: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142 -#: quilt/pop.in:282 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 -#: quilt/rename.in:85 -msgid "No patches applied\\n" -msgstr "適用されているパッチはありません\\n" - -#: quilt/add.in:121 +#: quilt/add.in:103 msgid "File %s is already in patch %s\\n" msgstr "ファイル %s は、すでにパッチ %s に含まれています\\n" -#: quilt/add.in:129 quilt/remove.in:100 +#: quilt/add.in:111 quilt/remove.in:82 msgid "File %s modified by patch %s\\n" msgstr "ファイル %s は、パッチ %s によってすでに変更されています\\n" -#: quilt/add.in:137 +#: quilt/add.in:119 msgid "Cannot add symbolic link %s\\n" msgstr "シンボリックファイル %s は追加できません" -#: quilt/add.in:144 +#: quilt/add.in:126 msgid "Failed to back up file %s\\n" msgstr "ファイル %s のバックアップに失敗しました\\n" -#: quilt/add.in:155 +#: quilt/add.in:137 msgid "File %s added to patch %s\\n" msgstr "ファイル %s をパッチ %s に追加しました\\n" @@ -155,10 +135,6 @@ msgstr "" "適用されているパッチの一覧を表示します。指定されたパッチがある場合は、\n" "seriesファイル内のパッチ一覧の中から指定されたパッチまでを表示します。\n" -#: quilt/applied.in:67 -msgid "Patch is not applied\\n" -msgstr "パッチは適用されていません\\n" - #: quilt/delete.in:22 msgid "Usage: quilt delete [-r] [--backup] [patch|-n]\\n" msgstr "使い方: quilt delete [-r] [--backup] [パッチ|-n]\\n" @@ -194,27 +170,27 @@ msgstr "" "\tパッチを削除せず、パッチ~に名前を変更します。オプション\\\"-r\\\"が\n" "\t有効ではないときは無視される。\n" -#: quilt/delete.in:100 +#: quilt/delete.in:86 msgid "No next patch\\n" msgstr "次のパッチはありません\\n" -#: quilt/delete.in:118 +#: quilt/delete.in:94 msgid "Patch %s is currently applied\\n" msgstr "パッチ %s は現在適用されています\\n" -#: quilt/delete.in:125 +#: quilt/delete.in:102 msgid "Removed patch %s\\n" msgstr "パッチ %s が削除されました\\n" -#: quilt/delete.in:127 +#: quilt/delete.in:104 msgid "Failed to remove patch %s\\n" msgstr "パッチ %s を削除することに失敗しました\\n" -#: quilt/delete.in:138 +#: quilt/delete.in:115 msgid "Failed to backup patch file \\\"%s\\\"\\n" msgstr "ファイル \\\"%s\\\" のバックアップに失敗しました\\n" -#: quilt/delete.in:145 +#: quilt/delete.in:122 msgid "Failed to remove patch file \\\"%s\\\"\\n" msgstr "パッチ \\\"%s\\\" を削除することに失敗しました\\n" @@ -315,37 +291,37 @@ msgstr "" "\n" "--sort\t順番を保持せず、名前順にファイルを並び換える。\n" -#: quilt/diff.in:232 +#: quilt/diff.in:224 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "オプション \\`--combine'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n" -#: quilt/diff.in:259 +#: quilt/diff.in:236 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "-p%sでパッチの差分はとれません。-p0か -p1を指定してください\\n" -#: quilt/diff.in:294 quilt/files.in:121 +#: quilt/diff.in:271 quilt/files.in:105 msgid "Patch %s not applied before patch %s\\n" msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" -#: quilt/diff.in:344 quilt/pop.in:101 +#: quilt/diff.in:321 quilt/pop.in:101 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" -#: quilt/diff.in:368 quilt/pop.in:125 +#: quilt/diff.in:345 quilt/pop.in:125 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" -#: quilt/diff.in:387 +#: quilt/diff.in:364 msgid "File %s is not being modified\\n" msgstr "ファイル %s は変更されていません\\n" -#: quilt/diff.in:407 quilt/refresh.in:201 +#: quilt/diff.in:384 quilt/refresh.in:177 msgid "Diff failed, aborting\\n" msgstr "差分に失敗しました。異常終了します\\n" -#: quilt/diff.in:414 +#: quilt/diff.in:391 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "警告: 最近のパッチが、パッチ %s 内のファイルを変更しています\\n" @@ -399,10 +375,6 @@ msgstr "" "\tことになる。\n" "\n" -#: quilt/files.in:76 quilt/files.in:95 -msgid "Patch %s is not in series file\\n" -msgstr "パッチ %s は seriesの中にありません\\n" - #: quilt/fold.in:22 msgid "Usage: quilt fold [-p strip-level]\\n" msgstr "使い方: quilt fold [-p strip-level]\\n" @@ -427,7 +399,7 @@ msgstr "" "-p strip-level\n" "\tパッチを適用するときに、ファイル名から省くパス名要素の数\n" -#: quilt/fold.in:117 +#: quilt/fold.in:112 msgid "File %s may be corrupted\\n" msgstr "ファイル %s は壊れている可能性があります\\n" @@ -461,15 +433,15 @@ msgstr "" "\"-2\\\"が付く。すでにパッチ名が -番号で終っている場合、番号の値が1増える " "(例: patch.diff、patch-2.diff、patch-3.diff)。\n" -#: quilt/fork.in:99 +#: quilt/fork.in:94 msgid "Patch %s exists already, please choose a new name\\n" msgstr "パッチ %s はすでに存在します。新しい名前を選んでください\\n" -#: quilt/fork.in:111 +#: quilt/fork.in:106 msgid "Fork of patch %s to patch %s failed\\n" msgstr "パッチ %s からパッチ %s への分岐に失敗しました\\n" -#: quilt/fork.in:117 +#: quilt/fork.in:112 msgid "Fork of patch %s created as %s\\n" msgstr "パッチ %s の分岐で %s が作成されました\\n" @@ -605,11 +577,11 @@ msgstr "" "--backup\n" "\t古いバージョンのパッチのバックアップコピーを patch~として作成する。\n" -#: quilt/header.in:192 +#: quilt/header.in:176 msgid "Replaced header of patch %s\\n" msgstr "パッチ %s のヘッダを変更しました\\n" -#: quilt/header.in:195 +#: quilt/header.in:179 msgid "Appended text to header of patch %s\\n" msgstr "パッチ %s のヘッダに追加しました\\n" @@ -858,15 +830,19 @@ msgstr "パッチ %s は、空のようです。はずします\\n" msgid "Removing patch %s\\n" msgstr "パッチ %s をはずします\\n" -#: quilt/pop.in:256 +#: quilt/pop.in:243 msgid "Patch %s needs to be refreshed first.\\n" msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" -#: quilt/pop.in:266 +#: quilt/pop.in:253 msgid "No patch removed\\n" msgstr "適用されているパッチはありません\\n" -#: quilt/pop.in:289 quilt/push.in:372 +#: quilt/pop.in:269 quilt/scripts/patchfns.in:455 +msgid "No patches applied\\n" +msgstr "適用されているパッチはありません\\n" + +#: quilt/pop.in:276 quilt/push.in:340 msgid "Now at patch %s\\n" msgstr "現在位置はパッチ %s です\\n" @@ -975,23 +951,10 @@ msgstr "" msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "パッチ %sが適用できません (強制適用する場合は -fを付けてください)\\n" -#: quilt/push.in:241 -msgid "Patch %s not found in file series\\n" -msgstr "パッチ %s が seriesファイル内で見つかりません。\\n" - -#: quilt/push.in:329 -msgid "Patch %s is already applied\\n" -msgstr "パッチ %s は、すでに適用済です\\n" - -#: quilt/push.in:338 +#: quilt/push.in:320 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "最上位パッチのリフレッシュが最初に必要です。\\n" -#: quilt/push.in:352 -msgid "File series fully applied, ends at patch %s\\n" -msgstr "" -"seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" - #: quilt/refresh.in:22 msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] " @@ -1082,33 +1045,33 @@ msgstr "" "--strip-trailing-whitespace\n" "\t末尾の空白文字を削除する。\n" -#: quilt/refresh.in:173 +#: quilt/refresh.in:149 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "-p%sではリフレッシュすることができません。-p0または -p1を指定してください\\n" -#: quilt/refresh.in:207 +#: quilt/refresh.in:183 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "より最近のパッチがパッチ %sのファイルに変更を加えています。リフレッシュを実行" "する場合は -f オプションを使用してください。\\n" -#: quilt/refresh.in:213 +#: quilt/refresh.in:189 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "--strip-trailing-whitespace は影になっているファイルがある場合は使えません" -#: quilt/refresh.in:219 +#: quilt/refresh.in:195 msgid "Nothing in patch %s\\n" msgstr "パッチ %s にはなにも含まれていません\\n" -#: quilt/refresh.in:295 +#: quilt/refresh.in:271 msgid "Patch %s is unchanged\\n" msgstr "パッチ % に変更はありません\\n" -#: quilt/refresh.in:300 +#: quilt/refresh.in:276 msgid "Refreshed patch %s\\n" msgstr "パッチ %s をリフレッシュしました\\n" @@ -1132,15 +1095,15 @@ msgstr "" "-p パッチ\n" "\tファイルを削除するパッチを指定。\n" -#: quilt/remove.in:91 +#: quilt/remove.in:73 msgid "File %s is not in patch %s\\n" msgstr "ファイル %sは、パッチ %sに含まれていません\\n" -#: quilt/remove.in:109 +#: quilt/remove.in:91 msgid "Failed to remove file %s from patch %s\\n" msgstr "ファイル %s を、パッチ %s から削除することに失敗しました\\n" -#: quilt/remove.in:123 +#: quilt/remove.in:105 msgid "File %s removed from patch %s\\n" msgstr "ファイル %s を、パッチ %s から削除しました\\n" @@ -1162,15 +1125,15 @@ msgstr "" "-p patch\n" "\t名前を変更する patch\n" -#: quilt/rename.in:96 +#: quilt/rename.in:84 msgid "Patch %s exists already, please choose a different name\\n" msgstr "パッチ %s はすでに存在します。新しい名前を選んでください\\n" -#: quilt/rename.in:110 +#: quilt/rename.in:98 msgid "Renaming of patch %s to %s failed\\n" msgstr "パッチ %s から %sへの名前の変更に失敗しました\\n" -#: quilt/rename.in:116 +#: quilt/rename.in:104 msgid "Patch %s renamed to %s\\n" msgstr "パッチ %s から %s へ名前を変更しました\\n" @@ -1209,7 +1172,29 @@ msgstr "ファイル %s が消えました!\n" msgid "Failed to rename %s to %s: %s\n" msgstr "パッチ %s から %sへの名前の変更に失敗しました: %s\n" -#: quilt/scripts/patchfns.in:693 +#: quilt/scripts/patchfns.in:442 +#, fuzzy +msgid "No patches in series\\n" +msgstr "適用されているパッチはありません\\n" + +#: quilt/scripts/patchfns.in:491 +msgid "Patch %s is not in series\\n" +msgstr "パッチ %s は seriesの中にありません\\n" + +#: quilt/scripts/patchfns.in:518 +msgid "Patch %s is not applied\\n" +msgstr "パッチ %s は適用されていません\\n" + +#: quilt/scripts/patchfns.in:539 +msgid "Patch %s is already applied\\n" +msgstr "パッチ %s は、すでに適用済です\\n" + +#: quilt/scripts/patchfns.in:555 +msgid "File series fully applied, ends at patch %s\\n" +msgstr "" +"seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" + +#: quilt/scripts/patchfns.in:795 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1221,7 +1206,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: quilt/scripts/patchfns.in:778 +#: quilt/scripts/patchfns.in:880 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1423,3 +1408,12 @@ msgstr "" "現在作業中のツリーを作成した quiltと同じバージョンの quiltで \\`quilt\n" "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n" "トリを削除し、最初からパッチをあて直してください。\\n" + +#~ msgid "Patch is not applied\\n" +#~ msgstr "パッチは適用されていません\\n" + +#~ msgid "Patch %s is not in series file\\n" +#~ msgstr "パッチ %s は seriesの中にありません\\n" + +#~ msgid "Patch %s not found in file series\\n" +#~ msgstr "パッチ %s が seriesファイル内で見つかりません。\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 72dc557..6151b1d 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -46,43 +46,23 @@ msgstr "" msgid "File \\`%s' is located below \\`%s'\\n" msgstr "" -#: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62 -#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:172 quilt/graph.in:116 -#: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62 -#: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53 -#: quilt/rename.in:63 quilt/unapplied.in:62 -msgid "Patch %s is not in series\\n" -msgstr "" - -#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:240 quilt/graph.in:121 -#: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74 -msgid "Patch %s is not applied\\n" -msgstr "" - -#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:248 quilt/files.in:102 -#: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142 -#: quilt/pop.in:282 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 -#: quilt/rename.in:85 -msgid "No patches applied\\n" -msgstr "" - -#: quilt/add.in:121 +#: quilt/add.in:103 msgid "File %s is already in patch %s\\n" msgstr "" -#: quilt/add.in:129 quilt/remove.in:100 +#: quilt/add.in:111 quilt/remove.in:82 msgid "File %s modified by patch %s\\n" msgstr "" -#: quilt/add.in:137 +#: quilt/add.in:119 msgid "Cannot add symbolic link %s\\n" msgstr "" -#: quilt/add.in:144 +#: quilt/add.in:126 msgid "Failed to back up file %s\\n" msgstr "" -#: quilt/add.in:155 +#: quilt/add.in:137 msgid "File %s added to patch %s\\n" msgstr "" @@ -112,10 +92,6 @@ msgid "" "specified patch in the file series.\n" msgstr "" -#: quilt/applied.in:67 -msgid "Patch is not applied\\n" -msgstr "" - #: quilt/delete.in:22 msgid "Usage: quilt delete [-r] [--backup] [patch|-n]\\n" msgstr "" @@ -137,27 +113,27 @@ msgid "" "\tIgnored if not used with \\\"-r\\\".\n" msgstr "" -#: quilt/delete.in:100 +#: quilt/delete.in:86 msgid "No next patch\\n" msgstr "" -#: quilt/delete.in:118 +#: quilt/delete.in:94 msgid "Patch %s is currently applied\\n" msgstr "" -#: quilt/delete.in:125 +#: quilt/delete.in:102 msgid "Removed patch %s\\n" msgstr "" -#: quilt/delete.in:127 +#: quilt/delete.in:104 msgid "Failed to remove patch %s\\n" msgstr "" -#: quilt/delete.in:138 +#: quilt/delete.in:115 msgid "Failed to backup patch file \\\"%s\\\"\\n" msgstr "" -#: quilt/delete.in:145 +#: quilt/delete.in:122 msgid "Failed to remove patch file \\\"%s\\\"\\n" msgstr "" @@ -215,36 +191,36 @@ msgid "" "--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" -#: quilt/diff.in:232 +#: quilt/diff.in:224 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -#: quilt/diff.in:259 +#: quilt/diff.in:236 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: quilt/diff.in:294 quilt/files.in:121 +#: quilt/diff.in:271 quilt/files.in:105 msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: quilt/diff.in:344 quilt/pop.in:101 +#: quilt/diff.in:321 quilt/pop.in:101 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: quilt/diff.in:368 quilt/pop.in:125 +#: quilt/diff.in:345 quilt/pop.in:125 msgid "Failed to patch temporary files\\n" msgstr "" -#: quilt/diff.in:387 +#: quilt/diff.in:364 msgid "File %s is not being modified\\n" msgstr "" -#: quilt/diff.in:407 quilt/refresh.in:201 +#: quilt/diff.in:384 quilt/refresh.in:177 msgid "Diff failed, aborting\\n" msgstr "" -#: quilt/diff.in:414 +#: quilt/diff.in:391 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "" @@ -281,10 +257,6 @@ msgid "" "\n" msgstr "" -#: quilt/files.in:76 quilt/files.in:95 -msgid "Patch %s is not in series file\\n" -msgstr "" - #: quilt/fold.in:22 msgid "Usage: quilt fold [-p strip-level]\\n" msgstr "" @@ -302,7 +274,7 @@ msgid "" "\twhen applying patchfile.\n" msgstr "" -#: quilt/fold.in:117 +#: quilt/fold.in:112 msgid "File %s may be corrupted\\n" msgstr "" @@ -326,15 +298,15 @@ msgid "" "patch-2.diff, patch-3.diff).\n" msgstr "" -#: quilt/fork.in:99 +#: quilt/fork.in:94 msgid "Patch %s exists already, please choose a new name\\n" msgstr "" -#: quilt/fork.in:111 +#: quilt/fork.in:106 msgid "Fork of patch %s to patch %s failed\\n" msgstr "" -#: quilt/fork.in:117 +#: quilt/fork.in:112 msgid "Fork of patch %s created as %s\\n" msgstr "" @@ -417,11 +389,11 @@ msgid "" "\tCreate a backup copy of the old version of a patch as patch~.\n" msgstr "" -#: quilt/header.in:192 +#: quilt/header.in:176 msgid "Replaced header of patch %s\\n" msgstr "" -#: quilt/header.in:195 +#: quilt/header.in:179 msgid "Appended text to header of patch %s\\n" msgstr "" @@ -597,15 +569,19 @@ msgstr "" msgid "Removing patch %s\\n" msgstr "" -#: quilt/pop.in:256 +#: quilt/pop.in:243 msgid "Patch %s needs to be refreshed first.\\n" msgstr "" -#: quilt/pop.in:266 +#: quilt/pop.in:253 msgid "No patch removed\\n" msgstr "" -#: quilt/pop.in:289 quilt/push.in:372 +#: quilt/pop.in:269 quilt/scripts/patchfns.in:455 +msgid "No patches applied\\n" +msgstr "" + +#: quilt/pop.in:276 quilt/push.in:340 msgid "Now at patch %s\\n" msgstr "" @@ -681,22 +657,10 @@ msgstr "" msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "" -#: quilt/push.in:241 -msgid "Patch %s not found in file series\\n" -msgstr "" - -#: quilt/push.in:329 -msgid "Patch %s is already applied\\n" -msgstr "" - -#: quilt/push.in:338 +#: quilt/push.in:320 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "" -#: quilt/push.in:352 -msgid "File series fully applied, ends at patch %s\\n" -msgstr "" - #: quilt/refresh.in:22 msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] " @@ -746,29 +710,29 @@ msgid "" "\tStrip trailing whitespace at the end of lines.\n" msgstr "" -#: quilt/refresh.in:173 +#: quilt/refresh.in:149 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: quilt/refresh.in:207 +#: quilt/refresh.in:183 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" -#: quilt/refresh.in:213 +#: quilt/refresh.in:189 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" -#: quilt/refresh.in:219 +#: quilt/refresh.in:195 msgid "Nothing in patch %s\\n" msgstr "" -#: quilt/refresh.in:295 +#: quilt/refresh.in:271 msgid "Patch %s is unchanged\\n" msgstr "" -#: quilt/refresh.in:300 +#: quilt/refresh.in:276 msgid "Refreshed patch %s\\n" msgstr "" @@ -786,15 +750,15 @@ msgid "" "\tPatch to remove files from.\n" msgstr "" -#: quilt/remove.in:91 +#: quilt/remove.in:73 msgid "File %s is not in patch %s\\n" msgstr "" -#: quilt/remove.in:109 +#: quilt/remove.in:91 msgid "Failed to remove file %s from patch %s\\n" msgstr "" -#: quilt/remove.in:123 +#: quilt/remove.in:105 msgid "File %s removed from patch %s\\n" msgstr "" @@ -811,15 +775,15 @@ msgid "" "\tPatch to rename.\n" msgstr "" -#: quilt/rename.in:96 +#: quilt/rename.in:84 msgid "Patch %s exists already, please choose a different name\\n" msgstr "" -#: quilt/rename.in:110 +#: quilt/rename.in:98 msgid "Renaming of patch %s to %s failed\\n" msgstr "" -#: quilt/rename.in:116 +#: quilt/rename.in:104 msgid "Patch %s renamed to %s\\n" msgstr "" @@ -858,7 +822,27 @@ msgstr "" msgid "Failed to rename %s to %s: %s\n" msgstr "" -#: quilt/scripts/patchfns.in:693 +#: quilt/scripts/patchfns.in:442 +msgid "No patches in series\\n" +msgstr "" + +#: quilt/scripts/patchfns.in:491 +msgid "Patch %s is not in series\\n" +msgstr "" + +#: quilt/scripts/patchfns.in:518 +msgid "Patch %s is not applied\\n" +msgstr "" + +#: quilt/scripts/patchfns.in:539 +msgid "Patch %s is already applied\\n" +msgstr "" + +#: quilt/scripts/patchfns.in:555 +msgid "File series fully applied, ends at patch %s\\n" +msgstr "" + +#: quilt/scripts/patchfns.in:795 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -866,7 +850,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:778 +#: quilt/scripts/patchfns.in:880 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 348e15e..bee159f 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 19 18:52:30 AEDT 2006 - jayvdb@gmail.com + +- Move patch parameter checks into patchfns.in, adding quotes + around all patch parameters, and reporting 'No patches in series' +- quilt/annonate.in: Fix case where no patches have been applied. + +------------------------------------------------------------------- Mon Jan 16 23:27:27 CET 2006 - jayvdb@gmail.com - test/three.test, test/import.test: Add various tests. diff --git a/quilt/add.in b/quilt/add.in index 31a2f0e..d9a3d12 100644 --- a/quilt/add.in +++ b/quilt/add.in @@ -73,11 +73,7 @@ while true do case "$1" in -p) - if ! patch=$(find_patch $2) - then - printf $"Patch %s is not in series\n" "$2" >&2 - exit 1 - fi + opt_patch="$2" shift 2 ;; -h) usage -h ;; @@ -92,21 +88,7 @@ then usage fi -if [ -n "$patch" ] -then - if ! is_applied $patch - then - printf $"Patch %s is not applied\n" "$(print_patch $patch)" >&2 - exit 1 - fi -else - patch=$(top_patch) - if [ -z "$patch" ] - then - printf $"No patches applied\n" >&2 - exit 1 - fi -fi +patch=$(find_applied_patch "$opt_patch") || exit 1 status=0 for file in $* diff --git a/quilt/annotate.in b/quilt/annotate.in index a623561..20026c7 100644 --- a/quilt/annotate.in +++ b/quilt/annotate.in @@ -98,11 +98,7 @@ while true do case "$1" in -p) - if ! opt_patch=$(find_patch "$2") - then - printf $"Patch %s is not in series\n" "$2" >&2 - exit 1 - fi + opt_patch="$2" shift 2 ;; -h) usage -h ;; @@ -118,12 +114,7 @@ then fi opt_file="$SUBDIR$1" -if [ -n "$opt_patch" ] && ! is_applied "$opt_patch" -then - printf $"Patch %s is not applied\n" \ - "$(print_patch "$opt_patch")" >&2 - exit 1 -fi +opt_patch=$(find_applied_patch "$opt_patch") || exit 1 for patch in $(applied_patches); do old_file="$(backup_file_name "$patch" "$opt_file")" diff --git a/quilt/applied.in b/quilt/applied.in index af19bc9..7ead8da 100644 --- a/quilt/applied.in +++ b/quilt/applied.in @@ -55,22 +55,10 @@ done if [ $# -gt 1 ] then usage -elif [ $# -eq 1 ] -then - if ! patch=$(find_patch $1) - then - printf $"Patch %s is not in series\n" "$1" >&2 - exit 1 - fi - if ! is_applied "$patch" - then - printf $"Patch is not applied\n" "$(print_patch $patch)" >&2 - exit 1 - fi -else - patch=$(top_patch) fi +patch=$(find_applied_patch "$1") || exit 1 + for patch in $(applied_before "$patch") $patch do echo "$(print_patch $patch)" diff --git a/quilt/delete.in b/quilt/delete.in index 363a104..b4b8d5c 100644 --- a/quilt/delete.in +++ b/quilt/delete.in @@ -77,40 +77,16 @@ then usage fi -patch="$1" -if [ -z "$patch" ] +patch=$(find_patch_in_series "$1") || exit 1 + +if [ -n "$opt_next" ] then - patch="$(top_patch)" - if [ -z "$opt_next" ] + if ! patch="$(patch_after "$patch")" then - 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 - if ! patch=$(find_patch $patch) - then - patch=$save_patch - printf $"Patch %s is not in series\n" "$patch" >&2 + printf $"No next patch\n" >&2 exit 1 fi -fi -if is_applied $patch +elif is_applied "$patch" then if [ "$patch" != "$(top_patch)" ] || \ ! quilt_command pop -fq @@ -120,6 +96,7 @@ then exit 1 fi fi + if remove_from_series "$patch" then printf $"Removed patch %s\n" "$(print_patch "$patch")" diff --git a/quilt/diff.in b/quilt/diff.in index 21afe05..2cdd1a7 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -155,23 +155,15 @@ do opt_strip_level=$2 shift 2 ;; -P) - if ! last_patch=$(find_patch $2) - then - printf $"Patch %s is not in series\n" \ - "$(print_patch $2)" >&2 - exit 1 - fi + last_patch="$2" shift 2 ;; --combine) opt_combine=1 if [ "$2" = - ] then first_patch=- - elif ! first_patch=$(find_patch $2) - then - printf $"Patch %s is not in series\n" \ - "$(print_patch $2)" >&2 - exit 1 + else + first_patch=$(find_applied_patch "$2") || exit 1 fi shift 2 ;; -R) @@ -233,22 +225,7 @@ then die 1 fi -if [ -n "$last_patch" ] -then - if ! is_applied "$last_patch" - then - printf $"Patch %s is not applied\n" \ - "$(print_patch $last_patch)" >&2 - die 1 - fi -else - last_patch=$(top_patch) - if [ -z "$last_patch" ] - then - printf $"No patches applied\n" >&2 - die 1 - fi -fi +last_patch=$(find_applied_patch "$last_patch") || exit 1 if [ -z "$opt_strip_level" ] then diff --git a/quilt/files.in b/quilt/files.in index 5ad9e08..a5cc9b6 100644 --- a/quilt/files.in +++ b/quilt/files.in @@ -71,10 +71,8 @@ do if [ "$2" = - ] then : - elif ! first_patch=$(find_patch $2) - then - printf $"Patch %s is not in series file\n" "$2" >&2 - exit 1 + else + first_patch=$(find_patch_in_series "$2") || exit 1 fi shift 2 ;; --) @@ -88,21 +86,7 @@ then usage fi -if [ -n "$1" ] -then - if ! last_patch=$(find_patch $1) - then - printf $"Patch %s is not in series file\n" "$1" >&2 - exit 1 - fi -else - last_patch=$(top_patch) - if [ -z "$last_patch" ] - then - printf $"No patches applied\n" >&2 - exit 1 - fi -fi +last_patch=$(find_patch_in_series "$1") || exit 1 if [ -n "$opt_all" -a -z "$first_patch" ] then diff --git a/quilt/fold.in b/quilt/fold.in index 1204fff..248cfeb 100644 --- a/quilt/fold.in +++ b/quilt/fold.in @@ -73,12 +73,7 @@ fi : ${opt_strip_level:=1} [ -n "$opt_silent" ] && silent=-s -top=$(top_patch) -if [ -z "$top" ] -then - printf $"No patches applied\n" >&2 - exit 1 -fi +top=$(find_top_patch) || exit 1 trap "failed=1" SIGINT diff --git a/quilt/fork.in b/quilt/fork.in index 970d870..e725e2b 100644 --- a/quilt/fork.in +++ b/quilt/fork.in @@ -66,12 +66,7 @@ then usage fi -top_patch=$(top_patch) -if [ -z "$top_patch" ] -then - printf $"No patches applied\n" >&2 - exit 1 -fi +top_patch=$(find_top_patch) || exit 1 if [ $# -eq 1 ] then diff --git a/quilt/graph.in b/quilt/graph.in index 90314ee..675258f 100644 --- a/quilt/graph.in +++ b/quilt/graph.in @@ -109,28 +109,9 @@ then usage fi -if [ $# -eq 1 ] +if [ -z "$opt_all" ] then - if ! patch=$(find_patch $1) - then - printf $"Patch %s is not in series\n" "$1" >&2 - exit 1 - fi - if ! is_applied $patch - then - printf $"Patch %s is not applied\n" "$(print_patch $patch)" >&2 - exit 1 - fi -fi - -if [ -z "$opt_all" -a -z "$patch" ] -then - patch=$(top_patch) - if [ -z "$patch" ] - then - printf $"No patches applied\n" >&2 - exit 1 - fi + patch=$(find_applied_patch "$1") || exit 1 fi options= diff --git a/quilt/header.in b/quilt/header.in index e327938..5cb77e7 100644 --- a/quilt/header.in +++ b/quilt/header.in @@ -126,23 +126,7 @@ then usage fi -[ $# -eq 1 ] && opt_patch=$1 - -if [ -n "$opt_patch" ] -then - if ! patch=$(find_patch "$opt_patch") - then - printf $"Patch %s is not in series\n" "$opt_patch" >&2 - exit 1 - fi -else - patch=$(top_patch) - if [ -z "$patch" ] - then - printf $"No patches applied\n" >&2 - exit 1 - fi -fi +patch=$(find_patch_in_series "$1") || exit 1 patch_file=$(patch_file_name $patch) diff --git a/quilt/next.in b/quilt/next.in index 01ed4b4..9d1a40e 100644 --- a/quilt/next.in +++ b/quilt/next.in @@ -55,23 +55,10 @@ done if [ $# -gt 1 ] then usage -elif [ $# -eq 1 ] -then - if ! patch=$(find_patch $1) - then - printf $"Patch %s is not in series\n" "$1" >&2 - exit 1 - fi -else - patch=$(top_patch) fi -if [ -z "$patch" ] -then - next=$(cat_series | head -n 1) -else - next=$(patches_after $patch | head -n 1) -fi +next=$(find_unapplied_patch "$1") || exit + if [ -n "$next" ] then echo "$(print_patch $next)" diff --git a/quilt/pop.in b/quilt/pop.in index 76bf93c..b6d72ac 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -228,11 +228,7 @@ then then number=$1 else - if ! stop_at_patch=$(find_patch $1) - then - printf $"Patch %s is not in series\n" "$1" >&2 - exit 1 - fi + stop_at_patch=$(find_applied_patch "$1") || exit 1 fi else [ -n "$opt_all" ] || number=1 @@ -241,15 +237,6 @@ fi [ -n "$opt_quiet" ] && silent=-s [ -z "$opt_verbose" ] && silent_unless_verbose=-s -if [ -n "$stop_at_patch" ] -then - if ! is_applied $stop_at_patch - then - printf $"Patch %s is not applied\n" "$(print_patch $stop_at_patch)" >&2 - exit 1 - fi -fi - top=$(top_patch) if [ -n "$top" -a -e $QUILT_PC/$top~refresh -a -z "$opt_force" ] then diff --git a/quilt/previous.in b/quilt/previous.in index ba4e09f..e46b0b0 100644 --- a/quilt/previous.in +++ b/quilt/previous.in @@ -55,17 +55,10 @@ done if [ $# -gt 1 ] then usage -elif [ $# -eq 1 ] -then - if ! patch=$(find_patch $1) - then - printf $"Patch %s is not in series\n" "$1" >&2 - exit 1 - fi -else - patch=$(top_patch) fi +patch=$(find_patch_in_series "$1") || exit 1 + previous=$(applied_before "$patch" | tail -n 1) if [ -n "$previous" ] then diff --git a/quilt/push.in b/quilt/push.in index 4c5e68d..0a349c7 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -230,18 +230,12 @@ list_patches() fi n=$[$n+1] fi - echo $patch - if [ $patch = "$stop_at_patch" ] + echo "$patch" + if [ -z "$number" -a "$patch" = "$stop_at_patch" ] then break fi done - if [ -n "$stop_at_patch" -a "$patch" != "$stop_at_patch" ] - then - printf $"Patch %s not found in file series\n" \ - "$stop_at_patch" >&2 - return 1 - fi fi } @@ -307,31 +301,19 @@ then then number=$1 else - if ! stop_at_patch=$(find_patch $1) - then - printf $"Patch %s is not in series\n" "$1" >&2 - exit 1 - fi + stop_at_patch="$1" fi else [ -z "$opt_all" ] && number=1 fi +stop_at_patch=$(find_unapplied_patch "$stop_at_patch") || exit 1 + [ -n "$opt_quiet" ] && silent=-s [ -z "$opt_verbose" ] && silent_unless_verbose=-s [ -z "$opt_interactive" ] && force_apply=-f [ -n "$opt_force" ] && opt_leave_rejects=1 -if [ -n "$stop_at_patch" ] -then - if is_applied $stop_at_patch - then - printf $"Patch %s is already applied\n" \ - "$(print_patch $stop_at_patch)" >&2 - exit 1 - fi -fi - top=$(top_patch) if [ -n "$top" -a -e $QUILT_PC/$top~refresh ] then @@ -340,21 +322,7 @@ then exit 1 fi -if ! patches=$(list_patches) 2>&1 -then - exit 1 -elif [ -z "$patches" ] -then - if [ -z "$top" ] - then - printf $"No patches applied\n" >&2 - else - printf $"File series fully applied, ends at patch %s\n" \ - "$(print_patch $top)" >&2 - fi - exit 2 -fi - +patches=$(list_patches) create_db for patch in $patches do diff --git a/quilt/refresh.in b/quilt/refresh.in index 245bf47..f6af0db 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -131,38 +131,14 @@ do esac done -if [ $# -eq 1 ] -then - opt_patch=$1 -elif [ $# -gt 1 ] +if [ $# -gt 1 ] then usage fi QUILT_DIFF_OPTS="$QUILT_DIFF_OPTS $opt_format" -if [ -n "$opt_patch" ] -then - if ! patch=$(find_patch $opt_patch) - then - printf $"Patch %s is not in series\n" \ - "$(print_patch $opt_patch)" >&2 - exit 1 - fi - if ! is_applied "$patch" - then - printf $"Patch %s is not applied\n" \ - "$(print_patch $patch)" >&2 - exit 1 - fi -else - patch=$(top_patch) - if [ -z "$patch" ] - then - printf $"No patches applied\n" >&2 - exit 1 - fi -fi +patch=$(find_applied_patch "$1") || exit 1 if [ -z "$opt_strip_level" ] then diff --git a/quilt/remove.in b/quilt/remove.in index d27c842..cd9a931 100644 --- a/quilt/remove.in +++ b/quilt/remove.in @@ -48,11 +48,7 @@ while true do case "$1" in -p) - if ! patch=$(find_patch $2) - then - printf $"Patch %s is not in series\n" "$2" >&2 - exit 1 - fi + opt_patch="$2" shift 2 ;; -h) usage -h ;; @@ -67,21 +63,7 @@ then usage fi -if [ -n "$patch" ] -then - if ! is_applied $patch - then - printf $"Patch %s is not applied\n" "$(print_patch $patch)" >&2 - exit 1 - fi -else - patch=$(top_patch) - if [ -z "$patch" ] - then - printf $"No patches applied\n" >&2 - exit 1 - fi -fi +patch=$(find_applied_patch "$opt_patch") || exit 1 status=0 for file in $* diff --git a/quilt/rename.in b/quilt/rename.in index cdf8d36..61bf5b0 100644 --- a/quilt/rename.in +++ b/quilt/rename.in @@ -58,11 +58,7 @@ while true do case "$1" in -p) - if ! patch=$(find_patch $2) - then - printf $"Patch %s is not in series\n" "$2" >&2 - exit 1 - fi + opt_patch="$2" shift 2 ;; -h) usage -h ;; @@ -77,15 +73,7 @@ then usage fi -if [ ! -n "$patch" ] -then - patch=$(top_patch) - if [ -z "$patch" ] - then - printf $"No patches applied\n" >&2 - exit 1 - fi -fi +patch=$(find_patch_in_series "$opt_patch") || exit 1 new_patch=${1#$QUILT_PATCHES/} diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 12100c8..c529b47 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -197,7 +197,7 @@ patch_in_series() insert_in_series() { local patch=$1 patch_args=$2 - local next=$(patches_after "$(top_patch)" | head -n 1) tmpfile + local next=$(patch_after "$(top_patch)") tmpfile if [ -n "$patch_args" ] then @@ -378,6 +378,13 @@ patches_after() fi } +patch_after() +{ + local patch="$1" + patch=$(patches_after "$patch" | head -n 1) + [ -n "$patch" ] && echo "$patch" +} + # List all patches that have been applied on top of patch $1 patches_on_top_of() { @@ -427,12 +434,36 @@ remove_from_db() fi } +find_first_patch() +{ + local patch=$(cat_series | head -n 1) + if [ -z "$patch" ] + then + printf $"No patches in series\n" >&2 + return 1 + fi + + echo "$patch" +} + +find_top_patch() +{ + if ! top_patch + then + if find_first_patch > /dev/null + then + printf $"No patches applied\n" >&2 + fi + return 1 + fi +} + find_patch() { - set -- $* - if [ $# -eq 1 -a -n "$1" -a -e "$SERIES" ] + local name="$1" + if [ -e "$SERIES" ] then - local patch="${1#$SUBDIR_DOWN$QUILT_PATCHES/}" + local patch=${1#$SUBDIR_DOWN$QUILT_PATCHES/} local bre=$(quote_bre "$patch") set -- $(sed -e "/^$bre\(\|\.patch\|\.diff\?\)\(\|\.gz\|\.bz2\)\([ "$'\t'"]\|$\)/!d" \ -e 's/[ '$'\t''].*//' $SERIES) @@ -454,9 +485,80 @@ find_patch() done fi fi + # Finding the first patch will error when the series is empty + if [ -n "$(find_first_patch)" ] + then + printf $"Patch %s is not in series\n" "$name" >&2 + fi return 1 } +find_patch_in_series() +{ + local name="$1" + + if [ -n "$name" ] + then + find_patch "$name" + else + find_top_patch + fi +} + +find_applied_patch() +{ + local name="$1" + + if [ -n "$name" ] + then + local patch=$(find_patch "$name") || return 1 + + if ! is_applied "$patch" + then + printf $"Patch %s is not applied\n" \ + "$(print_patch $patch)" >&2 + return 1 + fi + echo "$patch" + else + find_top_patch + fi +} + +find_unapplied_patch() +{ + local name="$1" + + if [ -n "$name" ] + then + local patch + + patch=$(find_patch "$name") || return 1 + if is_applied "$patch" + then + printf $"Patch %s is already applied\n" \ + "$(print_patch $patch)" >&2 + return 1 + fi + echo "$patch" + else + local start + + if start=$(top_patch) + then + patch_after "$start" + else + find_first_patch || return 1 + fi + if [ $? -ne 0 ] + then + printf $"File series fully applied, ends at patch %s\n" \ + "$(print_patch $start)" >&2 + return 1 + fi + fi +} + file_in_patch() { local file=$1 patch=$2 @@ -714,7 +816,7 @@ setup_colors() eval $C } -quilt_command () +quilt_command() { local command=$1 shift diff --git a/quilt/top.in b/quilt/top.in index f8f5fde..d87718a 100644 --- a/quilt/top.in +++ b/quilt/top.in @@ -57,13 +57,9 @@ then usage fi -top=$(top_patch) -if [ -n "$top" ] -then - echo "$(print_patch $top)" -else - exit 2 -fi +top=$(find_top_patch) || exit 2 +echo "$(print_patch $top)" + ### Local Variables: ### mode: shell-script ### End: diff --git a/quilt/unapplied.in b/quilt/unapplied.in index 3f897cf..6d0703c 100644 --- a/quilt/unapplied.in +++ b/quilt/unapplied.in @@ -57,21 +57,18 @@ then usage elif [ $# -eq 1 ] then - if ! patch=$(find_patch $1) - then - printf $"Patch %s is not in series\n" "$1" >&2 - exit 1 - fi + start=$(find_patch_in_series "$1") || exit 1 + patch=$(patch_after "$start") + + [ -n "$start" -a -z "$patch" ] && exit else - patch=$(top_patch) + patch=$(find_unapplied_patch) || exit 1 fi -if [ -z "$patch" ] -then - cat_series -else - patches_after $patch -fi \ +( + echo "$patch" + patches_after "$patch" +) \ | while read patch do echo "$(print_patch $patch)" diff --git a/test/three.test b/test/three.test index 5047589..44daabc 100644 --- a/test/three.test +++ b/test/three.test @@ -5,20 +5,31 @@ $ touch e $ quilt annotate e + > No patches in series + $ quilt top + > No patches in series + $ quilt next + > No patches in series + $ quilt previous + > No patches in series + $ quilt unapplied + > No patches in series + $ quilt applied + > No patches in series $ quilt next patch1 - > Patch patch1 is not in series + > No patches in series $ quilt push patch1 - > Patch patch1 is not in series + > No patches in series $ quilt push - > No patches applied + > No patches in series $ quilt pop > No patch removed @@ -84,20 +95,26 @@ > No patches applied $ quilt top + > No patches applied + $ quilt pop > No patch removed $ quilt applied + > No patches applied + $ quilt unapplied > patches/patch1.diff > patches/patch2.diff $ quilt previous + > No patches applied + $ quilt next > patches/patch1.diff $ quilt applied patch1 - > Patch is not applied + > Patch patches/patch1.diff is not applied $ quilt unapplied patch2 $ quilt unapplied patch1 @@ -139,7 +156,7 @@ $ echo patch3.diff >> %{P}/series $ quilt diff -P patch1 --combine patch3 - > Patch patches/patch3.diff not applied before patch patches/patch1.diff + > Patch patches/patch3.diff is not applied $ quilt pop -qaR > Removing patch %{P}patch2.diff @@ -147,7 +164,7 @@ > No patches applied $ quilt annotate f - > sed: can't read f: No such file or directory + > No patches applied $ cd .. $ rm -rf d |