- Rename the ``remove'' command to ``revert'': this removes

  ambiguities with the delete command, and more closely matches
  what the command does.

13 files changed, 138 insertions, 122 deletions

diff --git a/po/de.po b/po/de.po
index ba82851..b734308 100644
--- a/po/de.po
+++ b/po/de.po
@@ -90,7 +90,7 @@ msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n"
 msgid "File %s is already in patch %s\\n"
 msgstr "Datei %s ist bereits in Patch $patch\\n"
 
-#: quilt/add.in:111 quilt/remove.in:82
+#: quilt/add.in:111 quilt/revert.in:83
 msgid "File %s modified by patch %s\\n"
 msgstr "Datei %s wird von Patch %s verändert\\n"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "Kein Patch %s\\n"
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:593
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:581
 msgid "Patch %s is currently applied\\n"
 msgstr "Patch %s ist momentan angewandt\\n"
 
@@ -612,8 +612,8 @@ msgid ""
 "Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ..."
 "\\n"
 msgstr ""
-"Verwendung: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] patchdatei ..."
-"\\n"
+"Verwendung: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] "
+"[patchdatei] ...\\n"
 
 #: quilt/import.in:25
 msgid ""
@@ -646,6 +646,9 @@ msgstr ""
 "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n"
 "\tentfernt werden sollen (Standard=1).\n"
 "\n"
+"-R\n"
+"\tPatch umgekehrt anwenden.\n"
+"\n"
 "-P patch\n"
 "\tPatch-Dateiname, den Quilt verwenden soll. Diese Option kann nur beim\n"
 "\tImport eines einzelnen Patches angegeben werden.\n"
@@ -923,11 +926,11 @@ msgstr ""
 "\n"
 "-v\tViele Meldungen ausgeben.\n"
 
-#: quilt/pop.in:98 quilt/scripts/patchfns.in:894
+#: quilt/pop.in:98 quilt/scripts/patchfns.in:882
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n"
 
-#: quilt/pop.in:122 quilt/scripts/patchfns.in:917
+#: quilt/pop.in:122 quilt/scripts/patchfns.in:905
 msgid "Failed to patch temporary files\\n"
 msgstr "Konnte temporäre Dateien nicht patchen\\n"
 
@@ -953,7 +956,7 @@ msgstr "Patch %s muss zuerst aktualisiert werden (Refresh).\\n"
 msgid "No patch removed\\n"
 msgstr "Kein Patch entfernt\\n"
 
-#: quilt/pop.in:267 quilt/scripts/patchfns.in:508
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:496
 msgid "No patches applied\\n"
 msgstr "Keine Patches angewandt\\n"
 
@@ -1224,39 +1227,6 @@ msgstr "Patch %s ist unverändert\\n"
 msgid "Refreshed patch %s\\n"
 msgstr "Patch %s aktualisiert\\n"
 
-#: quilt/remove.in:22
-msgid "Usage: quilt remove [-P patch] {file} ...\\n"
-msgstr "Verwendung: quilt remove [-P patch] {datei} ...\\n"
-
-#: quilt/remove.in:25
-msgid ""
-"\n"
-"Remove one or more files from the topmost or named patch.  Files that\n"
-"are modified by patches on top of the specified patch cannot be removed.\n"
-"\n"
-"-P patch\n"
-"\tRemove named files from the named patch.\n"
-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"
-"entfernt werden.\n"
-"\n"
-"-P patch\n"
-"\tPatch, aus dem Dateien entfernt werden sollen.\n"
-
-#: quilt/remove.in:73
-msgid "File %s is not in patch %s\\n"
-msgstr "Datei %s ist nicht in Patch %s\\n"
-
-#: 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:105
-msgid "File %s removed from patch %s\\n"
-msgstr "Datei %s aus Patch %s entfernt\\n"
-
 #: quilt/rename.in:22
 msgid "Usage: quilt rename [-P patch] new_name\\n"
 msgstr "Verwendung: quilt rename [-P patch] neuer_name\\n"
@@ -1287,6 +1257,40 @@ msgstr "Fehler beim Umbenennen von Patch %s auf %s\\n"
 msgid "Patch %s renamed to %s\\n"
 msgstr "Patch %s auf %s umbenannt\\n"
 
