diff options
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | po/de.po | 261 | ||||
| -rw-r--r-- | po/fr.po | 81 | ||||
| -rw-r--r-- | po/quilt.pot | 79 | ||||
| -rw-r--r-- | quilt.changes | 13 | ||||
| -rw-r--r-- | quilt/diff.in | 42 | ||||
| -rw-r--r-- | quilt/refresh.in | 19 | ||||
| -rw-r--r-- | scripts/patchfns.in | 22 | ||||
| -rw-r--r-- | test/formats.test | 96 | ||||
| -rw-r--r-- | test/merge.test | 6 |
10 files changed, 401 insertions, 219 deletions
diff --git a/Makefile.in b/Makefile.in index d5838b9..d902f39 100644 --- a/Makefile.in +++ b/Makefile.in @@ -220,6 +220,7 @@ $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile \ -e 's:@RELEASE''@:$(RELEASE):g' \ -e 's:@RPMBUILD''@:$(RPMBUILD):g' \ -e 's:@DIFFSTAT''@:$(DIFFSTAT):g' \ + -e 's:@LOCALEDIR''@:$(localedir):g' \ $< > $@ @chmod --reference=$< $@ @@ -8,7 +8,7 @@ msgstr "" "PO-Revision-Date: 2003-11-24 17:00 +0200\n" "Last-Translator: Andreas Gruenbacher <agruen@suse.de>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../bin/quilt.in:19 @@ -32,14 +32,14 @@ msgid "" "\tSee pdf documentation for details about its possible content." msgstr "" "\n" -"Gemeinsame Optionen für alle Befehle:\n" +"Gemeinsame Optionen für alle Befehle:\n" "\n" "--trace\n" -"\tFührt die Kommandos im bash Trace-Modus (-x) aus. Für Debugging.\n" +"\tFührt die Kommandos im bash Trace-Modus (-x) aus. Für Debugging.\n" "\n" "--quiltrc datei\n" "\tVerwende die angegebene Konfigrationsdatei statt ~/.quiltrc.\n" -"\tSiehe die pdf-Dokumentation für mögliche Einstellungen." +"\tSiehe die pdf-Dokumentation für mögliche Einstellungen." #: ../quilt/add.in:22 msgid "Usage: quilt add [-p patch] {file} ..." @@ -57,28 +57,28 @@ msgid "" msgstr "" "\n" "\n" -"Fügt eine oder mehrere Dateien zum obersten oder angegebenen Patch\n" -"hinzu. Dateien müssen einem Patch hinzugefügt werden, bevor sie\n" -"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" +"Fügt eine oder mehrere Dateien zum obersten oder angegebenen Patch\n" +"hinzu. Dateien müssen einem Patch hinzugefügt werden, bevor sie\n" +"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" -"\tDer Patch, zu dem die Dateien hinzugefügt werden sollen." +"\tDer Patch, zu dem die Dateien hinzugefügt werden sollen." -#: ../quilt/add.in:54 ../quilt/diff.in:139 ../quilt/diff.in:150 +#: ../quilt/add.in:54 ../quilt/diff.in:147 ../quilt/diff.in:158 #: ../quilt/remove.in:52 msgid "Patch $2 is not in series" msgstr "Patch $2 ist in der series-Datei nicht enthalten" -#: ../quilt/add.in:75 ../quilt/applied.in:72 ../quilt/refresh.in:112 +#: ../quilt/add.in:75 ../quilt/applied.in:72 ../quilt/refresh.in:125 #: ../quilt/remove.in:73 msgid "Patch $patch is not applied" msgstr "Patch $patch ist nicht angewandt" -#: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:211 +#: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:227 #: ../quilt/files.in:75 ../quilt/fold.in:78 ../quilt/fork.in:64 #: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:215 -#: ../quilt/refresh.in:119 ../quilt/remove.in:80 +#: ../quilt/refresh.in:132 ../quilt/remove.in:80 msgid "No patches applied" msgstr "Keine Patches angewandt" @@ -88,7 +88,7 @@ msgstr "Datei $SUBDIR$file ist bereits in Patch $patch enthalten" #: ../quilt/add.in:99 ../quilt/remove.in:98 msgid "File $SUBDIR$file modified by patch $next_patch" -msgstr "Datei $SUBDIR$file wird von Patch $next_patch verändert" +msgstr "Datei $SUBDIR$file wird von Patch $next_patch verändert" #: ../quilt/add.in:106 msgid "Failed to back up file $SUBDIR$file" @@ -96,7 +96,7 @@ msgstr "Konnte Datei $SUBDIR$file nicht sichern" #: ../quilt/add.in:117 msgid "File $SUBDIR$file added to patch $patch" -msgstr "Datei $SUBDIR$file zu Patch $patch hinzugefügt" +msgstr "Datei $SUBDIR$file zu Patch $patch hinzugefügt" #: ../quilt/applied.in:22 msgid "Usage: quilt applied [-n] [patch]" @@ -134,7 +134,7 @@ msgid "" "topmost patch can be removed right now.)" msgstr "" "\n" -"Löscht den obersten oder angegebenen Patch aus der series-Datei. Falls\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.)" @@ -167,20 +167,28 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n" "\n" +"-u, -U num, -c, -C num\n" +"\tCreate a unified diff (-u, -U) with num lines of context. Create\n" +"\ta context diff (-c, -C) with num lines of context. The number of\n" +"\tcontext lines defaults to 3.\n" +"\n" +"--no-timestamps\n" +"\tDo not include file timestamps in patch headers.\n" +"\n" +"-z\tWrite to standard output the changes that have been made\n" +"\trelative to the topmost or specified patch.\n" +"\n" +"-R\tCreate a reverse diff.\n" +"\n" "-P patch\n" "\tCreate a diff for the specified patch. (Defaults to the topmost\n" "\tpatch.)\n" "\n" -"-c patch\n" +"--combine patch\n" "\tCreate a combined diff for all patches between this patch and\n" "\tthe patch specified with -P. A patch name of \\\"-\\\" is equivalent\n" "\tto specifying the first applied patch.\n" "\n" -"-R\tCreate a reverse diff.\n" -"\n" -"-z\tWrite to standard output the changes that have been made\n" -"\trelative to the topmost or specified patch.\n" -"\n" "--snapshot\n" "\tDiff agains snapshot (see \\`quilt snapshot -h').\n" "\n" @@ -188,9 +196,6 @@ msgid "" "\tUse the specified utility for generating the diff. The utility\n" "\tis invoked with the original and new file name as arguments.\n" "\n" -"--no-timestamps\n" -"\tDo not include file timestamps in patch headers.\n" -"\t\n" "--color[=always|auto|never]\n" "\tUse syntax coloring." msgstr "" @@ -199,86 +204,91 @@ msgstr "" "Patch. Wenn keine Dateien angegeben sind, werden alle im Patch\n" "enthaltenen Dateien einbezogen.\n" "\n" -"-p n\tErzeugt einen -p n Patch (n=0 oder n=1 wird unterstützt).\n" +"-p n\tErzeuge einen -p n Patch (n=0 oder n=1 wird unterstützt).\n" +"\n" +"-u, -U anzahl, -c, -C anzahl\n" +"\tErzeuge ein Unified Diff (-u, -U) mit anzahl Kontextzeilen. Erzeuge\n" +"\tein Context Diff (-c, -C) mit anzahl Kontextzeilen. Die Anzahl der\n" +"\tKontextzeilen ist 3, wenn nicht anders angegeben.\n" +"\n" +"--no-timestamps\n" +"\tKeine Zeitstempel in Patches angeben.\n" +"\n" +"-z\tÄnderungen relativ zum angewandten Patch ausgeben.\n" "\n" "-P patch\n" -"\tErzeuge ein Diff für den angegebenen Patch. (Wenn nicht angegeben,\n" +"\tErzeuge ein Diff für den angegebenen Patch. (Wenn nicht angegeben,\n" "\toberster Patch.)\n" "\n" -"-c patch\n" -"\tErzeuge ein kombiniertes Diff für alle Patches zwischen diesem und\n" +"--combine patch\n" +"\tErzeuge ein kombiniertes Diff für alle Patches zwischen diesem und\n" "\tdem mit -P angegebenen Patch.\n" "\n" "-R\tErzeuge ein umgekehrtes Diff.\n" "\n" -"-z\tÄnderungen relativ zum angewandten Patch ausgeben.\n" -"\n" "--snapshot\n" -"\tErzeugt einen Patch gegen den Snapshot (siehe \\`quilt snapshot -h').\n" +"\tErzeuge einen Patch gegen den Snapshot (siehe \\`quilt snapshot -h').\n" "\n" "--diff=programm\n" -"\tVerwendet das angegebene Programm, um den Patch zu generieren. Das " -"Programm wird mit dem Dateinamen der ursprünglichen und der neuenDatei " -"aufgerufen.\n" -"\n" -"--no-timestamps\n" -"\tKeine Zeitstempel in Patches angeben.\n" +"\tVerwendet das angegebene Programm, um den Patch zu generieren. Das\n" +"\tProgramm wird mit dem Dateinamen der ursprünglichen und der\n" +"\tneuen Datei aufgerufen.\n" "\n" "--color[=always|auto|never]\n" -"\tSyntaxeinfärbung verwenden (immer, nur für Terminals, nie)." +"\tSyntaxeinfärbung verwenden (immer, nur für Terminals, nie)." -#: ../quilt/diff.in:196 +#: ../quilt/diff.in:212 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined." msgstr "" -"Die Optionen \\`-c patch', \\`--snapshot', und \\`-z' können nicht " +"Die Optionen \\`-c patch', \\`--snapshot', und \\`-z' können nicht " "kombiniert werden." -#: ../quilt/diff.in:204 +#: ../quilt/diff.in:220 msgid "Patch $last_patch is not applied" msgstr "Patch $last_patch ist nicht angewandt" -#: ../quilt/diff.in:222 +#: ../quilt/diff.in:238 msgid "" "Cannot diff patches with -p$opt_strip_level, please specify -p0 or -p1 " "instead" msgstr "" "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden." -#: ../quilt/diff.in:256 +#: ../quilt/diff.in:272 msgid "Patch $first_patch not applied before $last_patch." msgstr "Patch $first_patch ist nicht vor Patch $last_patch angewandt." -#: ../quilt/diff.in:290 +#: ../quilt/diff.in:306 msgid "Cannot change into $QUILT_PC/$last_patch" msgstr "Kann nicht in Verzeichnis $QUILT_PC/$last_patch wechseln." -#: ../quilt/diff.in:296 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:312 ../scripts/rpatch.in:62 msgid "Failed to copy files to temporary directory" -msgstr "Konnte Dateien nicht in ein temporäres Verzeichnis kopieren" +msgstr "Konnte Dateien nicht in ein temporäres Verzeichnis kopieren" -#: ../quilt/diff.in:307 +#: ../quilt/diff.in:323 msgid "Cannot change to temporary directory" -msgstr "Kann nicht in temporäres Verzeichnis wechseln" +msgstr "Kann nicht in temporäres Verzeichnis wechseln" -#: ../quilt/diff.in:326 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:342 ../scripts/rpatch.in:85 msgid "Failed to patch temporary files" -msgstr "Konnte temporäre Dateien nicht patchen" +msgstr "Konnte temporäre Dateien nicht patchen" -#: ../quilt/diff.in:332 +#: ../quilt/diff.in:348 msgid "Cannot change to source directory" msgstr "Kann nicht in Quellverzeichnis wechseln" -#: ../quilt/diff.in:350 +#: ../quilt/diff.in:366 msgid "File $file is not being modified." -msgstr "Datei $file wird nicht verändert." +msgstr "Datei $file wird nicht verändert." -#: ../quilt/diff.in:370 ../quilt/refresh.in:151 +#: ../quilt/diff.in:386 ../quilt/refresh.in:164 msgid "Diff failed, aborting." msgstr "Diff fehlgeschlagen, Abbruch." -#: ../quilt/diff.in:377 +#: ../quilt/diff.in:393 msgid "More recent patches modify files in $last_patch." -msgstr "Später angewandte Patches verändern Dateien von $last_patch." +msgstr "Später angewandte Patches verändern Dateien von $last_patch." #: ../quilt/edit.in:13 msgid "Usage: quilt edit file ..." @@ -291,7 +301,7 @@ msgid "" "topmost patch." msgstr "" "\n" -"Füge die angegebene(n) Datei(en) demobersten Patch hinzu, und editiere\n" +"Füge die angegebene(n) Datei(en) demobersten Patch hinzu, und editiere\n" "sie dann in $EDITOR." #: ../quilt/files.in:22 @@ -309,11 +319,11 @@ msgstr "" "Gibt eine Liste der Dateien aus, die der oberste oder angegebene Patch\n" "beinhaltet.\n" "\n" -"-v\tAusführlichere, benutzerfreundliche Ausgabe." +"-v\tAusführlichere, benutzerfreundliche Ausgabe." #: ../quilt/files.in:84 msgid "Patch is not applied (no verbose output)" -msgstr "Patch ist nicht angewandt (keine ausführliche Ausgabe)" +msgstr "Patch ist nicht angewandt (keine ausführliche Ausgabe)" #: ../quilt/files.in:87 msgid "Patch is not applied" @@ -337,7 +347,7 @@ msgid "" msgstr "" "\n" "Integriert den Patch von der Standardeingabe in den obersten Patch:\n" -"Stellt zuerst sicher, dass alle Dateien, die verändert werden, im\n" +"Stellt zuerst sicher, dass alle Dateien, die verändert werden, im\n" "obersten Patch enthalten sind, und wendet dann den neuen Patch\n" "mit der angegebenen Anzahl an Strip-Ebenen an (Standardwert = 1).\n" "\n" @@ -347,7 +357,7 @@ msgstr "" #: ../quilt/fold.in:114 msgid "File $file may be corrupted" -msgstr "Datei $file ist möglicherweise defekt" +msgstr "Datei $file ist möglicherweise defekt" #: ../quilt/fork.in:22 msgid "Usage: quilt fork [new_name]" @@ -362,15 +372,15 @@ msgid "" "further incremented (e.g., patch.diff, patch-2.diff, patch-3.diff)." msgstr "" "\n" -"Spalte vom nächsten Patch eine neue Version ab. Falls neuer_name nicht\n" +"Spalte vom nächsten Patch eine neue Version ab. Falls neuer_name nicht\n" "angegeben ist, bekommt der neue Patch den selben Namen, gefolgt von \\\"-2\\" "\".\n" "Falls der Name bereits mit Bindestrich-Nummer endet, wird die Nummer\n" -"erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff)." +"erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff)." #: ../quilt/fork.in:90 msgid "Patch $new_patch exists already, please choose a new name" -msgstr "Patch $new_patch existiert bereits, bitte neuen Namen wählen" +msgstr "Patch $new_patch existiert bereits, bitte neuen Namen wählen" #: ../quilt/fork.in:101 msgid "Fork of $top_patch to $new_patch failed" @@ -408,7 +418,7 @@ msgstr "" "\tPatch-Dateiname, den Quilt verwenden soll. Diese Option kann nur beim\n" "\tImport eines einzelnen Patches angegeben werden.\n" "\n" -"-f\tÜberschreibe/aktualisiere existierende Patches." +"-f\tÃœberschreibe/aktualisiere existierende Patches." #: ../quilt/import.in:73 msgid "Option \\`-n' can only be used when importing a single patch" @@ -438,7 +448,7 @@ msgstr "Konnte Patch $patch nicht importieren" #: ../quilt/import.in:116 msgid "Failed to insert $patch in file series." -msgstr "Konnte Patch $patch nicht in die series-Datei einfügen." +msgstr "Konnte Patch $patch nicht in die series-Datei einfügen." #: ../quilt/new.in:22 msgid "Usage: quilt new {patchname}" @@ -451,7 +461,7 @@ msgid "" "topmost patch in the patch series file." msgstr "" "\n" -"Erzeuge einen neuen Patch mit dem angegebenen Dateinamen, und fügt\n" +"Erzeuge einen neuen Patch mit dem angegebenen Dateinamen, und fügt\n" "ihn nach dem obersten Patch in die series-Datei ein." #: ../quilt/new.in:63 @@ -487,7 +497,7 @@ msgid "" "-n\tPrint patch file names instead of patch names." msgstr "" "\n" -"Gibt den Namen des nächsten Patches nach dem obersten oder angegebenen\n" +"Gibt den Namen des nächsten Patches nach dem obersten oder angegebenen\n" "Patch in der series-Datei aus.\n" "\n" "-n\tPatch-Dateinamen statt Patch-Namen ausgeben." @@ -508,13 +518,13 @@ msgid "" "-v\tVerbose, more user friendly output." msgstr "" "\n" -"Gibt die Liste der Patches aus, die die angegebene Datei verändern.\n" -"(Verwendet für Patches, die nicht angewandt sind, eine Heuristik. Diese\n" +"Gibt die Liste der Patches aus, die die angegebene Datei verändern.\n" +"(Verwendet für Patches, die nicht angewandt sind, eine Heuristik. Diese\n" "Heuristik ist langsamer als die Suche in angewandten Patches.)\n" "\n" "-n\tPatch-Dateinamen statt Patch-Namen ausgeben.\n" "\n" -"-v\tAusführlichere, benutzerfreundliche Ausgabe." +"-v\tAusführlichere, benutzerfreundliche Ausgabe." #: ../quilt/pop.in:22 msgid "Usage: quilt pop [-afRqv] [num|patch]" @@ -544,16 +554,16 @@ msgstr "" "\n" "Entfernt Patches vom Stapel. Es kann eine Anzahl von Patches, die\n" "entfernt werden soll, oder der Name eines Patches angegeben werden.\n" -"Wenn ein Name angegeben wird, werden alle Patches über dem angegebenen\n" +"Wenn ein Name angegeben wird, werden alle Patches über dem angegebenen\n" "Patch entfernt. Wenn weder ein Patchname noch eine Nummer angegeben\n" "wird, wird der oberste Patch entfernt.\n" "\n" "-a\tAlle angewandten Patches entfernen.\n" "\n" "-f\tErzwungenes Entfernen. Der Zustand vor dem Anwenden das Patches wird\n" -"\tüber die Sicherungsdateien wiederhergestellt.\n" +"\tüber die Sicherungsdateien wiederhergestellt.\n" "\n" -"-R\tEntfernen über \\`patch -R'. Überprüft auch, ob der\n" +"-R\tEntfernen über \\`patch -R'. Ãœberprüft auch, ob der\n" "\tAusgangszustand vor dem Anwenden des Patches wieder erreicht wird.\n" "\n" "-q\tWenige Meldungen ausgeben.\n" @@ -628,9 +638,9 @@ msgstr "" "\n" "Patches in der series-Datei anwenden. Es kann eine Anzahl von Patches,\n" "die angewandt werden soll, oder der Name eines Patches angegeben werden.\n" -"Wenn ein Name angegeben wird, werden alle Patches bis einschließlich zum\n" +"Wenn ein Name angegeben wird, werden alle Patches bis einschließlich zum\n" "angegebenen Patch angewandt. Wenn weder ein Patchname noch eine Nummer\n" -"angegeben wird, wird der nächste Patch angewandt.\n" +"angegeben wird, wird der nächste Patch angewandt.\n" "\n" "-a\tAlle folgenden Patches anwenden.\n" "\n" @@ -646,7 +656,7 @@ msgstr "" "\n" "--interactive\n" "\tErlaubt GNU patch, interaktiv Fragen zu stellen. Wenn diese Option\n" -"\tnicht angegeben wird, wird die Option -f an GNU patch übergeben." +"\tnicht angegeben wird, wird die Option -f an GNU patch übergeben." #: ../quilt/push.in:86 msgid "Patch $stop_at_patch not found in file series" @@ -663,16 +673,17 @@ msgid "" "Please pop -f the top patch and check your series file." msgstr "" "Der oberste Patch $top ist nicht mehr in der series-Datei;\n" -"kann den nächsten Patch nicht ermitteln. Bitte entfernen Sie\n" -"mit pop -f den obersten Patch, und überprüfen Sie die series-Datei." +"kann den nächsten Patch nicht ermitteln. Bitte entfernen Sie\n" +"mit pop -f den obersten Patch, und überprüfen Sie die series-Datei." #: ../quilt/push.in:190 msgid "File series fully applied, ends at patch $top" -msgstr "series-Datei vollständig angewandt, endet in Patch $top" +msgstr "series-Datei vollständig angewandt, endet in Patch $top" #: ../quilt/refresh.in:22 msgid "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--backup] [patch]" -msgstr "Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--backup] [patch]" +msgstr "" +"Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--backup] [patch]" #: ../quilt/refresh.in:26 msgid "" @@ -691,12 +702,16 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n" "\n" -"-f\tForce refresh, even if more recent patches modify\n" -"\tsome of the same files.\n" +"-u, -U num, -c, -C num\n" +"\tCreate a unified diff (-u, -U) with num lines of context. Create\n" +"\ta context diff (-c, -C) with num lines of context. The number of\n" +"\tcontext lines defaults to 3.\n" "\n" "--no-timestamps\n" "\tDo not include file timestamps in patch headers.\n" "\t\n" +"-f\tEnforce refreshing of a patch that is not on top.\n" +"\n" "--backup\n" "\tCreate a backup copy of the old version of a patch as patch~." msgstr "" @@ -705,31 +720,37 @@ msgstr "" "Patch-Datei, die vor dem eigentlichen Patch steht, bleibt dabei\n" "erhalten.\n" "\n" -"Es können beliebige angewandte Patches aufgefrischt werden. Wenn\n" +"Es können beliebige angewandte Patches aufgefrischt werden. Wenn\n" "Patches, die nach dem angegebenen Patch angewandt sind, dieselben\n" -"Dateien verändern, die auch dieser Patch verändert, bricht dieses Script\n" +"Dateien verändern, die auch dieser Patch verändert, bricht dieses Script\n" "normalerweise ab. Mit der Option -f kann das Auffrischen trotzdem\n" -"erzwungen werden. Dann wird für jede Datei, die später noch verändert\n" -"wurde, eine Warnung ausgegeben, und nur Änderungen in Dateien, die\n" -"danach nicht von anderen Patches weiter verändert werden, werden beim\n" -"Auffrischen berücksichtigt.\n" +"erzwungen werden. Dann wird für jede Datei, die später noch verändert\n" +"wurde, eine Warnung ausgegeben, und nur Änderungen in Dateien, die\n" +"danach nicht von anderen Patches weiter verändert werden, werden beim\n" +"Auffrischen berücksichtigt.\n" "\n" -"-p n\tErzeugt einen -p n Patch (n=0 oder n=1 werden unterstützt).\n" +"-p n\tErzeuge einen -p n Patch (n=0 oder n=1 werden unterstützt).\n" +"\n" +"-u, -U anzahl, -c, -C anzahl\n" +"\tErzeuge ein Unified Diff (-u, -U) mit anzahl Kontextzeilen. Erzeuge\n" +"\tein Context Diff (-c, -C) mit anzahl Kontextzeilen. Die Anzahl der\n" +"\tKontextzeilen ist 3, wenn nicht anders angegeben.\n" +"\n" +"-f\tErzwinge das Auffrischen eines Patches, der sich nicht an oberster\n" +"\tPosition befindet.\n" "\n" -"-f\tAuffrischen erzwingen, selbst wenn Patches über dem angegebenen Patch\n" -"\teinige der selben Dateien verändern.\n" "--no-timestamps\n" "\tKeine Zeitstempel in Patches angeben (wie QUILT_DIFF_NO_TIMESTAMPS in~/." -"quiltrc)." -"\t\n" +"quiltrc).\n" +"\n" "--backup\n" "\tErzeuge ein Backup der alten Version von patch als patch~." -#: ../quilt/refresh.in:107 +#: ../quilt/refresh.in:120 msgid "Patch $opt_patch is not in series" msgstr "Patch $opt_patch in series-Datei nicht gefunden" -#: ../quilt/refresh.in:130 +#: ../quilt/refresh.in:143 msgid "" "Cannot refresh patches with -p$opt_strip_level, please specify -p0 or -p1 " "instead" @@ -737,21 +758,21 @@ msgstr "" "Kann Patches mit Level -p$opt_strip_level nicht auffrischen, bitte -p0 oder -" "p1 angeben" -#: ../quilt/refresh.in:157 +#: ../quilt/refresh.in:170 msgid "More recent patches modify files in $patch. Enforce refresh with -f." msgstr "" -"Später angewandte Patches verändern Dateien von $patch. Auffrischen mit -f " +"Später angewandte Patches verändern Dateien von $patch. Auffrischen mit -f " "erzwingen." -#: ../quilt/refresh.in:164 +#: ../quilt/refresh.in:177 msgid "Nothing in patch $patch" msgstr "Patch $patch is leer" -#: ../quilt/refresh.in:189 +#: ../quilt/refresh.in:202 msgid "Patch $patch is unchanged" -msgstr "Patch $patch ist unverändert." +msgstr "Patch $patch ist unverändert." -#: ../quilt/refresh.in:203 +#: ../quilt/refresh.in:216 msgid "Refreshed patch $patch" msgstr "Patch $patch aufgefrischt." @@ -770,7 +791,7 @@ msgid "" 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" +"durch Patches über dem angegebenen Patch verändert werden, können nicht\n" "entfernt werden.\n" "\n" "-p patch\n" @@ -806,7 +827,7 @@ msgstr "" "\n" "-n\tPatch-Dateinamen statt Patch-Namen ausgeben.\n" "\n" -"-v\tAusführlichere, benutzerfreundliche Ausgabe." +"-v\tAusführlichere, benutzerfreundliche Ausgabe." #: ../quilt/setup.in:27 msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}" @@ -826,9 +847,9 @@ msgstr "" "Initialisiere einen Quellbaum aus einer rpm spec-Datei oder einer quilt " "series-Datei.\n" "\n" -"-d\tOptionaler Pfad-Präfix (Unterverzeichnis).\n" +"-d\tOptionaler Pfad-Präfix (Unterverzeichnis).\n" "\n" -"-v\tAusführliche Ausgabe." +"-v\tAusführliche Ausgabe." #: ../quilt/setup.in:95 msgid "Directory $prefix$dir/$QUILT_PATCHES exists" @@ -858,8 +879,8 @@ msgid "" msgstr "" "\n" "Erzeuge einen Snapshot des aktuellen Zustands des Quellbaums. Danach kann\n" -"der Quellbaum auf die üblichen Arten verändert werden, inklusive dem\n" -"Hinzufügen und Entfernen von Patches. Ein Patch zwischen dem Quellbaum\n" +"der Quellbaum auf die üblichen Arten verändert werden, inklusive dem\n" +"Hinzufügen und Entfernen von Patches. Ein Patch zwischen dem Quellbaum\n" "zum Zeitpunkt des Snapshots und dem aktuellen Zustand kann mit\n" "\\`quilt diff --snapshot' erzeugt werden.\n" "\n" @@ -911,12 +932,12 @@ msgid "" "case, quilt will request to run \\`quilt upgrade'." msgstr "" "\n" -"Aktualisiere die Metadaten in einem Arbeitsverzeichnis von einer älteren " +"Aktualisiere die Metadaten in einem Arbeitsverzeichnis von einer älteren " "Version\n" -"von quilt zur aktuellen. Dieses Kommando wird nur benötigt, wenn sich das\n" -"Format der Metadaten verändert hat, und das Arbeitsverzeichnis noch alte\n" -"Metadaten enthält. In diesem Fall fordert quilt dazu auf, \\`quilt upgrade'\n" -"auszuführen." +"von quilt zur aktuellen. Dieses Kommando wird nur benötigt, wenn sich das\n" +"Format der Metadaten verändert hat, und das Arbeitsverzeichnis noch alte\n" +"Metadaten enthält. In diesem Fall fordert quilt dazu auf, \\`quilt upgrade'\n" +"auszuführen." #: ../quilt/upgrade.in:66 msgid "" @@ -968,17 +989,17 @@ msgstr "Patch $patch scheint leer zu sein, angewandt" #: ../scripts/apatch.in:119 msgid "Applied $patch (forced; needs refresh)" -msgstr "Patch $patch angewandt (erzwungen, muß aufgefrischt werden (Refresh))" +msgstr "Patch $patch angewandt (erzwungen, muß aufgefrischt werden (Refresh))" #: ../scripts/apatch.in:123 msgid "Patch $patch does not apply (enforce with -f)" -msgstr "Patch $patch läßt sich nicht anwenden (erzwingen mit -f)" +msgstr "Patch $patch läßt sich nicht anwenden (erzwingen mit -f)" #: ../scripts/apatch.in:180 ../scripts/rpatch.in:178 msgid "The topmost patch $top needs to be refreshed first." msgstr "Der oberste Patch $top muss zuerst aufgefrischt werden (Refresh)." -#: ../scripts/patchfns.in:698 +#: ../scripts/patchfns.in:702 msgid "" "The quilt meta-data in this tree has version $version, but this version of " "quilt can only handle meta-data formats up to and including version " @@ -991,13 +1012,13 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde." -#: ../scripts/patchfns.in:760 +#: ../scripts/patchfns.in:764 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'." msgstr "" -"Das Arbeitsverzeichnis wurde von einer älteren Version von quilt erstellt. " -"Bitte führen Sie \\`quilt upgrade' aus." +"Das Arbeitsverzeichnis wurde von einer älteren Version von quilt erstellt. " +"Bitte führen Sie \\`quilt upgrade' aus." #: ../scripts/rpatch.in:22 msgid "Usage: $0 [-fRq] patchname" @@ -66,20 +66,20 @@ msgstr "" "-p patch\n" "\tPatch auquel les fichiers doivent être ajoutés." -#: ../quilt/add.in:54 ../quilt/diff.in:139 ../quilt/diff.in:150 +#: ../quilt/add.in:54 ../quilt/diff.in:147 ../quilt/diff.in:158 #: ../quilt/remove.in:52 msgid "Patch $2 is not in series" msgstr "Le patch $2 n'est pas dans la série" -#: ../quilt/add.in:75 ../quilt/applied.in:72 ../quilt/refresh.in:112 +#: ../quilt/add.in:75 ../quilt/applied.in:72 ../quilt/refresh.in:125 #: ../quilt/remove.in:73 msgid "Patch $patch is not applied" msgstr "Le patch $patch n'est pas appliqué" -#: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:211 +#: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:227 #: ../quilt/files.in:75 ../quilt/fold.in:78 ../quilt/fork.in:64 #: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:215 -#: ../quilt/refresh.in:119 ../quilt/remove.in:80 +#: ../quilt/refresh.in:132 ../quilt/remove.in:80 msgid "No patches applied" msgstr "Aucun patch n'est appliqué" @@ -170,20 +170,28 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n" "\n" +"-u, -U num, -c, -C num\n" +"\tCreate a unified diff (-u, -U) with num lines of context. Create\n" +"\ta context diff (-c, -C) with num lines of context. The number of\n" +"\tcontext lines defaults to 3.\n" +"\n" +"--no-timestamps\n" +"\tDo not include file timestamps in patch headers.\n" +"\n" +"-z\tWrite to standard output the changes that have been made\n" +"\trelative to the topmost or specified patch.\n" +"\n" +"-R\tCreate a reverse diff.\n" +"\n" "-P patch\n" "\tCreate a diff for the specified patch. (Defaults to the topmost\n" "\tpatch.)\n" "\n" -"-c patch\n" +"--combine patch\n" "\tCreate a combined diff for all patches between this patch and\n" "\tthe patch specified with -P. A patch name of \\\"-\\\" is equivalent\n" "\tto specifying the first applied patch.\n" "\n" -"-R\tCreate a reverse diff.\n" -"\n" -"-z\tWrite to standard output the changes that have been made\n" -"\trelative to the topmost or specified patch.\n" -"\n" "--snapshot\n" "\tDiff agains snapshot (see \\`quilt snapshot -h').\n" "\n" @@ -191,11 +199,8 @@ msgid "" "\tUse the specified utility for generating the diff. The utility\n" "\tis invoked with the original and new file name as arguments.\n" "\n" -"--no-timestamps\n" -"\tDo not include file timestamps in patch headers.\n" -"\t\n" "--color[=always|auto|never]\n" -"\tUse ANSI escape sequences to colorize the result." +"\tUse syntax coloring." msgstr "" "\n" "Produit un diff du ou des fichiers spécifiés par le patch spécifié (ou à\n" @@ -230,17 +235,17 @@ msgstr "" "\tSupprime les timestamps des entêtes du patch (comme si\n" " QUILT_DIFF_NO_TIMESTAMPS valait \"yes\")." -#: ../quilt/diff.in:196 +#: ../quilt/diff.in:212 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined." msgstr "" "Les options \\`-c patch', \\`--snapshot' et \\`-z' ne peuvent pas être " "combinées." -#: ../quilt/diff.in:204 +#: ../quilt/diff.in:220 msgid "Patch $last_patch is not applied" msgstr "Le patch $last_patch ne semble pas appliqué" -#: ../quilt/diff.in:222 +#: ../quilt/diff.in:238 msgid "" "Cannot diff patches with -p$opt_strip_level, please specify -p0 or -p1 " "instead" @@ -248,39 +253,39 @@ msgstr "" "Impossible de créer des patches avec -p$opt_strip_level. Veuillez spécifier -" "p0 ou -p1 à la place" -#: ../quilt/diff.in:256 +#: ../quilt/diff.in:272 msgid "Patch $first_patch not applied before $last_patch." msgstr "Le patch $first_patch n'est pas appliqué avant $last_patch." -#: ../quilt/diff.in:290 +#: ../quilt/diff.in:306 msgid "Cannot change into $QUILT_PC/$last_patch" msgstr "Impossible d'entrer dans $QUILT_PC/$last_patch" -#: ../quilt/diff.in:296 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:312 ../scripts/rpatch.in:62 msgid "Failed to copy files to temporary directory" msgstr "Impossible de copier les fichiers dans le répertoire temporaire" -#: ../quilt/diff.in:307 +#: ../quilt/diff.in:323 msgid "Cannot change to temporary directory" msgstr "Impossible d'entrer dans le répertoire temporaire" -#: ../quilt/diff.in:326 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:342 ../scripts/rpatch.in:85 msgid "Failed to patch temporary files" msgstr "Impossible de patcher les fichiers temporaires" -#: ../quilt/diff.in:332 +#: ../quilt/diff.in:348 msgid "Cannot change to source directory" msgstr "Impossible d'entrer dans le répertoire source" -#: ../quilt/diff.in:350 +#: ../quilt/diff.in:366 msgid "File $file is not being modified." msgstr "Le fichier $file n'est pas modifié." -#: ../quilt/diff.in:370 ../quilt/refresh.in:151 +#: ../quilt/diff.in:386 ../quilt/refresh.in:164 msgid "Diff failed, aborting." msgstr "Le diff a échoué. Abandon." -#: ../quilt/diff.in:377 +#: ../quilt/diff.in:393 msgid "More recent patches modify files in $last_patch." msgstr "Un patch plus recent modifie des fichiers communs à $last_patch." @@ -708,12 +713,16 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n" "\n" -"-f\tForce refresh, even if more recent patches modify\n" -"\tsome of the same files.\n" +"-u, -U num, -c, -C num\n" +"\tCreate a unified diff (-u, -U) with num lines of context. Create\n" +"\ta context diff (-c, -C) with num lines of context. The number of\n" +"\tcontext lines defaults to 3.\n" "\n" "--no-timestamps\n" "\tDo not include file timestamps in patch headers.\n" "\t\n" +"-f\tEnforce refreshing of a patch that is not on top.\n" +"\n" "--backup\n" "\tCreate a backup copy of the old version of a patch as patch~." msgstr "" @@ -740,11 +749,11 @@ msgstr "" "\tSupprime les timestamps des entêtes du patch (comme si\n" " QUILT_DIFF_NO_TIMESTAMPS valait \"yes\")." -#: ../quilt/refresh.in:107 +#: ../quilt/refresh.in:120 msgid "Patch $opt_patch is not in series" msgstr "Le patch $opt_patch est introuvable dans le fichier de série" -#: ../quilt/refresh.in:130 +#: ../quilt/refresh.in:143 msgid "" "Cannot refresh patches with -p$opt_strip_level, please specify -p0 or -p1 " "instead" @@ -752,21 +761,21 @@ msgstr "" "Impossible de rafraîchir des patchs avec -p$opt_strip_level. Veuillez\n" "spécifier -p0 ou -p1 à la place." -#: ../quilt/refresh.in:157 +#: ../quilt/refresh.in:170 msgid "More recent patches modify files in $patch. Enforce refresh with -f." msgstr "" "Des fichiers plus récents modifient les mêmes fichiers que $patch.\n" "Forcez le rafraîchissement avec -f." -#: ../quilt/refresh.in:164 +#: ../quilt/refresh.in:177 msgid "Nothing in patch $patch" msgstr "Le patch $patch ne contient rien" -#: ../quilt/refresh.in:189 +#: ../quilt/refresh.in:202 msgid "Patch $patch is unchanged" msgstr "Le patch $patch n'a pas été modifié" -#: ../quilt/refresh.in:203 +#: ../quilt/refresh.in:216 msgid "Refreshed patch $patch" msgstr "Le patch $patch a été rafraichi." @@ -996,7 +1005,7 @@ msgstr "" msgid "The topmost patch $top needs to be refreshed first." msgstr "Le patch au sommet $top doit être rafraichi au préalable." -#: ../scripts/patchfns.in:698 +#: ../scripts/patchfns.in:702 msgid "" "The quilt meta-data in this tree has version $version, but this version of " "quilt can only handle meta-data formats up to and including version " @@ -1009,7 +1018,7 @@ msgstr "" "version utilisée pour les appliquer avant d'installer une version\n" "plus ancienne." -#: ../scripts/patchfns.in:760 +#: ../scripts/patchfns.in:764 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'." diff --git a/po/quilt.pot b/po/quilt.pot index cca9d74..b26217a 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -34,20 +34,20 @@ msgid "" "\tPatch to add files to." msgstr "" -#: ../quilt/add.in:54 ../quilt/diff.in:139 ../quilt/diff.in:150 +#: ../quilt/add.in:54 ../quilt/diff.in:147 ../quilt/diff.in:158 #: ../quilt/remove.in:52 msgid "Patch $2 is not in series" msgstr "" -#: ../quilt/add.in:75 ../quilt/applied.in:72 ../quilt/refresh.in:112 +#: ../quilt/add.in:75 ../quilt/applied.in:72 ../quilt/refresh.in:125 #: ../quilt/remove.in:73 msgid "Patch $patch is not applied" msgstr "" -#: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:211 +#: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:227 #: ../quilt/files.in:75 ../quilt/fold.in:78 ../quilt/fork.in:64 #: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:215 -#: ../quilt/refresh.in:119 ../quilt/remove.in:80 +#: ../quilt/refresh.in:132 ../quilt/remove.in:80 msgid "No patches applied" msgstr "" @@ -125,20 +125,28 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n" "\n" +"-u, -U num, -c, -C num\n" +"\tCreate a unified diff (-u, -U) with num lines of context. Create\n" +"\ta context diff (-c, -C) with num lines of context. The number of\n" +"\tcontext lines defaults to 3.\n" +"\n" +"--no-timestamps\n" +"\tDo not include file timestamps in patch headers.\n" +"\n" +"-z\tWrite to standard output the changes that have been made\n" +"\trelative to the topmost or specified patch.\n" +"\n" +"-R\tCreate a reverse diff.\n" +"\n" "-P patch\n" "\tCreate a diff for the specified patch. (Defaults to the topmost\n" "\tpatch.)\n" "\n" -"-c patch\n" +"--combine patch\n" "\tCreate a combined diff for all patches between this patch and\n" "\tthe patch specified with -P. A patch name of \\\"-\\\" is equivalent\n" "\tto specifying the first applied patch.\n" "\n" -"-R\tCreate a reverse diff.\n" -"\n" -"-z\tWrite to standard output the changes that have been made\n" -"\trelative to the topmost or specified patch.\n" -"\n" "--snapshot\n" "\tDiff agains snapshot (see \\`quilt snapshot -h').\n" "\n" @@ -146,60 +154,57 @@ msgid "" "\tUse the specified utility for generating the diff. The utility\n" "\tis invoked with the original and new file name as arguments.\n" "\n" -"--no-timestamps\n" -"\tDo not include file timestamps in patch headers.\n" -"\t\n" "--color[=always|auto|never]\n" "\tUse syntax coloring." msgstr "" -#: ../quilt/diff.in:196 +#: ../quilt/diff.in:212 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined." msgstr "" -#: ../quilt/diff.in:204 +#: ../quilt/diff.in:220 msgid "Patch $last_patch is not applied" msgstr "" -#: ../quilt/diff.in:222 +#: ../quilt/diff.in:238 msgid "" "Cannot diff patches with -p$opt_strip_level, please specify -p0 or -p1 " "instead" msgstr "" -#: ../quilt/diff.in:256 +#: ../quilt/diff.in:272 msgid "Patch $first_patch not applied before $last_patch." msgstr "" -#: ../quilt/diff.in:290 +#: ../quilt/diff.in:306 msgid "Cannot change into $QUILT_PC/$last_patch" msgstr "" -#: ../quilt/diff.in:296 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:312 ../scripts/rpatch.in:62 msgid "Failed to copy files to temporary directory" msgstr "" -#: ../quilt/diff.in:307 +#: ../quilt/diff.in:323 msgid "Cannot change to temporary directory" msgstr "" -#: ../quilt/diff.in:326 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:342 ../scripts/rpatch.in:85 msgid "Failed to patch temporary files" msgstr "" -#: ../quilt/diff.in:332 +#: ../quilt/diff.in:348 msgid "Cannot change to source directory" msgstr "" -#: ../quilt/diff.in:350 +#: ../quilt/diff.in:366 msgid "File $file is not being modified." msgstr "" -#: ../quilt/diff.in:370 ../quilt/refresh.in:151 +#: ../quilt/diff.in:386 ../quilt/refresh.in:164 msgid "Diff failed, aborting." msgstr "" -#: ../quilt/diff.in:377 +#: ../quilt/diff.in:393 msgid "More recent patches modify files in $last_patch." msgstr "" @@ -512,39 +517,43 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n" "\n" -"-f\tForce refresh, even if more recent patches modify\n" -"\tsome of the same files.\n" +"-u, -U num, -c, -C num\n" +"\tCreate a unified diff (-u, -U) with num lines of context. Create\n" +"\ta context diff (-c, -C) with num lines of context. The number of\n" +"\tcontext lines defaults to 3.\n" "\n" "--no-timestamps\n" "\tDo not include file timestamps in patch headers.\n" "\t\n" +"-f\tEnforce refreshing of a patch that is not on top.\n" +"\n" "--backup\n" "\tCreate a backup copy of the old version of a patch as patch~." msgstr "" -#: ../quilt/refresh.in:107 +#: ../quilt/refresh.in:120 msgid "Patch $opt_patch is not in series" msgstr "" -#: ../quilt/refresh.in:130 +#: ../quilt/refresh.in:143 msgid "" "Cannot refresh patches with -p$opt_strip_level, please specify -p0 or -p1 " "instead" msgstr "" -#: ../quilt/refresh.in:157 +#: ../quilt/refresh.in:170 msgid "More recent patches modify files in $patch. Enforce refresh with -f." msgstr "" -#: ../quilt/refresh.in:164 +#: ../quilt/refresh.in:177 msgid "Nothing in patch $patch" msgstr "" -#: ../quilt/refresh.in:189 +#: ../quilt/refresh.in:202 msgid "Patch $patch is unchanged" msgstr "" -#: ../quilt/refresh.in:203 +#: ../quilt/refresh.in:216 msgid "Refreshed patch $patch" msgstr "" @@ -722,7 +731,7 @@ msgstr "" msgid "The topmost patch $top needs to be refreshed first." msgstr "" -#: ../scripts/patchfns.in:698 +#: ../scripts/patchfns.in:702 msgid "" "The quilt meta-data in this tree has version $version, but this version of " "quilt can only handle meta-data formats up to and including version " @@ -730,7 +739,7 @@ msgid "" "push them before downgrading." msgstr "" -#: ../scripts/patchfns.in:760 +#: ../scripts/patchfns.in:764 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'." diff --git a/quilt.changes b/quilt.changes index 8042f00..65c5a1d 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Sun Jul 4 04:29:25 CEST 2004 - agruen@suse.de + +- Add common GNU Diff format options to diff and refresH commands: + -u, -U num, -c, -C num. REname old -c option (combine patches) + of diff command to --combine. +- Extend the function that splits comments froM patches and + syntax coloring to handLe combined diff format. +- Honor the LAnG environment variable again; this goT broken at + some point. +- Set TEXTDOMAINDIR to where the translations are put so that + Messages are found even when not installing into /usr. + +------------------------------------------------------------------- Fri Jul 2 03:08:39 CEST 2004 - agruen@suse.de - Several Fixes from Joe Green <jgreen@mvista.com>: diff --git a/quilt/diff.in b/quilt/diff.in index 8ad3639..5e2c4b4 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -30,20 +30,28 @@ included. -p n Create a -p n style patch (-p0 or -p1 are supported). +-u, -U num, -c, -C num + Create a unified diff (-u, -U) with num lines of context. Create + a context diff (-c, -C) with num lines of context. The number of + context lines defaults to 3. + +--no-timestamps + Do not include file timestamps in patch headers. + +-z Write to standard output the changes that have been made + relative to the topmost or specified patch. + +-R Create a reverse diff. + -P patch Create a diff for the specified patch. (Defaults to the topmost patch.) --c patch +--combine patch Create a combined diff for all patches between this patch and the patch specified with -P. A patch name of \"-\" is equivalent to specifying the first applied patch. --R Create a reverse diff. - --z Write to standard output the changes that have been made - relative to the topmost or specified patch. - --snapshot Diff agains snapshot (see \`quilt snapshot -h'). @@ -51,9 +59,6 @@ included. Use the specified utility for generating the diff. The utility is invoked with the original and new file name as arguments. ---no-timestamps - Do not include file timestamps in patch headers. - --color[=always|auto|never] Use syntax coloring." exit 0 @@ -66,15 +71,17 @@ colorize() { if [ -n "$opt_color" ]; then awk ' function esc(x) { return "'$'\e''[" x "m" } - { if (/^(Index:|\-\-\-|\+\+\+) /) + { if (/^(Index:|\-\-\-|\+\+\+|\*\*\*) /) print esc(32) $0 esc(0) else if (/^\+/) print esc(36) $0 esc(0) - else if (/^\-/) + else if (/^(\-|!)/) print esc(35) $0 esc(0) else if (/^@@ \-[0-9]+(,[0-9]+)? \+[0-9]+(,[0-9]+)? @@/) print gensub(/^(@@[^@]*@@)([ \t]*)(.*)/, esc(33) "\\1" esc(0) "\\2" esc(35) "\\3" esc(0), "") + else if (/^\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*/) + print esc(33) $0 esc(0) else print }' @@ -118,7 +125,7 @@ die () exit $status } -options=`getopt -o p:P:c:Rzh --long diff:,snapshot,no-timestamps,color:: -- "$@"` +options=`getopt -o p:P:RuU:cC:zh --long diff:,snapshot,no-timestamps,combine:,color:: -- "$@"` if [ $? -ne 0 ] then @@ -127,6 +134,7 @@ fi eval set -- "$options" +opt_format=-u while true do case "$1" in @@ -140,7 +148,7 @@ do exit 1 fi shift 2 ;; - -c) + --combine) opt_combine=1 if [ "$2" = - ] then @@ -157,6 +165,12 @@ do -z) opt_relative=1 shift ;; + -u|-c) + opt_format=$1 + shift ;; + -U|-C) + opt_format="$1 $2" + shift 2 ;; -h) usage -h ;; --snapshot) @@ -188,6 +202,8 @@ do esac done +QUILT_DIFF_OPTS="$QUILT_DIFF_OPTS $opt_format" + opt_files=( $(for file in "$@"; do echo "$SUBDIR$file" ; done) ) if [ $[0$opt_combine + 0$opt_snapshot + 0$opt_relative] -gt 1 ] diff --git a/quilt/refresh.in b/quilt/refresh.in index 292beef..0b7dfab 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -38,12 +38,16 @@ patch. -p n Create a -p n style patch (-p0 or -p1 supported). --f Force refresh, even if more recent patches modify - some of the same files. +-u, -U num, -c, -C num + Create a unified diff (-u, -U) with num lines of context. Create + a context diff (-c, -C) with num lines of context. The number of + context lines defaults to 3. --no-timestamps Do not include file timestamps in patch headers. +-f Enforce refreshing of a patch that is not on top. + --backup Create a backup copy of the old version of a patch as patch~." exit 0 @@ -60,7 +64,7 @@ die () exit $status } -options=`getopt -o p:fh --long no-timestamps,backup -- "$@"` +options=`getopt -o p:uU:cC:fh --long no-timestamps,backup -- "$@"` if [ $? -ne 0 ] then @@ -69,6 +73,7 @@ fi eval set -- "$options" +opt_format=-u while true do case "$1" in @@ -78,6 +83,12 @@ do -f) opt_force=1 shift ;; + -u|-c) + opt_format=$1 + shift ;; + -U|-C) + opt_format="$1 $2" + shift 2 ;; -h) usage -h ;; --no-timestamps) @@ -100,6 +111,8 @@ then usage fi +QUILT_DIFF_OPTS="$QUILT_DIFF_OPTS $opt_format" + if [ -n "$opt_patch" ] then if ! patch=$(find_patch $opt_patch) diff --git a/scripts/patchfns.in b/scripts/patchfns.in index 3acb92b..15a5248 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -7,9 +7,14 @@ # # See the COPYING and AUTHORS files for more details. +export TEXTDOMAIN=quilt +export TEXTDOMAINDIR=@LOCALEDIR@ + +: ${LC_CTYPE:=$LANG} +: ${LC_MESSAGES:=$LANG} ORIGINAL_LANG=$LANG export LANG=POSIX -export TEXTDOMAIN=quilt + export QUILT_PATCHES QUILT_PC SUBDIR SERIES DB DB_VERSION=2 @@ -534,7 +539,7 @@ diff_file() -r "$new_file") fi - @DIFF@ -Nu $QUILT_DIFF_OPTS $old_file $new_file \ + @DIFF@ -N $QUILT_DIFF_OPTS $old_file $new_file \ --label "$old_hdr$old_date" --label "$new_hdr$new_date" \ | if read line then @@ -591,13 +596,12 @@ patch_description() if [ -e "$patch_file" -o -z "$patch_file" ] then @AWK@ ' - $1 == "---" { exit } - /^Index:[ \t]|^diff[ \t]|^==*$/ \ - { eat = eat $0 - next } - eat { print eat - eat="" } - { print } + $1 == "***" || $1 == "---" { exit } + /^Index:[ \t]|^diff[ \t]|^==*$/ \ + { eat = eat $0 "\n" + next } + { print eat $0 + eat="" } ' $patch_file fi } diff --git a/test/formats.test b/test/formats.test new file mode 100644 index 0000000..a91f277 --- /dev/null +++ b/test/formats.test @@ -0,0 +1,96 @@ + $ mkdir d + $ cd d + + $ cat > test.txt + < 1 + < 2 + < old + < 4 + < 5 + + $ quilt new test + > Patch test is now on top + + $ quilt add test.txt + > File test.txt added to patch test + + $ cat > test.txt + < 1 + < 2 + < new + < 4 + < 5 + + $ quilt diff + > Index: d/test.txt + > =================================================================== + > --- d.orig/test.txt + > +++ d/test.txt + > @@ -1,5 +1,5 @@ + > 1 + > 2 + > -old + > +new + > 4 + > 5 + + $ quilt diff -R + > Index: d/test.txt + > =================================================================== + > --- d.orig/test.txt + > +++ d/test.txt + > @@ -1,5 +1,5 @@ + > 1 + > 2 + > -new + > +old + > 4 + > 5 + + $ quilt diff -U1 + > Index: d/test.txt + > =================================================================== + > --- d.orig/test.txt + > +++ d/test.txt + > @@ -2,3 +2,3 @@ + > 2 + > -old + > +new + > 4 + + $ quilt diff -c + > Index: d/test.txt + > =================================================================== + > *** d.orig/test.txt + > --- d/test.txt + > *************** + > *** 1,5 **** + > 1 + > 2 + > ! old + > 4 + > 5 + > --- 1,5 ---- + > 1 + > 2 + > ! new + > 4 + > 5 + + $ quilt diff -C1 + > Index: d/test.txt + > =================================================================== + > *** d.orig/test.txt + > --- d/test.txt + > *************** + > *** 2,4 **** + > 2 + > ! old + > 4 + > --- 2,4 ---- + > 2 + > ! new + > 4 + + $ cd .. + $ rm -rf d diff --git a/test/merge.test b/test/merge.test index 27dcd34..21799cd 100644 --- a/test/merge.test +++ b/test/merge.test @@ -51,7 +51,7 @@ Test the patch merging functionality of `quilt diff'. > c > More recent patches modify files in b.diff. - $ quilt diff -c a.diff -P b.diff | grep -v "^\\(---\\|+++\\)" + $ quilt diff --combine a.diff -P b.diff | grep -v "^\\(---\\|+++\\)" > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ @@ -62,7 +62,7 @@ Test the patch merging functionality of `quilt diff'. > c > More recent patches modify files in b.diff. - $ quilt diff -c b.diff | grep -v "^\\(---\\|+++\\)" + $ quilt diff --combine b.diff | grep -v "^\\(---\\|+++\\)" > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ @@ -72,7 +72,7 @@ Test the patch merging functionality of `quilt diff'. > +b+ > +c+ - $ quilt diff -c - | grep -v "^\\(---\\|+++\\)" + $ quilt diff --combine - | grep -v "^\\(---\\|+++\\)" > Index: d/abc.txt > =================================================================== > @@ -1,3 +1,3 @@ |