From f772a6788d7aaadce272070715e478aece6be417 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@anarres>
Date: Tue, 20 Feb 2007 16:27:29 +0000
Subject: [PATCH] rename "reset" testbed command to "revert"

---
 doc/README.virtualisation-server | 2 +-
 runner/adt-run                   | 4 ++--
 virt-subproc/VirtSubproc.py      | 8 ++++----
 virt-subproc/adt-virt-xenlvm     | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/README.virtualisation-server b/doc/README.virtualisation-server
index 8bcdedf..1bb7766 100644
--- a/doc/README.virtualisation-server
+++ b/doc/README.virtualisation-server
@@ -76,7 +76,7 @@ Protocol
 
 
 * Command
-	reset
+	revert
 
   Restores the testbed, undoing all of the changes made so far.
   State: Open, remains Open.  Only available if the `revert'
diff --git a/runner/adt-run b/runner/adt-run
index a01649f..0200d34 100755
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -606,7 +606,7 @@ class Testbed:
 	if 'revert' in tb.caps and (tb.modified or
 	    [d for d in tb.deps_processed if d not in deps_new]):
 		tb._debug('reset **')
-		tb.command('reset')
+		tb.command('revert')
 		tb.blamed = []
 		for af in tb._ephemeral: af.invalidate(True)
 	binaries.publish()
@@ -748,7 +748,7 @@ class Restriction_breaks_testbed(Restriction):
  def __init__(r, rname, base):
 	if 'revert' not in testbed.caps:
 		raise Unsupported(f.lno,
-			'Test breaks testbed but testbed cannot reset')
+			'Test breaks testbed but testbed cannot revert')
 
 class Field_Restrictions(FieldBase):
  def parse(f):
diff --git a/virt-subproc/VirtSubproc.py b/virt-subproc/VirtSubproc.py
index 68fc8c3..2c5e4f6 100644
--- a/virt-subproc/VirtSubproc.py
+++ b/virt-subproc/VirtSubproc.py
@@ -107,12 +107,12 @@ def cmd_open(c, ce):
 	downtmp = caller.hook_open()
 	return [downtmp]
 
-def cmd_reset(c, ce):
+def cmd_revert(c, ce):
 	cmdnumargs(c, ce)
-	if not downtmp: bomb("`reset' when not open")
+	if not downtmp: bomb("`revert' when not open")
 	if not 'revert' in caller.hook_capabilities():
-		bomb("`reset' when `revert' not advertised")
-	caller.hook_reset()
+		bomb("`revert' when `revert' not advertised")
+	caller.hook_revert()
 
 def down_python_script(gobody, functions=''):
 	# Many things are made much harder by the inability of
diff --git a/virt-subproc/adt-virt-xenlvm b/virt-subproc/adt-virt-xenlvm
index a6c386d..c0f7e85 100755
--- a/virt-subproc/adt-virt-xenlvm
+++ b/virt-subproc/adt-virt-xenlvm
@@ -103,7 +103,7 @@ def do_close():
 	withholder.stdout.close()
 	rc = withholder.wait()
 	withholder = None
-	if rc: vsp.bomb("with-testbed failed when closing/resetting,"
+	if rc: vsp.bomb("with-testbed failed when closing/reverting,"
 			" code %d" % rc)
 
 def hook_forked_inchild():
@@ -116,8 +116,8 @@ def hook_open():
 	do_open()
 	return downtmp
 
-def hook_reset():
-	check_pause('reset')
+def hook_revert():
+	check_pause('revert')
 	do_close()
 	do_open()
 
-- 
2.30.2