+#: quilt/revert.in:22
+msgid "Usage: quilt revert [-P patch] {file} ...\\n"
+msgstr "Verwendung: quilt revert [-P patch] {datei} ...\\n"
+
+#: quilt/revert.in:25
+msgid ""
+"\n"
+"Revert the changes to one or more files in the topmost or named patch.\n"
+"Changes in files that are modified by patches on top of the specified patch\n"
+"cannot be reverted.\n"
+"\n"
+"-P patch\n"
+"\tRevert changes in the named patch.\n"
+msgstr ""
+"\n"
+"Änderungen an den angegebenen Datei(en) im obersten oder angegebenen Patch\n"
+"zurücknehmen. Änderungen in Dateien, die durch Patches über dem angegebenen\n"
+"Patch verändert werden, können nicht zurückgenommen werden."
+"\n"
+"-P patch\n"
+"\tPatch, aus dem Dateien entfernt werden sollen.\n"
+
+#: quilt/revert.in:74
+msgid "File %s is not in patch %s\\n"
+msgstr "Datei %s ist nicht in Patch %s\\n"
+
+#: quilt/revert.in:92
+msgid "Failed to revert changed to %s in patch %s\\n"
+msgstr "Konnte Änderungen an %s in Patch %s nicht zurücknehmen\\n"
+
+#: quilt/revert.in:106
+msgid "Changes to %s in patch %s reverted\\n"
+msgstr "Änderungen an %s in Patch %s zurückgenommen\\n"
+
 #: quilt/scripts/edmail.in:83
 #, perl-format
 msgid "Display name `%s' contains unpaired parentheses\n"
@@ -1297,27 +1301,27 @@ msgstr "Anzeigename `%s' enthält eine unvollständige Klammerung\n"
 msgid "Delivery address `%s' is invalid\n"
 msgstr "Zustelladresse `%s' ist ungültig\n"
 
-#: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495
+#: quilt/scripts/patchfns.in:483
 msgid "No patches in series\\n"
 msgstr "Keine Patches in der series-Datei\\n"
 
-#: quilt/scripts/patchfns.in:544
+#: quilt/scripts/patchfns.in:532
 msgid "Patch %s is not in series\\n"
 msgstr "Patch %s ist nicht in der series-Datei\\n"
 
-#: quilt/scripts/patchfns.in:572
+#: quilt/scripts/patchfns.in:560
 msgid "Patch %s is not applied\\n"
 msgstr "Patch %s ist nicht angewandt\\n"
 
-#: quilt/scripts/patchfns.in:609
+#: quilt/scripts/patchfns.in:597
 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:631
+#: quilt/scripts/patchfns.in:619
 msgid "Patch %s does not exist\\n"
 msgstr "Patch %s existiert nicht\\n"
 
-#: quilt/scripts/patchfns.in:950
+#: quilt/scripts/patchfns.in:938
 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 "
@@ -1330,7 +1334,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\n"
 
-#: quilt/scripts/patchfns.in:1035
+#: quilt/scripts/patchfns.in:1023
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1545,3 +1549,6 @@ 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 "File %s removed from patch %s\\n"
+#~ msgstr "Datei %s aus Patch %s entfernt\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index 190b891..9d6457b 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -52,7 +52,7 @@ msgstr ""
 msgid "File %s is already in patch %s\\n"
 msgstr ""
 
-#: quilt/add.in:111 quilt/remove.in:82
+#: quilt/add.in:111 quilt/revert.in:83
 msgid "File %s modified by patch %s\\n"
 msgstr ""
 
@@ -820,55 +820,56 @@ msgstr ""
 msgid "Refreshed patch %s\\n"
 msgstr ""
 
-#: quilt/remove.in:22
-msgid "Usage: quilt remove [-P patch] {file} ...\\n"
+#: quilt/rename.in:22
+msgid "Usage: quilt rename [-P patch] new_name\\n"
 msgstr ""
 
-#: quilt/remove.in:25
+#: quilt/rename.in:25
 msgid ""
 "\n"
-"Remove one or more files from the topmost or named patch.  Files that\n"
-"are modified by patches on top of the specified patch cannot be removed.\n"
+"Rename the topmost or named patch.\n"
 "\n"
 "-P patch\n"
-"\tRemove named files from the named patch.\n"
+"\tPatch to rename.\n"
 msgstr ""
 
-#: quilt/remove.in:73
-msgid "File %s is not in patch %s\\n"
+#: quilt/rename.in:84
+msgid "Patch %s exists already, please choose a different name\\n"
 msgstr ""
 
-#: quilt/remove.in:91
-msgid "Failed to remove file %s from patch %s\\n"
+#: quilt/rename.in:98
+msgid "Renaming of patch %s to %s failed\\n"
 msgstr ""
 
-#: quilt/remove.in:105
-msgid "File %s removed from patch %s\\n"
+#: quilt/rename.in:104
+msgid "Patch %s renamed to %s\\n"
 msgstr ""
 
-#: quilt/rename.in:22
-msgid "Usage: quilt rename [-P patch] new_name\\n"
+#: quilt/revert.in:22
+msgid "Usage: quilt revert [-P patch] {file} ...\\n"
 msgstr ""
 
-#: quilt/rename.in:25
+#: quilt/revert.in:25
 msgid ""
 "\n"
