diff options
| -rw-r--r-- | po/de.po | 62 | ||||
| -rw-r--r-- | po/fr.po | 62 | ||||
| -rw-r--r-- | po/ja.po | 62 | ||||
| -rw-r--r-- | po/quilt.pot | 58 | ||||
| -rw-r--r-- | quilt.changes | 12 | ||||
| -rw-r--r-- | quilt/diff.in | 24 | ||||
| -rw-r--r-- | quilt/refresh.in | 18 | ||||
| -rw-r--r-- | scripts/patchfns.in | 10 | ||||
| -rw-r--r-- | test/fold.test | 12 | ||||
| -rw-r--r-- | test/sort.test | 52 |
10 files changed, 250 insertions, 122 deletions
@@ -71,22 +71,22 @@ msgid "File \\`%s' is located below \\`%s'\\n" msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n" #: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76 -#: ../quilt/diff.in:153 ../quilt/diff.in:164 ../quilt/graph.in:116 +#: ../quilt/diff.in:155 ../quilt/diff.in:166 ../quilt/graph.in:116 #: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62 -#: ../quilt/push.in:311 ../quilt/refresh.in:129 ../quilt/remove.in:53 +#: ../quilt/push.in:311 ../quilt/refresh.in:134 ../quilt/remove.in:53 #: ../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/diff.in:226 ../quilt/graph.in:121 -#: ../quilt/pop.in:254 ../quilt/refresh.in:135 ../quilt/remove.in:74 +#: ../quilt/add.in:99 ../quilt/diff.in:231 ../quilt/graph.in:121 +#: ../quilt/pop.in:254 ../quilt/refresh.in:140 ../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:68 ../quilt/diff.in:234 +#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:239 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 #: ../quilt/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349 -#: ../quilt/refresh.in:143 ../quilt/remove.in:81 +#: ../quilt/refresh.in:148 ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" @@ -153,14 +153,16 @@ msgid "Failed to remove patch %s\\n" msgstr "Konnte Patch %s nicht entfernen\\n" #: ../quilt/diff.in:24 +#, fuzzy msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " -"patch] [--snapshot] [--diff=utility] [--color] [file ...]\\n" +"patch] [--snapshot] [--diff=utility] [--sort] [--color] [file ...]\\n" msgstr "" "Verwendung: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-" "R] [-P patch] [--snapshot] [--diff=programm] [--color] [datei ...]\\n" #: ../quilt/diff.in:28 +#, fuzzy msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -200,6 +202,8 @@ msgid "" "\n" "--color[=always|auto|never]\n" "\tUse syntax coloring.\n" +"\n" +"--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" "\n" "Erzeugt ein Diff der angegebenen Dateien im obersten oder angegebenen\n" @@ -239,51 +243,51 @@ msgstr "" "--color[=always|auto|never]\n" "\tSyntaxeinfärbung verwenden (immer, nur für Terminals, nie).\n" -#: ../quilt/diff.in:218 +#: ../quilt/diff.in:223 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Die Optionen \\`-c patch', \\`--snapshot', und \\`-z' können nicht " "kombiniert werden.\\n" -#: ../quilt/diff.in:245 +#: ../quilt/diff.in:250 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:280 ../quilt/files.in:122 +#: ../quilt/diff.in:285 ../quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: ../quilt/diff.in:316 +#: ../quilt/diff.in:334 msgid "Cannot change into directory %s\\n" msgstr "Kann nicht in Verzeichnis %s wechseln\\n" -#: ../quilt/diff.in:323 ../quilt/pop.in:114 +#: ../quilt/diff.in:341 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" -#: ../quilt/diff.in:334 +#: ../quilt/diff.in:352 msgid "Cannot change to temporary directory\\n" msgstr "Kann nicht in temporäres Verzeichnis wechseln\\n" -#: ../quilt/diff.in:353 ../quilt/pop.in:138 +#: ../quilt/diff.in:371 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" -#: ../quilt/diff.in:359 +#: ../quilt/diff.in:377 msgid "Cannot change to source directory\\n" msgstr "Kann nicht in Quellverzeichnis wechseln\\n" -#: ../quilt/diff.in:377 +#: ../quilt/diff.in:395 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: ../quilt/diff.in:397 ../quilt/refresh.in:175 +#: ../quilt/diff.in:415 ../quilt/refresh.in:187 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: ../quilt/diff.in:404 +#: ../quilt/diff.in:422 msgid "More recent patches modify files in patch %s\\n" msgstr "Später angewandte Patches verändern Dateien von %s\\n" @@ -842,14 +846,16 @@ 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 +#, fuzzy msgid "" -"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] " -"[patch]\\n" +"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--" +"backup] [patch]\\n" msgstr "" "Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--" "backup] [patch]\\n" #: ../quilt/refresh.in:26 +#, fuzzy msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -882,6 +888,8 @@ msgid "" "\n" "--backup\n" "\tCreate a backup copy of the old version of a patch as patch~.\n" +"\n" +"--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" "\n" "Frischt den obersten oder angegebenen Patch auf. Dokumentation in der\n" @@ -918,28 +926,28 @@ msgstr "" "--backup\n" "\tErzeuge ein Backup der alten Version von patch als patch~.\n" -#: ../quilt/refresh.in:154 +#: ../quilt/refresh.in:159 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:181 +#: ../quilt/refresh.in:193 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Später angewandte Patches verändern Dateien von $patch. Auffrischen mit -f " "erzwingen.\\n" -#: ../quilt/refresh.in:188 +#: ../quilt/refresh.in:200 msgid "Nothing in patch %s\\n" msgstr "Patch %s is leer\\n" -#: ../quilt/refresh.in:249 +#: ../quilt/refresh.in:261 msgid "Patch %s is unchanged\\n" msgstr "Patch %s ist unverändert\\n" -#: ../quilt/refresh.in:263 +#: ../quilt/refresh.in:275 msgid "Refreshed patch %s\\n" msgstr "Patch %s aufgefrischt\\n" @@ -1136,7 +1144,7 @@ msgstr "" "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie " "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n" -#: ../scripts/patchfns.in:732 +#: ../scripts/patchfns.in:738 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 " @@ -1149,7 +1157,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: ../scripts/patchfns.in:809 +#: ../scripts/patchfns.in:815 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -74,22 +74,22 @@ msgid "File \\`%s' is located below \\`%s'\\n" msgstr "Le fichier %s n'est pas dans le patch %s.\\n" #: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76 -#: ../quilt/diff.in:153 ../quilt/diff.in:164 ../quilt/graph.in:116 +#: ../quilt/diff.in:155 ../quilt/diff.in:166 ../quilt/graph.in:116 #: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62 -#: ../quilt/push.in:311 ../quilt/refresh.in:129 ../quilt/remove.in:53 +#: ../quilt/push.in:311 ../quilt/refresh.in:134 ../quilt/remove.in:53 #: ../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/diff.in:226 ../quilt/graph.in:121 -#: ../quilt/pop.in:254 ../quilt/refresh.in:135 ../quilt/remove.in:74 +#: ../quilt/add.in:99 ../quilt/diff.in:231 ../quilt/graph.in:121 +#: ../quilt/pop.in:254 ../quilt/refresh.in:140 ../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:68 ../quilt/diff.in:234 +#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:239 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 #: ../quilt/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349 -#: ../quilt/refresh.in:143 ../quilt/remove.in:81 +#: ../quilt/refresh.in:148 ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqu\\n" @@ -156,14 +156,16 @@ msgid "Failed to remove patch %s\\n" msgstr "Impossible de retirer le patch %s\\n" #: ../quilt/diff.in:24 +#, fuzzy msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " -"patch] [--snapshot] [--diff=utility] [--color] [file ...]\\n" +"patch] [--snapshot] [--diff=utility] [--sort] [--color] [file ...]\\n" msgstr "" "Usage : quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-" "P patch] [--snapshot] [--diff=utilitaire] [--color] [fichier ...]\\n" #: ../quilt/diff.in:28 +#, fuzzy msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -203,6 +205,8 @@ msgid "" "\n" "--color[=always|auto|never]\n" "\tUse syntax coloring.\n" +"\n" +"--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" "\n" "Produit un diff du ou des fichiers spcifis par le patch spcifi (ou \n" @@ -250,50 +254,50 @@ msgstr "" "\tColorise la syntaxe toujours (always), de manire automatique (auto)\n" "\tou jamais (never).\n" -#: ../quilt/diff.in:218 +#: ../quilt/diff.in:223 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Les options -c patch, --snapshot et -z ne peuvent pas tre combines." -#: ../quilt/diff.in:245 +#: ../quilt/diff.in:250 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:280 ../quilt/files.in:122 +#: ../quilt/diff.in:285 ../quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "Le patch %s n'est pas appliqu avant %s\\n." -#: ../quilt/diff.in:316 +#: ../quilt/diff.in:334 msgid "Cannot change into directory %s\\n" msgstr "Impossible d'entrer dans le rpertoire %s\\n" -#: ../quilt/diff.in:323 ../quilt/pop.in:114 +#: ../quilt/diff.in:341 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le rpertoire temporaire\\n" -#: ../quilt/diff.in:334 +#: ../quilt/diff.in:352 msgid "Cannot change to temporary directory\\n" msgstr "Impossible d'entrer dans le rpertoire temporaire\\n" -#: ../quilt/diff.in:353 ../quilt/pop.in:138 +#: ../quilt/diff.in:371 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" -#: ../quilt/diff.in:359 +#: ../quilt/diff.in:377 msgid "Cannot change to source directory\\n" msgstr "Impossible d'entrer dans le rpertoire source\\n" -#: ../quilt/diff.in:377 +#: ../quilt/diff.in:395 msgid "File %s is not being modified\\n" msgstr "Le fichier %s n'est pas modifi.\\n" -#: ../quilt/diff.in:397 ../quilt/refresh.in:175 +#: ../quilt/diff.in:415 ../quilt/refresh.in:187 msgid "Diff failed, aborting\\n" msgstr "Le diff a chou. Abandon.\\n" -#: ../quilt/diff.in:404 +#: ../quilt/diff.in:422 msgid "More recent patches modify files in patch %s\\n" msgstr "Un patch plus recent modifie des fichiers communs %s.\\n" @@ -808,14 +812,16 @@ 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 +#, fuzzy msgid "" -"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] " -"[patch]\\n" +"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--" +"backup] [patch]\\n" msgstr "" "Usage : quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] " "[patch]\\n" #: ../quilt/refresh.in:26 +#, fuzzy msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -848,6 +854,8 @@ msgid "" "\n" "--backup\n" "\tCreate a backup copy of the old version of a patch as patch~.\n" +"\n" +"--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" "\n" "Rafrachit un patch appliqu, ou celui au sommet dfaut. La " @@ -883,28 +891,28 @@ msgstr "" "\tCre une copie de sauvegarde du patch en ajoutant ~ la fin de \n" "\tson nom.\n" -#: ../quilt/refresh.in:154 +#: ../quilt/refresh.in:159 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:181 +#: ../quilt/refresh.in:193 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:188 +#: ../quilt/refresh.in:200 msgid "Nothing in patch %s\\n" msgstr "Le patch %s ne contient rien\\n" -#: ../quilt/refresh.in:249 +#: ../quilt/refresh.in:261 msgid "Patch %s is unchanged\\n" msgstr "Le patch %s n'a pas t modifi\\n" -#: ../quilt/refresh.in:263 +#: ../quilt/refresh.in:275 msgid "Refreshed patch %s\\n" msgstr "Le patch %s a t rafraichi.\\n" @@ -1102,7 +1110,7 @@ msgstr "" "version utilise pour crer cet arbre de travail, ou effacez le rpertoire\n" "%s et rappliquez compltement vos patchs.\\n" -#: ../scripts/patchfns.in:732 +#: ../scripts/patchfns.in:738 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 " @@ -1114,7 +1122,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" -#: ../scripts/patchfns.in:809 +#: ../scripts/patchfns.in:815 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -71,22 +71,22 @@ msgid "File \\`%s' is located below \\`%s'\\n" msgstr "ファイル \\`%s'は、\\`%s'以下にあります\\n" #: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76 -#: ../quilt/diff.in:153 ../quilt/diff.in:164 ../quilt/graph.in:116 +#: ../quilt/diff.in:155 ../quilt/diff.in:166 ../quilt/graph.in:116 #: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62 -#: ../quilt/push.in:311 ../quilt/refresh.in:129 ../quilt/remove.in:53 +#: ../quilt/push.in:311 ../quilt/refresh.in:134 ../quilt/remove.in:53 #: ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: ../quilt/add.in:99 ../quilt/diff.in:226 ../quilt/graph.in:121 -#: ../quilt/pop.in:254 ../quilt/refresh.in:135 ../quilt/remove.in:74 +#: ../quilt/add.in:99 ../quilt/diff.in:231 ../quilt/graph.in:121 +#: ../quilt/pop.in:254 ../quilt/refresh.in:140 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" -#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:234 +#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:239 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 #: ../quilt/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349 -#: ../quilt/refresh.in:143 ../quilt/remove.in:81 +#: ../quilt/refresh.in:148 ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" @@ -153,14 +153,16 @@ msgid "Failed to remove patch %s\\n" msgstr "パッチ %sを削除することに失敗しました。\\n" #: ../quilt/diff.in:24 +#, fuzzy msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " -"patch] [--snapshot] [--diff=utility] [--color] [file ...]\\n" +"patch] [--snapshot] [--diff=utility] [--sort] [--color] [file ...]\\n" msgstr "" "使い方: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-" "P パッチ] [--snapshot] [--diff=utility] [--color] [ファイル ...]\\n" #: ../quilt/diff.in:28 +#, fuzzy msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -200,6 +202,8 @@ msgid "" "\n" "--color[=always|auto|never]\n" "\tUse syntax coloring.\n" +"\n" +"--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" "\n" "最上位、または指定されたパッチに、指定されたファイルの差分を作成する。\n" @@ -237,48 +241,48 @@ msgstr "" "--color[=always|auto|never]\n" "\tシンタックスの色付け指定。\n" -#: ../quilt/diff.in:218 +#: ../quilt/diff.in:223 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "オプション \\`-c patch'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n" -#: ../quilt/diff.in:245 +#: ../quilt/diff.in:250 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "-p%sでパッチの差分はとれません。-p0か -p1を指定してください\\n" -#: ../quilt/diff.in:280 ../quilt/files.in:122 +#: ../quilt/diff.in:285 ../quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" -#: ../quilt/diff.in:316 +#: ../quilt/diff.in:334 msgid "Cannot change into directory %s\\n" msgstr "ディレクトリ %s に移動できません\\n" -#: ../quilt/diff.in:323 ../quilt/pop.in:114 +#: ../quilt/diff.in:341 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" -#: ../quilt/diff.in:334 +#: ../quilt/diff.in:352 msgid "Cannot change to temporary directory\\n" msgstr "テンポラリディレクトリに移動できません\\n" -#: ../quilt/diff.in:353 ../quilt/pop.in:138 +#: ../quilt/diff.in:371 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" -#: ../quilt/diff.in:359 +#: ../quilt/diff.in:377 msgid "Cannot change to source directory\\n" msgstr "ソースディレクトリに移動できません\\n" -#: ../quilt/diff.in:377 +#: ../quilt/diff.in:395 msgid "File %s is not being modified\\n" msgstr "ファイル %sは変更されていません\\n" -#: ../quilt/diff.in:397 ../quilt/refresh.in:175 +#: ../quilt/diff.in:415 ../quilt/refresh.in:187 msgid "Diff failed, aborting\\n" msgstr "差分に失敗しました。異常終了します\\n" -#: ../quilt/diff.in:404 +#: ../quilt/diff.in:422 msgid "More recent patches modify files in patch %s\\n" msgstr "最近のパッチが、パッチ %s内のファイルを変更しています\\n" @@ -836,14 +840,16 @@ msgstr "" "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" #: ../quilt/refresh.in:22 +#, fuzzy msgid "" -"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] " -"[patch]\\n" +"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--" +"backup] [patch]\\n" msgstr "" "使い方: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] " "[パッチ]\\n" #: ../quilt/refresh.in:26 +#, fuzzy msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -876,6 +882,8 @@ msgid "" "\n" "--backup\n" "\tCreate a backup copy of the old version of a patch as patch~.\n" +"\n" +"--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" "\n" "指定されたパッチを作成し直す。これをリフレッシュすると呼ぶ。デフォルト\n" @@ -909,27 +917,27 @@ msgstr "" "\tバックアップ用のコピーとして古いバージョンのパッチを patch~の\n" "\t形で作成する。\n" -#: ../quilt/refresh.in:154 +#: ../quilt/refresh.in:159 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "-p%sではリフレッシュすることができません。-p0または -p1を指定してください\\n" -#: ../quilt/refresh.in:181 +#: ../quilt/refresh.in:193 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "より最近のパッチがパッチ %sのファイルに変更を加えています。リフレッシュを実行" "する場合は -f オプションを使用してください。\\n" -#: ../quilt/refresh.in:188 +#: ../quilt/refresh.in:200 msgid "Nothing in patch %s\\n" msgstr "パッチ %s にはなにも含まれていません\\n" -#: ../quilt/refresh.in:249 +#: ../quilt/refresh.in:261 msgid "Patch %s is unchanged\\n" msgstr "パッチ % に変更はありません\\n" -#: ../quilt/refresh.in:263 +#: ../quilt/refresh.in:275 msgid "Refreshed patch %s\\n" msgstr "パッチ %s をリフレッシュしました\\n" @@ -1124,7 +1132,7 @@ msgstr "" "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n" "トリを削除し、最初からパッチをあて直してください。\\n" -#: ../scripts/patchfns.in:732 +#: ../scripts/patchfns.in:738 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 " @@ -1136,7 +1144,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: ../scripts/patchfns.in:809 +#: ../scripts/patchfns.in:815 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 3a78f6e..8159997 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -40,22 +40,22 @@ msgid "File \\`%s' is located below \\`%s'\\n" msgstr "" #: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76 -#: ../quilt/diff.in:153 ../quilt/diff.in:164 ../quilt/graph.in:116 +#: ../quilt/diff.in:155 ../quilt/diff.in:166 ../quilt/graph.in:116 #: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62 -#: ../quilt/push.in:311 ../quilt/refresh.in:129 ../quilt/remove.in:53 +#: ../quilt/push.in:311 ../quilt/refresh.in:134 ../quilt/remove.in:53 #: ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "" -#: ../quilt/add.in:99 ../quilt/diff.in:226 ../quilt/graph.in:121 -#: ../quilt/pop.in:254 ../quilt/refresh.in:135 ../quilt/remove.in:74 +#: ../quilt/add.in:99 ../quilt/diff.in:231 ../quilt/graph.in:121 +#: ../quilt/pop.in:254 ../quilt/refresh.in:140 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "" -#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:234 +#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:239 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 #: ../quilt/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349 -#: ../quilt/refresh.in:143 ../quilt/remove.in:81 +#: ../quilt/refresh.in:148 ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "" @@ -117,7 +117,7 @@ msgstr "" #: ../quilt/diff.in:24 msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " -"patch] [--snapshot] [--diff=utility] [--color] [file ...]\\n" +"patch] [--snapshot] [--diff=utility] [--sort] [--color] [file ...]\\n" msgstr "" #: ../quilt/diff.in:28 @@ -160,49 +160,51 @@ msgid "" "\n" "--color[=always|auto|never]\n" "\tUse syntax coloring.\n" +"\n" +"--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" -#: ../quilt/diff.in:218 +#: ../quilt/diff.in:223 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -#: ../quilt/diff.in:245 +#: ../quilt/diff.in:250 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: ../quilt/diff.in:280 ../quilt/files.in:122 +#: ../quilt/diff.in:285 ../quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: ../quilt/diff.in:316 +#: ../quilt/diff.in:334 msgid "Cannot change into directory %s\\n" msgstr "" -#: ../quilt/diff.in:323 ../quilt/pop.in:114 +#: ../quilt/diff.in:341 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: ../quilt/diff.in:334 +#: ../quilt/diff.in:352 msgid "Cannot change to temporary directory\\n" msgstr "" -#: ../quilt/diff.in:353 ../quilt/pop.in:138 +#: ../quilt/diff.in:371 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "" -#: ../quilt/diff.in:359 +#: ../quilt/diff.in:377 msgid "Cannot change to source directory\\n" msgstr "" -#: ../quilt/diff.in:377 +#: ../quilt/diff.in:395 msgid "File %s is not being modified\\n" msgstr "" -#: ../quilt/diff.in:397 ../quilt/refresh.in:175 +#: ../quilt/diff.in:415 ../quilt/refresh.in:187 msgid "Diff failed, aborting\\n" msgstr "" -#: ../quilt/diff.in:404 +#: ../quilt/diff.in:422 msgid "More recent patches modify files in patch %s\\n" msgstr "" @@ -600,8 +602,8 @@ msgstr "" #: ../quilt/refresh.in:22 msgid "" -"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] " -"[patch]\\n" +"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--" +"backup] [patch]\\n" msgstr "" #: ../quilt/refresh.in:26 @@ -637,26 +639,28 @@ msgid "" "\n" "--backup\n" "\tCreate a backup copy of the old version of a patch as patch~.\n" +"\n" +"--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" -#: ../quilt/refresh.in:154 +#: ../quilt/refresh.in:159 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: ../quilt/refresh.in:181 +#: ../quilt/refresh.in:193 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" -#: ../quilt/refresh.in:188 +#: ../quilt/refresh.in:200 msgid "Nothing in patch %s\\n" msgstr "" -#: ../quilt/refresh.in:249 +#: ../quilt/refresh.in:261 msgid "Patch %s is unchanged\\n" msgstr "" -#: ../quilt/refresh.in:263 +#: ../quilt/refresh.in:275 msgid "Refreshed patch %s\\n" msgstr "" @@ -806,7 +810,7 @@ msgid "" "patches from scratch.\\n" msgstr "" -#: ../scripts/patchfns.in:732 +#: ../scripts/patchfns.in:738 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 " @@ -814,7 +818,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: ../scripts/patchfns.in:809 +#: ../scripts/patchfns.in:815 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 61427e5..003d5a6 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Apr 13 14:59:41 CEST 2005 - agruen@suse.de + +- Add --sort options to the diff and refresh commands which + sorts files by filename. The default is to keep files in their + original order whenever possible. +- refresh command: add new files in sort order instead of the + filesystem order. +- diff command: output files in the order in which they show up + in the patch instead of sorting them alphabetically. +- Add sort testcase. + +------------------------------------------------------------------- Wed Apr 13 10:11:06 CEST 2005 - agruen@suse.de - Fix typos in introduction. diff --git a/quilt/diff.in b/quilt/diff.in index f336a66..a15d25b 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -21,7 +21,7 @@ setup_colors usage() { - printf $"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P patch] [--snapshot] [--diff=utility] [--color] [file ...]\n" + printf $"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P patch] [--snapshot] [--diff=utility] [--sort] [--color] [file ...]\n" if [ x$1 = x-h ] then @@ -63,6 +63,8 @@ included. --color[=always|auto|never] Use syntax coloring. + +--sort Sort files by their name instead of preserving the original order. " exit 0 else @@ -131,7 +133,7 @@ die () exit $status } -options=`getopt -o p:P:RuU:cC:zh --long diff:,snapshot,no-timestamps,combine:,color:: -- "$@"` +options=`getopt -o p:P:RuU:cC:zh --long diff:,snapshot,no-timestamps,combine:,color::,sort -- "$@"` if [ $? -ne 0 ] then @@ -190,6 +192,9 @@ do --no-timestamps) QUILT_NO_DIFF_TIMESTAMPS=1 shift ;; + --sort) + opt_sort=1 + shift ;; --color) case "$2" in "" | always) @@ -302,7 +307,20 @@ do done exec 4>&- # close $tmp_files -files=( $(sort -u $tmp_files) ) + +if [ -z "$opt_sort" ] +then + files=( $( + awk ' + { if ($0 in seen) + next + seen[$0]=1 + print + } + ' $tmp_files) ) +else + files=( $(sort -u $tmp_files) ) +fi if [ -n "$opt_relative" ] then diff --git a/quilt/refresh.in b/quilt/refresh.in index 1e9fab1..679465f 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -19,7 +19,7 @@ fi usage() { - printf $"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] [patch]\n" + printf $"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--backup] [patch]\n" if [ x$1 = x-h ] then @@ -54,6 +54,8 @@ patch. --backup Create a backup copy of the old version of a patch as patch~. + +--sort Sort files by their name instead of preserving the original order. " exit 0 else @@ -70,7 +72,7 @@ die () exit $status } -options=`getopt -o p:uU:cC:fh --long no-timestamps,diffstat,backup -- "$@"` +options=`getopt -o p:uU:cC:fh --long no-timestamps,diffstat,backup,sort -- "$@"` if [ $? -ne 0 ] then @@ -106,6 +108,9 @@ do --backup) QUILT_BACKUP=1 shift ;; + --sort) + opt_sort=1 + shift ;; --) shift break ;; @@ -159,7 +164,14 @@ trap "die 1" SIGTERM tmp_patch=$(gen_tempfile) -for file in $(files_in_patch_ordered $patch) +if [ -z "$opt_sort" ] +then + files=( $(files_in_patch_ordered $patch) ) +else + files=( $(files_in_patch $patch | sort) ) +fi + +for file in "${files[@]}" do old_file=$(backup_file_name $patch $file) next_patch=$(next_patch_for_file $patch $file) diff --git a/scripts/patchfns.in b/scripts/patchfns.in index 8b58946..1ef7825 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -506,10 +506,16 @@ files_in_patch_ordered() } } END { + i = 1 for (file in files) { - if (!(file in printed)) - print file + if (!(file in printed)) { + new_files[i]=file + i++ + } } + n = asort(new_files) + for (i=1; i<=n; i++) + print new_files[i] } ' } diff --git a/test/fold.test b/test/fold.test index cdd2e5d..1b26924 100644 --- a/test/fold.test +++ b/test/fold.test @@ -36,18 +36,18 @@ $ quilt fold -q < patches/patch2.diff $ quilt diff | sed -e "s/\\t.*//" - > Index: d/dir/file3.txt - > =================================================================== - > --- /dev/null - > +++ d/dir/file3.txt - > @@ -0,0 +1 @@ - > +This is file3.txt. > Index: d/file1.txt > =================================================================== > --- /dev/null > +++ d/file1.txt > @@ -0,0 +1 @@ > +This is file1.txt. + > Index: d/dir/file3.txt + > =================================================================== + > --- /dev/null + > +++ d/dir/file3.txt + > @@ -0,0 +1 @@ + > +This is file3.txt. $ cd .. $ rm -rf d diff --git a/test/sort.test b/test/sort.test new file mode 100644 index 0000000..0e0a23f --- /dev/null +++ b/test/sort.test @@ -0,0 +1,52 @@ + $ mkdir d + $ cd d + + $ quilt new sort.diff + > Patch patches/sort.diff is now on top + + $ quilt add b c + > File b added to patch patches/sort.diff + > File c added to patch patches/sort.diff + + $ echo b > b + $ echo c > c + $ quilt refresh + > Refreshed patch patches/sort.diff + + $ quilt add a + > File a added to patch patches/sort.diff + + $ echo a > a + $ quilt files + > b + > c + > a + + $ quilt diff | grep ^Index + > Index: d/b + > Index: d/c + > Index: d/a + + $ quilt refresh + > Refreshed patch patches/sort.diff + + $ grep ^Index patches/sort.diff + > Index: d/b + > Index: d/c + > Index: d/a + + $ quilt diff --sort | grep ^Index + > Index: d/a + > Index: d/b + > Index: d/c + + $ quilt refresh --sort + > Refreshed patch patches/sort.diff + + $ grep ^Index patches/sort.diff + > Index: d/a + > Index: d/b + > Index: d/c + + $ cd .. + $ rm -rf d |