From 195545075ae7492cfc07fd531daf294fce2bfffe Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 26 Jul 2015 17:38:16 +0200
Subject: [PATCH] repo delete: add destroy to allowed rpc methods, fixes issue
 #114

also: add test, automate YES confirmation for testing
---
 borg/archiver.py           | 12 +++++++-----
 borg/remote.py             |  1 +
 borg/testsuite/archiver.py | 10 ++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/borg/archiver.py b/borg/archiver.py
index 6275edf22..84e568e73 100644
--- a/borg/archiver.py
+++ b/borg/archiver.py
@@ -288,11 +288,13 @@ Type "Yes I am sure" if you understand this and want to continue.\n""")
             print("You requested to completely DELETE the repository *including* all archives it contains:")
             for archive_info in manifest.list_archive_infos(sort_by='ts'):
                 print(format_archive(archive_info))
-            print("""Type "YES" if you understand this and want to continue.\n""")
-            if input('Do you want to continue? ') == 'YES':
-                repository.destroy()
-                cache.destroy()
-                print("Repository and corresponding cache were deleted.")
+            while not os.environ.get('BORG_CHECK_I_KNOW_WHAT_I_AM_DOING'):
+                print("""Type "YES" if you understand this and want to continue.\n""")
+                if input('Do you want to continue? ') == 'YES':
+                    break
+            repository.destroy()
+            cache.destroy()
+            print("Repository and corresponding cache were deleted.")
         return self.exit_code
 
     def do_mount(self, args):
diff --git a/borg/remote.py b/borg/remote.py
index 5da5f9cf8..afec54710 100644
--- a/borg/remote.py
+++ b/borg/remote.py
@@ -34,6 +34,7 @@ class RepositoryServer:
         'check',
         'commit',
         'delete',
+        'destroy',
         'get',
         'list',
         'negotiate',
diff --git a/borg/testsuite/archiver.py b/borg/testsuite/archiver.py
index 29c6ac1f7..35f8171d9 100644
--- a/borg/testsuite/archiver.py
+++ b/borg/testsuite/archiver.py
@@ -394,6 +394,16 @@ class ArchiverTestCase(ArchiverTestCaseBase):
         repository = Repository(self.repository_path)
         self.assert_equal(len(repository), 1)
 
+    def test_delete_repo(self):
+        self.create_regular_file('file1', size=1024 * 80)
+        self.create_regular_file('dir2/file2', size=1024 * 80)
+        self.cmd('init', self.repository_location)
+        self.cmd('create', self.repository_location + '::test', 'input')
+        self.cmd('create', self.repository_location + '::test.2', 'input')
+        self.cmd('delete', self.repository_location)
+        # Make sure the repo is gone
+        self.assertFalse(os.path.exists(self.repository_path))
+
     def test_corrupted_repository(self):
         self.cmd('init', self.repository_location)
         self.create_src_archive('test')