-"Rename the topmost or named patch.\n"
+"Revert the changes to one or more files in the topmost or named patch.\n"
+"Changes in files that are modified by patches on top of the specified patch\n"
+"cannot be reverted.\n"
 "\n"
 "-P patch\n"
-"\tPatch to rename.\n"
+"\tRevert changes in the named patch.\n"
 msgstr ""
 
-#: quilt/rename.in:84
-msgid "Patch %s exists already, please choose a different name\\n"
+#: quilt/revert.in:74
+msgid "File %s is not in patch %s\\n"
 msgstr ""
 
-#: quilt/rename.in:98
-msgid "Renaming of patch %s to %s failed\\n"
+#: quilt/revert.in:92
+msgid "Failed to revert changed to %s in patch %s\\n"
 msgstr ""
 
-#: quilt/rename.in:104
-msgid "Patch %s renamed to %s\\n"
+#: quilt/revert.in:106
+msgid "Changes to %s in patch %s reverted\\n"
 msgstr ""
 
 #: quilt/scripts/edmail.in:83
diff --git a/quilt.changes b/quilt.changes
index 96916e4..6f8b93c 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Apr 27 13:52:00 CEST 2007 - agruen@suse.de
+
+- Rename the ``remove'' command to ``revert'': this removes
+  ambiguities with the delete command, and more closely matches
+  what the command does.
+
+-------------------------------------------------------------------
 Sun Apr 22 10:40:36 CEST 2007 - khali@linux-fr.org
 
 - quilt mail: Document the possibility to specifiy a patch range.
diff --git a/quilt/edit.in b/quilt/edit.in
index b9a84dd..27c34ce 100644
--- a/quilt/edit.in
+++ b/quilt/edit.in
@@ -71,7 +71,7 @@ for file in "$@"
 do
 	if ! [ -e "$SUBDIR$file" ]
 	then
-		quilt_command remove "$file"
+		quilt_command revert "$file"
 		status=1
 	fi
 done
