Removed --mirror-only feature and most checkpointing/recovery code

git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@250 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

4 files changed, 42 insertions, 77 deletions

diff --git a/rdiff-backup/testing/commontest.py b/rdiff-backup/testing/commontest.py
index 3636d9f..769187a 100644
--- a/rdiff-backup/testing/commontest.py
+++ b/rdiff-backup/testing/commontest.py
@@ -88,35 +88,30 @@ def InternalBackup(source_local, dest_local, src_dir, dest_dir,
 	Main.Backup(rpin, rpout)
 	Main.cleanup()
 
-def InternalMirror(source_local, dest_local, src_dir, dest_dir,
-				   write_data = None):
-	"""Mirror src to dest internally, like InternalBackup"""
-	remote_schema = '%s'
+def InternalMirror(source_local, dest_local, src_dir, dest_dir):
+	"""Mirror src to dest internally
 
-	if not source_local:
-		src_dir = "cd test1; python ../server.py ../%s::../%s" % \
-				  (SourceDir, src_dir)
-	if not dest_local:
-		dest_dir = "cd test2/tmp; python ../../server.py ../../%s::../../%s" \
-				   % (SourceDir, dest_dir)
+	like InternalBackup, but only mirror.  Do this through
+	InternalBackup, but then delete rdiff-backup-data directory.
 
-	rpin, rpout = cmd_schemas2rps([src_dir, dest_dir], remote_schema)
-	Main.misc_setup([rpin, rpout])
-	Main.backup_init_select(rpin, rpout)
-	if not rpout.lstat(): rpout.mkdir()
-	if write_data: # use rdiff-backup-data dir to checkpoint
-		data_dir = rpout.append("rdiff-backup-data")
-		if not data_dir.lstat(): data_dir.mkdir()
-		SetConnections.UpdateGlobal('rbdir', data_dir)
-	else: # just use root directory to hold checkpoints
-		SetConnections.UpdateGlobal('rbdir', rpout)
-	SetConnections.BackupInitConnections(rpin.conn, rpout.conn)
-
-	if write_data:
-		SaveState.init_filenames()
-		HighLevel.Mirror(rpin, rpout, Globals.rbdir.append("increments"))
-	else: HighLevel.Mirror(rpin, rpout)
-	Main.cleanup()
+	"""
+	# Save attributes of root to restore later
+	src_root = RPath(Globals.local_connection, src_dir)
+	dest_root = RPath(Globals.local_connection, dest_dir)
+	dest_rbdir = dest_root.append("rdiff-backup-data")
+	dest_incdir = dest_rbdir.append("increments")
+
+	# We need to create these directories or else failure because
+	# --force option not given.
+	if not dest_root.lstat(): dest_root.mkdir()
+	if not dest_rbdir.lstat(): dest_rbdir.mkdir()
+	if not dest_incdir.lstat(): dest_incdir.mkdir()
+	
+	InternalBackup(source_local, dest_local, src_dir, dest_dir)
+	dest_root.setdata()
+	dest_rbdir.delete()
+	# Restore old attributes
+	RPathStatic.copy_attribs(src_root, dest_root)
 
 def InternalRestore(mirror_local, dest_local, mirror_dir, dest_dir, time):
 	"""Restore mirror_dir to dest_dir at given time
diff --git a/rdiff-backup/testing/finaltest.py b/rdiff-backup/testing/finaltest.py
index 7e3c1df..9d1f9ae 100644
--- a/rdiff-backup/testing/finaltest.py
+++ b/rdiff-backup/testing/finaltest.py
@@ -198,23 +198,23 @@ class Final(PathSetter):
 		self.set_connections(None, None, "test2/tmp", "../../")
 		self.runtest()
 
-	def testMirroringLocal(self):
-		"""Run mirroring only everything remote"""
-		self.delete_tmpdirs()
-		self.set_connections(None, None, None, None)
-		self.exec_rb_extra_args(10000, "-m",
-								"testfiles/various_file_types",
-								"testfiles/output")
-		assert CompareRecursive(Local.vftrp, Local.rpout, exclude_rbdir = None)
-
-	def testMirroringRemote(self):
-		"""Run mirroring only everything remote"""
-		self.delete_tmpdirs()
-		self.set_connections("test1/", "../", "test2/tmp/", "../../")
-		self.exec_rb_extra_args(10000, "-m",
-								"testfiles/various_file_types",
-								"testfiles/output")
-		assert CompareRecursive(Local.vftrp, Local.rpout, exclude_rbdir = None)
+#	def testMirroringLocal(self):
+#		"""Run mirroring only everything remote"""
+#		self.delete_tmpdirs()
+#		self.set_connections(None, None, None, None)
+#		self.exec_rb_extra_args(10000, "-m",
+#								"testfiles/various_file_types",
+#								"testfiles/output")
+#		assert CompareRecursive(Local.vftrp, Local.rpout, exclude_rbdir = None)
+
+#	def testMirroringRemote(self):
+#		"""Run mirroring only everything remote"""
+#		self.delete_tmpdirs()
+#		self.set_connections("test1/", "../", "test2/tmp/", "../../")
+#		self.exec_rb_extra_args(10000, "-m",
+#								"testfiles/various_file_types",
+#								"testfiles/output")
+#		assert CompareRecursive(Local.vftrp, Local.rpout, exclude_rbdir = None)
 
 	def testProcRemote(self):
 		"""Test mirroring proc"""
diff --git a/rdiff-backup/testing/highleveltest.py b/rdiff-backup/testing/highleveltest.py
index 1054f2b..92490a4 100644
--- a/rdiff-backup/testing/highleveltest.py
+++ b/rdiff-backup/testing/highleveltest.py
@@ -24,16 +24,5 @@ class RemoteMirrorTest(unittest.TestCase):
 		MirrorTest(1, 1, ['testfiles/increment1', 'testfiles/increment2',
 						  'testfiles/increment3', 'testfiles/increment4'])
 
-	def testMirrorWithCheckpointing(self):
-		"""Like testMirror but this time checkpoint"""
-		MirrorTest(None, None, ["testfiles/increment1"], 1)
-
-	def testMirrorWithCheckpointing2(self):
-		"""Larger data set"""
-		MirrorTest(1, None, ['testfiles/increment1', 'testfiles/increment2',
-							 'testfiles/increment3', 'testfiles/increment4'],
-				   1)
-
-
 
 if __name__ == "__main__": unittest.main()
diff --git a/rdiff-backup/testing/regressiontest.py b/rdiff-backup/testing/regressiontest.py
index a132020..196d5ae 100644
--- a/rdiff-backup/testing/regressiontest.py
+++ b/rdiff-backup/testing/regressiontest.py
@@ -292,23 +292,6 @@ class MirrorTest(PathSetter):
 		self.setPathnames('test1', '../', 'test2/tmp', '../../')
 		self.run_partial_test()
 
-	def testNopermsLocal(self):
-		"Test mirroring a directory that has no permissions"
-		self.setPathnames(None, None, None, None)
-		Time.setcurtime()
-		SaveState.init_filenames()
-		self.Mirror(self.noperms, self.noperms_out, None)
-		# Can't compare because we don't have the permissions to do it right
-		#assert CompareRecursive(Local.noperms, Local.noperms_out)
-
-	def testNopermsRemote(self):
-		"No permissions mirroring (remote)"
-		self.setPathnames('test1', '../', 'test2/tmp', '../../')
-		Time.setcurtime()
-		SaveState.init_filenames()
-		self.Mirror(self.noperms, self.noperms_out, None)
-		#assert CompareRecursive(Local.noperms, Local.noperms_out)
-
 	def testPermSkipLocal(self):
 		"""Test to see if rdiff-backup will skip unreadable files"""
 		self.setPathnames(None, None, None, None)
@@ -418,13 +401,11 @@ class MirrorTest(PathSetter):
 		self.Mirror(self.inc2rp, self.rpout)
 		assert CompareRecursive(Local.inc2rp, Local.rpout)
 
-	def Mirror(self, rpin, rpout, write_increments = 1):
+	def Mirror(self, rpin, rpout):
 		"""Like HighLevel.Mirror, but run misc_setup first"""
 		Main.misc_setup([rpin, rpout])
 		Main.backup_init_select(rpin, rpout)
-		if write_increments:
-			HighLevel.Mirror(rpin, rpout,
-							 rpout.append_path("rdiff-backup-data/increments"))
-		else: HighLevel.Mirror(rpin, rpout)
+		HighLevel.Mirror(rpin, rpout,
+						 rpout.append_path("rdiff-backup-data/increments"))
 
 if __name__ == "__main__": unittest.main()