- quilt/diff.in, quilt/refresh.in: Add `-p ab' options which

  produce a/file and b/file filenams in headers instead of
  dir.orig/file and dir/file, similar to BK, git, hg patches.
- Only touch .pc/$patch/.timestamp when a path actually is being
  refreshed.

1 files changed, 65 insertions, 29 deletions

diff --git a/po/ja.po b/po/ja.po
index 6aef672..30e4fb0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -174,11 +174,11 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "次のパッチはありません\\n"
 
-#: quilt/delete.in:95 quilt/scripts/patchfns.in:442
+#: quilt/delete.in:95 quilt/scripts/patchfns.in:461
 msgid "No patches in series\\n"
 msgstr "シリーズに登録されているパッチがありません\\n"
 
-#: quilt/delete.in:101 quilt/scripts/patchfns.in:540
+#: quilt/delete.in:101 quilt/scripts/patchfns.in:559
 msgid "Patch %s is currently applied\\n"
 msgstr "パッチ %s は現在適用されています\\n"
 
@@ -209,6 +209,7 @@ msgstr ""
 "sort] [--color] [ファイル ...]\\n"
 
 #: quilt/diff.in:28
+#, fuzzy
 msgid ""
 "\n"
 "Produces a diff of the specified file(s) in the topmost or specified\n"
@@ -217,6 +218,10 @@ msgid ""
 "\n"
 "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n"
 "\n"
+"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n"
+"\toriginal and new filenames instead of the default\n"
+"\tdir.orig/file and dir/file names.\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"
@@ -295,37 +300,37 @@ msgstr ""
 "\n"
 "--sort\t順番を保持せず、名前順にファイルを並び換える。\n"
 
-#: quilt/diff.in:213
+#: quilt/diff.in:217
 msgid ""
 "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 "オプション \\`--combine'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n"
 
-#: quilt/diff.in:225
+#: quilt/diff.in:231
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr "-p%s でパッチの差分はとれません。-p0か -p1を指定してください\\n"
 
-#: quilt/diff.in:258 quilt/files.in:105
+#: quilt/diff.in:265 quilt/files.in:105
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n"
 
-#: quilt/diff.in:308 quilt/pop.in:98
+#: quilt/diff.in:315 quilt/pop.in:98
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n"
 
-#: quilt/diff.in:332 quilt/pop.in:122
+#: quilt/diff.in:339 quilt/pop.in:122
 msgid "Failed to patch temporary files\\n"
 msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n"
 
-#: quilt/diff.in:351
+#: quilt/diff.in:358
 msgid "File %s is not being modified\\n"
 msgstr "ファイル %s は変更されていません\\n"
 
-#: quilt/diff.in:371 quilt/refresh.in:177
+#: quilt/diff.in:378 quilt/refresh.in:184
 msgid "Diff failed, aborting\\n"
 msgstr "差分に失敗しました。異常終了します\\n"
 
-#: quilt/diff.in:378
+#: quilt/diff.in:385
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr "警告: 最近のパッチが、パッチ %s 内のファイルを変更しています\\n"
 
@@ -919,7 +924,7 @@ msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n"
 msgid "No patch removed\\n"
 msgstr "適用されているパッチはありません\\n"
 
-#: quilt/pop.in:267 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:474
 msgid "No patches applied\\n"
 msgstr "適用されているパッチはありません\\n"
 
@@ -1051,6 +1056,7 @@ msgstr ""
 "[パッチ]\\n"
 
 #: quilt/refresh.in:26
+#, fuzzy
 msgid ""
 "\n"
 "Refreshes the specified patch, or the topmost patch by default.\n"
@@ -1067,6 +1073,10 @@ msgid ""
 "\n"
 "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n"
 "\n"
+"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n"
+"\toriginal and new filenames instead of the default\n"
+"\tdir.orig/file and dir/file names.\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"
@@ -1132,33 +1142,33 @@ msgstr ""
 "--strip-trailing-whitespace\n"
 "\t末尾の空白文字を削除する。\n"
 
-#: quilt/refresh.in:149
+#: quilt/refresh.in:155
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "-p%s ではリフレッシュすることができません。-p0または -p1を指定してください\\n"
 
-#: quilt/refresh.in:183
+#: quilt/refresh.in:190
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "より最近のパッチがパッチ %s のファイルに変更を加えています。リフレッシュを実"
 "行する場合は -f オプションを使用してください。\\n"
 
-#: quilt/refresh.in:189
+#: quilt/refresh.in:196
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 "--strip-trailing-whitespace は影になっているファイルがある場合は使えません"
 
-#: quilt/refresh.in:195
+#: quilt/refresh.in:202
 msgid "Nothing in patch %s\\n"
 msgstr "パッチ %s にはなにも含まれていません\\n"
 
-#: quilt/refresh.in:272
+#: quilt/refresh.in:279
 msgid "Patch %s is unchanged\\n"
 msgstr "パッチ %s に変更はありません\\n"
 