diff --git a/quilt/remove.in b/quilt/revert.in
index a11db0a..3e79141 100644
--- a/quilt/remove.in
+++ b/quilt/revert.in
@@ -19,15 +19,16 @@ fi
 
 usage()
 {
-	printf $"Usage: quilt remove [-P patch] {file} ...\n"
+	printf $"Usage: quilt revert [-P patch] {file} ...\n"
 	if [ x$1 = x-h ]
 	then
 		printf $"
-Remove one or more files from the topmost or named patch.  Files that
-are modified by patches on top of the specified patch cannot be removed.
+Revert the changes to one or more files in the topmost or named patch.
+Changes in files that are modified by patches on top of the specified patch
+cannot be reverted.
 
 -P patch
-	Remove named files from the named patch.
+	Revert changes in the named patch.
 "
 		exit 0
 	else
@@ -88,7 +89,7 @@ do
 	# Restore file from backup
 	if ! $QUILT_LIB/backup-files -r -t -s -B $QUILT_PC/$patch/ $SUBDIR$file
 	then
-		printf $"Failed to remove file %s from patch %s\n" \
+		printf $"Failed to revert changed to %s in patch %s\n" \
 		       "$SUBDIR$file" "$(print_patch $patch)" >&2
 		status=1
 		continue
@@ -102,7 +103,7 @@ do
 		touch $QUILT_PC/$patch~refresh
 	fi
 
-	printf $"File %s removed from patch %s\n" \
+	printf $"Changes to %s in patch %s reverted\n" \
 	       "$SUBDIR$file" "$(print_patch $patch)"
 done
 exit $status
diff --git a/test/perms.test b/test/perms.test
index 501eb7d..29c3cfe 100644
--- a/test/perms.test
+++ b/test/perms.test
@@ -56,8 +56,8 @@ the backup file.
 	> Removing patch %{P}test2.diff
 	> Now at patch %{P}test.diff
 
-	$ quilt remove foo
-	> File foo removed from patch %{P}test.diff
+	$ quilt revert foo
+	> Changes to foo in patch %{P}test.diff reverted
 
 	$ ls -l foo | awk '{ print $1,$NF }'
 	> -rwx---r-- foo
diff --git a/test/remove2.test b/test/remove2.test
deleted file mode 100644
index 8d99910..0000000
--- a/test/remove2.test
+++ /dev/null
@@ -1,29 +0,0 @@
-	$ rm -rf d
-	$ mkdir -p d/patches
-	$ cd d
-
-	$ quilt new remove.patch
-	> Patch patches/remove.patch is now on top
-
-	$ quilt add foo bar baz
-	> File foo added to patch patches/remove.patch
-	> File bar added to patch patches/remove.patch
-	> File baz added to patch patches/remove.patch
-
-	$ echo foo > foo
-	$ echo bar > bar
-	$ echo baz > baz
-	$ quilt remove baz
-	> File baz removed from patch patches/remove.patch
-
-	$ quilt refresh
-	> Refreshed patch patches/remove.patch
-
-	$ quilt remove bar
-	> File bar removed from patch patches/remove.patch
-
-	$ quilt refresh
-	> Refreshed patch patches/remove.patch
-
-	$ cd ..
-	$ rm -rf d
diff --git a/test/remove.test b/test/revert.test
index 06c2f9c..cf7eae6 100644
--- a/test/remove.test
+++ b/test/revert.test
@@ -17,8 +17,8 @@
 	$ quilt refresh
 	> Refreshed patch patches/p.diff
 
-	$ quilt remove f
-	> File f removed from patch patches/p.diff
+	$ quilt revert f
+	> Changes to f in patch patches/p.diff reverted
 
 	$ quilt diff -z
 	$ quilt pop -qf
@@ -29,8 +29,8 @@
 	> Applying patch patches/p.diff
 	> Now at patch patches/p.diff
 
-	$ quilt remove g
-	> File g removed from patch patches/p.diff
+	$ quilt revert g
+	> Changes to g in patch patches/p.diff reverted
 
 	$ quilt diff -z
 	$ quilt pop -qf
@@ -41,8 +41,8 @@
 	> Applying patch patches/p.diff
 	> Now at patch patches/p.diff
 
-	$ quilt remove h
-	> File h removed from patch patches/p.diff
+	$ quilt revert h
+	> Changes to h in patch patches/p.diff reverted
 
 	$ quilt diff -z
 
diff --git a/test/revert2.test b/test/revert2.test
new file mode 100644
index 0000000..af86a93
--- /dev/null
+++ b/test/revert2.test
@@ -0,0 +1,29 @@
+	$ rm -rf d
+	$ mkdir -p d/patches
+	$ cd d
+
+	$ quilt new revert.patch
+	> Patch patches/revert.patch is now on top
+
+	$ quilt add foo bar baz
+	> File foo added to patch patches/revert.patch
+	> File bar added to patch patches/revert.patch
+	> File baz added to patch patches/revert.patch
+
+	$ echo foo > foo
+	$ echo bar > bar
+	$ echo baz > baz
+	$ quilt revert baz
+	> Changes to baz in patch patches/revert.patch reverted
+
+	$ quilt refresh
+	> Refreshed patch patches/revert.patch
+
+	$ quilt revert bar
+	> Changes to bar in patch patches/revert.patch reverted
+
+	$ quilt refresh
+	> Refreshed patch patches/revert.patch
+
+	$ cd ..
+	$ rm -rf d
diff --git a/test/snapshot.test b/test/snapshot.test
index f711066..51a8913 100644
--- a/test/snapshot.test
+++ b/test/snapshot.test
@@ -21,8 +21,8 @@
 	$ quilt fork
 	> Fork of patch %{P}snapshot created as %{P}snapshot-2
 
-	$ quilt remove g.txt
-	> File g.txt removed from patch %{P}snapshot-2
+	$ quilt revert g.txt
+	> Changes to g.txt in patch patches/snapshot-2 reverted
 
 	$ quilt add h.txt
 	> File h.txt added to patch %{P}snapshot-2
diff --git a/test/snapshot2.test b/test/snapshot2.test
index 0e25d79..8e1bc9e 100644
--- a/test/snapshot2.test
+++ b/test/snapshot2.test
@@ -21,8 +21,8 @@
 	$ quilt fork
 	> Fork of patch %{_P}snapshot created as %{_P}snapshot-2
 
-	$ quilt remove g.txt
-	> File d/g.txt removed from patch %{_P}snapshot-2
+	$ quilt revert g.txt
+	> Changes to d/g.txt in patch ../patches/snapshot-2 reverted
 
 	$ quilt add h.txt
 	> File d/h.txt added to patch %{_P}snapshot-2
diff --git a/test/subdir.test b/test/subdir.test
index ead1a22..7f2cac2 100644
--- a/test/subdir.test
+++ b/test/subdir.test
@@ -63,8 +63,8 @@
 	$ quilt refresh
 	> Refreshed patch %{_P}test.patch
 
-	$ quilt remove file2
-	> File subdir/file2 removed from patch %{_P}test.patch
+	$ quilt revert file2
+	> Changes to subdir/file2 in patch ../patches/test.patch reverted
 
 	$ quilt files
 	> subdir/file
diff --git a/test/three.test b/test/three.test
index 632a089..ca90e07 100644
--- a/test/three.test
+++ b/test/three.test
@@ -120,7 +120,7 @@
 	$ quilt unapplied patch1
 	> patches/patch2.diff
 
-	$ quilt remove f
+	$ quilt revert f
 	> No patches applied
 
 	$ quilt delete patch3.diff