src: renamed do_r* methods to do_repo_*, fixed imports

src/borg/archiver/repo_compress_cmd.py

@@ -89,7 +89,7 @@ def format_compression_spec(ctype, clevel, olevel):
 
 class RepoCompressMixIn:
     @with_repository(cache=False, manifest=True, compatibility=(Manifest.Operation.CHECK,))
-    def do_rcompress(self, args, repository, manifest):
+    def do_repo_compress(self, args, repository, manifest):
         """Repository (re-)compression"""
 
         def get_csettings(c):
@@ -186,12 +186,12 @@ class RepoCompressMixIn:
             "rcompress",
             parents=[common_parser],
             add_help=False,
-            description=self.do_rcompress.__doc__,
+            description=self.do_repo_compress.__doc__,
             epilog=rcompress_epilog,
             formatter_class=argparse.RawDescriptionHelpFormatter,
-            help=self.do_rcompress.__doc__,
+            help=self.do_repo_compress.__doc__,
         )
-        subparser.set_defaults(func=self.do_rcompress)
+        subparser.set_defaults(func=self.do_repo_compress)
 
         subparser.add_argument(
             "-C",

src/borg/archiver/repo_create_cmd.py

@@ -17,7 +17,7 @@ logger = create_logger()
 class RepoCreateMixIn:
     @with_repository(create=True, exclusive=True, manifest=False)
     @with_other_repository(manifest=True, compatibility=(Manifest.Operation.READ,))
-    def do_rcreate(self, args, repository, *, other_repository=None, other_manifest=None):
+    def do_repo_create(self, args, repository, *, other_repository=None, other_manifest=None):
         """Create a new, empty repository"""
         if args.storage_quota is not None:
             raise CommandError("storage-quota is not supported (yet?)")
@@ -195,12 +195,12 @@ class RepoCreateMixIn:
             "rcreate",
             parents=[common_parser],
             add_help=False,
-            description=self.do_rcreate.__doc__,
+            description=self.do_repo_create.__doc__,
             epilog=rcreate_epilog,
             formatter_class=argparse.RawDescriptionHelpFormatter,
             help="create a new, empty repository",
         )
-        subparser.set_defaults(func=self.do_rcreate)
+        subparser.set_defaults(func=self.do_repo_create)
         subparser.add_argument(
             "--other-repo",
             metavar="SRC_REPOSITORY",

src/borg/archiver/repo_delete_cmd.py

@@ -16,7 +16,7 @@ logger = create_logger()
 
 class RepoDeleteMixIn:
     @with_repository(exclusive=True, manifest=False)
-    def do_rdelete(self, args, repository):
+    def do_repo_delete(self, args, repository):
         """Delete a repository"""
         self.output_list = args.output_list
         dry_run = args.dry_run
@@ -106,12 +106,12 @@ class RepoDeleteMixIn:
             "rdelete",
             parents=[common_parser],
             add_help=False,
-            description=self.do_rdelete.__doc__,
+            description=self.do_repo_delete.__doc__,
             epilog=rdelete_epilog,
             formatter_class=argparse.RawDescriptionHelpFormatter,
             help="delete repository",
         )
-        subparser.set_defaults(func=self.do_rdelete)
+        subparser.set_defaults(func=self.do_repo_delete)
         subparser.add_argument("-n", "--dry-run", dest="dry_run", action="store_true", help="do not change repository")
         subparser.add_argument(
             "--list", dest="output_list", action="store_true", help="output verbose list of archives"

src/borg/archiver/repo_info_cmd.py

@@ -13,7 +13,7 @@ logger = create_logger()
 
 class RepoInfoMixIn:
     @with_repository(cache=True, compatibility=(Manifest.Operation.READ,))
-    def do_rinfo(self, args, repository, manifest, cache):
+    def do_repo_info(self, args, repository, manifest, cache):
         """Show repository infos"""
         key = manifest.key
         info = basic_json_data(manifest, cache=cache, extra={"security_dir": cache.security_manager.dir})
@@ -77,10 +77,10 @@ class RepoInfoMixIn:
             "rinfo",
             parents=[common_parser],
             add_help=False,
-            description=self.do_rinfo.__doc__,
+            description=self.do_repo_info.__doc__,
             epilog=rinfo_epilog,
             formatter_class=argparse.RawDescriptionHelpFormatter,
             help="show repository information",
         )
-        subparser.set_defaults(func=self.do_rinfo)
+        subparser.set_defaults(func=self.do_repo_info)
         subparser.add_argument("--json", action="store_true", help="format output as JSON")

src/borg/archiver/repo_list_cmd.py

@@ -15,7 +15,7 @@ logger = create_logger()
 
 class RepoListMixIn:
     @with_repository(compatibility=(Manifest.Operation.READ,))
-    def do_rlist(self, args, repository, manifest):
+    def do_repo_list(self, args, repository, manifest):
         """List the archives contained in a repository"""
         if args.format is not None:
             format = args.format
@@ -86,12 +86,12 @@ class RepoListMixIn:
             "rlist",
             parents=[common_parser],
             add_help=False,
-            description=self.do_rlist.__doc__,
+            description=self.do_repo_list.__doc__,
             epilog=rlist_epilog,
             formatter_class=argparse.RawDescriptionHelpFormatter,
             help="list repository contents",
         )
-        subparser.set_defaults(func=self.do_rlist)
+        subparser.set_defaults(func=self.do_repo_list)
         subparser.add_argument(
             "--short", dest="short", action="store_true", help="only print the archive names, nothing else"
         )

src/borg/archiver/repo_space_cmd.py

@@ -13,7 +13,7 @@ logger = create_logger()
 
 class RepoSpaceMixIn:
     @with_repository(lock=False, manifest=False)
-    def do_rspace(self, args, repository):
+    def do_repo_space(self, args, repository):
         """Manage reserved space in repository"""
         # we work without locking here because locks don't work with full disk.
         if args.reserve_space > 0:
@@ -87,12 +87,12 @@ class RepoSpaceMixIn:
             "rspace",
             parents=[common_parser],
             add_help=False,
-            description=self.do_rspace.__doc__,
+            description=self.do_repo_space.__doc__,
             epilog=rspace_epilog,
             formatter_class=argparse.RawDescriptionHelpFormatter,
             help="manage reserved space in a repository",
         )
-        subparser.set_defaults(func=self.do_rspace)
+        subparser.set_defaults(func=self.do_repo_space)
         subparser.add_argument(
             "--reserve",
             metavar="SPACE",