-#: quilt/refresh.in:277
+#: quilt/refresh.in:285
 msgid "Refreshed patch %s\\n"
 msgstr "パッチ %s をリフレッシュしました\\n"
 
@@ -1249,24 +1259,24 @@ msgstr "ファイル %s が消えました!\n"
 msgid "Failed to rename %s to %s: %s\n"
 msgstr "パッチ %s から %sへの名前の変更に失敗しました: %s\n"
 
-#: quilt/scripts/patchfns.in:491
+#: quilt/scripts/patchfns.in:510
 msgid "Patch %s is not in series\\n"
 msgstr "パッチ %s は seriesの中にありません\\n"
 
-#: quilt/scripts/patchfns.in:519
+#: quilt/scripts/patchfns.in:538
 msgid "Patch %s is not applied\\n"
 msgstr "パッチ %s は適用されていません\\n"
 
-#: quilt/scripts/patchfns.in:556
+#: quilt/scripts/patchfns.in:575
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n"
 
-#: quilt/scripts/patchfns.in:578
+#: quilt/scripts/patchfns.in:597
 msgid "Patch %s does not exist\\n"
 msgstr "パッチ %s が存在しません\\n"
 
-#: quilt/scripts/patchfns.in:833
+#: quilt/scripts/patchfns.in:857
 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 "
@@ -1278,7 +1288,7 @@ msgstr ""
 "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
 "すべてのパッチを pop してください。\\n"
 
-#: quilt/scripts/patchfns.in:918
+#: quilt/scripts/patchfns.in:942
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1292,36 +1302,62 @@ msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
 msgstr "書式: %s [p num] [-n] [パッチ]\n"
 
 #: quilt/scripts/remove-trailing-ws.in:65
-#: quilt/scripts/remove-trailing-ws.in:92
+#: quilt/scripts/remove-trailing-ws.in:92 quilt/scripts/remove-ws.in:88
+#: quilt/scripts/remove-ws.in:124
 #, perl-format
 msgid "%s: I'm confused.\n"
 msgstr "%s: 混乱しました\n"
 
-#: quilt/scripts/remove-trailing-ws.in:113
+#: quilt/scripts/remove-trailing-ws.in:113 quilt/scripts/remove-ws.in:166
 #, perl-format
 msgid "Warning: trailing whitespace in line %s of %s\n"
 msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n"
 
-#: quilt/scripts/remove-trailing-ws.in:116
+#: quilt/scripts/remove-trailing-ws.in:116 quilt/scripts/remove-ws.in:169
 #, perl-format
 msgid "Warning: trailing whitespace in lines %s of %s\n"
 msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n"
 
-#: quilt/scripts/remove-trailing-ws.in:120
+#: quilt/scripts/remove-trailing-ws.in:120 quilt/scripts/remove-ws.in:180
 #, perl-format
 msgid "Removing trailing whitespace from line %s of %s\n"
 msgstr "%2$s の %1$s 行目末尾にある空白文字を削除します\n"
 
-#: quilt/scripts/remove-trailing-ws.in:123
+#: quilt/scripts/remove-trailing-ws.in:123 quilt/scripts/remove-ws.in:183
 #, perl-format
 msgid "Removing trailing whitespace from lines %s of %s\n"
 msgstr "%2$s の %1$s 行目末尾にある空白文字を削除します\n"
 
-#: quilt/scripts/remove-trailing-ws.in:143
+#: quilt/scripts/remove-trailing-ws.in:143 quilt/scripts/remove-ws.in:203
 #, perl-format
 msgid "Renaming %s to %s: %s\n"
 msgstr "%s から %s へ名前を変更しました: %s\n"
 
+#: quilt/scripts/remove-ws.in:45
+#, fuzzy, perl-format
+msgid "SYNOPSIS: %s [-p num] [-W tabwidth] [-n] [patch]\n"
+msgstr "書式: %s [p num] [-n] [パッチ]\n"
+
+#: quilt/scripts/remove-ws.in:159
+#, fuzzy, perl-format
+msgid "Warning: spaces used for indentation in line %s of %s\n"
+msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n"
+
+#: quilt/scripts/remove-ws.in:162
+#, fuzzy, perl-format
+msgid "Warning: spaces used for indentation in lines %s of %s\n"
+msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n"
+
+#: quilt/scripts/remove-ws.in:173
+#, fuzzy, perl-format
+msgid "Warning: converting space indentation to tabs in line %s of %s\n"
+msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n"
+
+#: quilt/scripts/remove-ws.in:176
+#, fuzzy, perl-format
+msgid "Warning: converting space indentation to tabs in lines %s of %s\n"
+msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n"
+
 #: quilt/series.in:22
 msgid "Usage: quilt series [-v]\\n"
 msgstr "使い方: quilt series [-v]\\n"