archiver modules: rename to *_cmd[s]

this was already required for list_cmd (due to "list"
being a builtin), now renamed all else also.

src/borg/archiver/__init__.py

@@ -62,31 +62,31 @@ def get_func(args):
     raise Exception("expected func attributes not found")
 
 
-from .benchmarks import BenchmarkMixIn
-from .check import CheckMixIn
-from .compact import CompactMixIn
-from .config import ConfigMixIn
-from .create import CreateMixIn
-from .debug import DebugMixIn
-from .delete import DeleteMixIn
-from .diff import DiffMixIn
-from .extract import ExtractMixIn
-from .help import HelpMixIn
-from .info import InfoMixIn
-from .keys import KeysMixIn
+from .benchmark_cmd import BenchmarkMixIn
+from .check_cmd import CheckMixIn
+from .compact_cmd import CompactMixIn
+from .config_cmd import ConfigMixIn
+from .create_cmd import CreateMixIn
+from .debug_cmd import DebugMixIn
+from .delete_cmd import DeleteMixIn
+from .diff_cmd import DiffMixIn
+from .extract_cmd import ExtractMixIn
+from .help_cmd import HelpMixIn
+from .info_cmd import InfoMixIn
+from .key_cmds import KeysMixIn
 from .list_cmd import ListMixIn
-from .locks import LocksMixIn
-from .mount import MountMixIn
-from .prune import PruneMixIn
-from .recreate import RecreateMixIn
-from .rename import RenameMixIn
-from .rcreate import RCreateMixIn
-from .rinfo import RInfoMixIn
-from .rdelete import RDeleteMixIn
-from .rlist import RListMixIn
-from .serve import ServeMixIn
-from .tar import TarMixIn
-from .transfer import TransferMixIn
+from .lock_cmds import LocksMixIn
+from .mount_cmds import MountMixIn
+from .prune_cmd import PruneMixIn
+from .recreate_cmd import RecreateMixIn
+from .rename_cmd import RenameMixIn
+from .rcreate_cmd import RCreateMixIn
+from .rinfo_cmd import RInfoMixIn
+from .rdelete_cmd import RDeleteMixIn
+from .rlist_cmd import RListMixIn
+from .serve_cmd import ServeMixIn
+from .tar_cmds import TarMixIn
+from .transfer_cmd import TransferMixIn
 
 
 class Archiver(
@@ -284,7 +284,7 @@ class Archiver(
                 setattr(args, dest, option_value)
 
     def build_parser(self):
-        from .common import define_common_options
+        from ._common import define_common_options
 
         parser = argparse.ArgumentParser(prog=self.prog, description="Borg - Deduplicated Backups", add_help=False)
         # paths and patterns must have an empty list as default everywhere

src/borg/archiver/benchmark_cmd.py

@@ -218,7 +218,7 @@ class BenchmarkMixIn:
 
     def build_parser_benchmarks(self, subparsers, common_parser, mid_common_parser):
 
-        from .common import process_epilog
+        from ._common import process_epilog
 
         benchmark_epilog = process_epilog("These commands do various benchmarks.")
 

src/borg/archiver/check_cmd.py

@@ -1,5 +1,5 @@
 import argparse
-from .common import with_repository
+from ._common import with_repository
 from ..archive import ArchiveChecker
 from ..constants import *  # NOQA
 from ..helpers import EXIT_SUCCESS, EXIT_WARNING, EXIT_ERROR
@@ -64,8 +64,8 @@ class CheckMixIn:
 
     def build_parser_check(self, subparsers, common_parser, mid_common_parser):
 
-        from .common import process_epilog
-        from .common import define_archive_filters_group
+        from ._common import process_epilog
+        from ._common import define_archive_filters_group
 
         check_epilog = process_epilog(
             """

src/borg/archiver/compact_cmd.py

@@ -1,6 +1,6 @@
 import argparse
 
-from .common import with_repository
+from ._common import with_repository
 from ..constants import *  # NOQA
 from ..helpers import EXIT_SUCCESS
 from ..manifest import Manifest
@@ -23,7 +23,7 @@ class CompactMixIn:
 
     def build_parser_compact(self, subparsers, common_parser, mid_common_parser):
 
-        from .common import process_epilog
+        from ._common import process_epilog
 
         compact_epilog = process_epilog(
             """

src/borg/archiver/config_cmd.py

@@ -3,7 +3,7 @@ import argparse
 import configparser
 from binascii import unhexlify
 
-from .common import with_repository
+from ._common import with_repository
 from ..cache import Cache, assert_secure
 from ..constants import *  # NOQA
 from ..helpers import EXIT_SUCCESS, EXIT_WARNING
@@ -151,7 +151,7 @@ class ConfigMixIn:
 
     def build_parser_config(self, subparsers, common_parser, mid_common_parser):
 
-        from .common import process_epilog
+        from ._common import process_epilog
 
         config_epilog = process_epilog(
             """

src/borg/archiver/create_cmd.py

@@ -8,7 +8,7 @@ import time
 from datetime import datetime
 from io import TextIOWrapper
 
-from .common import with_repository, Highlander
+from ._common import with_repository, Highlander
 from .. import helpers
 from ..archive import Archive, is_special
 from ..archive import BackupError, BackupOSError, backup_io, OsOpen, stat_update_check
@@ -473,8 +473,8 @@ class CreateMixIn:
             self.print_file_status(status, path)
 
     def build_parser_create(self, subparsers, common_parser, mid_common_parser):
-        from .common import process_epilog
-        from .common import define_exclusion_group
+        from ._common import process_epilog
+        from ._common import define_exclusion_group
 
         create_epilog = process_epilog(
             """

src/borg/archiver/debug_cmd.py

@@ -17,8 +17,8 @@ from ..manifest import Manifest
 from ..platform import get_process_id
 from ..repository import Repository, LIST_SCAN_LIMIT, TAG_PUT, TAG_DELETE, TAG_COMMIT
 
-from .common import with_repository
-from .common import process_epilog
+from ._common import with_repository
+from ._common import process_epilog
 
 
 class DebugMixIn:

src/borg/archiver/delete_cmd.py

@@ -1,7 +1,7 @@
 import argparse
 import logging
 
-from .common import with_repository
+from ._common import with_repository
 from ..archive import Archive, Statistics
 from ..cache import Cache
 from ..constants import *  # NOQA
@@ -103,7 +103,7 @@ class DeleteMixIn:
         return self.exit_code
 
     def build_parser_delete(self, subparsers, common_parser, mid_common_parser):
-        from .common import process_epilog, define_archive_filters_group
+        from ._common import process_epilog, define_archive_filters_group
 
         delete_epilog = process_epilog(
             """

src/borg/archiver/diff_cmd.py

@@ -1,7 +1,7 @@
 import argparse
 import json
 
-from .common import with_repository, with_archive, build_matcher
+from ._common import with_repository, with_archive, build_matcher
 from ..archive import Archive
 from ..constants import *  # NOQA
 from ..helpers import archivename_validator
@@ -59,8 +59,8 @@ class DiffMixIn:
 
     def build_parser_diff(self, subparsers, common_parser, mid_common_parser):
 
-        from .common import process_epilog
-        from .common import define_exclusion_group
+        from ._common import process_epilog
+        from ._common import define_exclusion_group
 
         diff_epilog = process_epilog(
             """

src/borg/archiver/extract_cmd.py

@@ -4,8 +4,8 @@ import logging
 import os
 import stat
 
-from .common import with_repository, with_archive
-from .common import build_filter, build_matcher
+from ._common import with_repository, with_archive
+from ._common import build_filter, build_matcher
 from ..archive import BackupError, BackupOSError
 from ..constants import *  # NOQA
 from ..helpers import NameSpec
@@ -110,8 +110,8 @@ class ExtractMixIn:
 
     def build_parser_extract(self, subparsers, common_parser, mid_common_parser):
 
-        from .common import process_epilog
-        from .common import define_exclusion_group
+        from ._common import process_epilog
+        from ._common import define_exclusion_group
 
         extract_epilog = process_epilog(
             """

src/borg/archiver/info_cmd.py

@@ -3,7 +3,7 @@ import shlex
 import textwrap
 from datetime import timedelta
 
-from .common import with_repository
+from ._common import with_repository
 from ..archive import Archive
 from ..constants import *  # NOQA
 from ..helpers import remove_surrogates, format_timedelta, json_print, basic_json_data
@@ -73,7 +73,7 @@ class InfoMixIn:
         return self.exit_code
 
     def build_parser_info(self, subparsers, common_parser, mid_common_parser):
-        from .common import process_epilog, define_archive_filters_group
+        from ._common import process_epilog, define_archive_filters_group
 
         info_epilog = process_epilog(
             """

src/borg/archiver/key_cmds.py

@@ -8,7 +8,7 @@ from ..crypto.key import AESOCBKeyfileKey, CHPOKeyfileKey, Blake2AESOCBKeyfileKe
 from ..crypto.keymanager import KeyManager
 from ..manifest import Manifest
 
-from .common import with_repository
+from ._common import with_repository
 
 from ..logger import create_logger
 
@@ -128,7 +128,7 @@ class KeysMixIn:
 
     def build_parser_keys(self, subparsers, common_parser, mid_common_parser):
 
-        from .common import process_epilog
+        from ._common import process_epilog
 
         subparser = subparsers.add_parser(
             "key",

src/borg/archiver/list_cmd.py

@@ -2,7 +2,7 @@ import argparse
 import textwrap
 import sys
 
-from .common import with_repository, build_matcher
+from ._common import with_repository, build_matcher
 from ..archive import Archive
 from ..cache import Cache
 from ..constants import *  # NOQA
@@ -45,7 +45,7 @@ class ListMixIn:
         return self.exit_code
 
     def build_parser_list(self, subparsers, common_parser, mid_common_parser):
-        from .common import process_epilog, define_exclusion_group
+        from ._common import process_epilog, define_exclusion_group
 
         list_epilog = (
             process_epilog(

src/borg/archiver/lock_cmds.py

@@ -1,7 +1,7 @@
 import argparse
 import subprocess
 
-from .common import with_repository
+from ._common import with_repository
 from ..cache import Cache
 from ..constants import *  # NOQA
 from ..helpers import prepare_subprocess_env
@@ -52,7 +52,7 @@ class LocksMixIn:
 
     def build_parser_locks(self, subparsers, common_parser, mid_common_parser):
 
-        from .common import process_epilog
+        from ._common import process_epilog
 
         break_lock_epilog = process_epilog(
             """

src/borg/archiver/mount_cmds.py

@@ -1,7 +1,7 @@
 import argparse
 import os
 
-from .common import with_repository, Highlander
+from ._common import with_repository, Highlander
 from ..constants import *  # NOQA
 from ..helpers import EXIT_ERROR
 from ..helpers import umount
@@ -49,7 +49,7 @@ class MountMixIn:
         return umount(args.mountpoint)
 
     def build_parser_mount_umount(self, subparsers, common_parser, mid_common_parser):
-        from .common import process_epilog
+        from ._common import process_epilog
 
         mount_epilog = process_epilog(
             """
@@ -154,7 +154,7 @@ class MountMixIn:
         return parser
 
     def _define_borg_mount(self, parser):
-        from .common import define_exclusion_group, define_archive_filters_group
+        from ._common import define_exclusion_group, define_archive_filters_group
 
         parser.set_defaults(func=self.do_mount)
         parser.add_argument(

src/borg/archiver/prune_cmd.py

@@ -5,7 +5,7 @@ import logging
 from operator import attrgetter
 import re
 
-from .common import with_repository
+from ._common import with_repository
 from ..archive import Archive, Statistics
 from ..cache import Cache
 from ..constants import *  # NOQA
@@ -173,8 +173,8 @@ class PruneMixIn:
 
     def build_parser_prune(self, subparsers, common_parser, mid_common_parser):
 
-        from .common import process_epilog
-        from .common import define_archive_filters_group
+        from ._common import process_epilog
+        from ._common import define_archive_filters_group
 
         prune_epilog = process_epilog(
             """

src/borg/archiver/rcreate_cmd.py

@@ -1,6 +1,6 @@
 import argparse
 
-from .common import with_repository, with_other_repository
+from ._common import with_repository, with_other_repository
 from ..cache import Cache
 from ..constants import *  # NOQA
 from ..crypto.key import key_creator, key_argument_names, tam_required_file
@@ -49,7 +49,7 @@ class RCreateMixIn:
         return self.exit_code
 
     def build_parser_rcreate(self, subparsers, common_parser, mid_common_parser):
-        from .common import process_epilog
+        from ._common import process_epilog
 
         rcreate_epilog = process_epilog(
             """

src/borg/archiver/rdelete_cmd.py

@@ -1,6 +1,6 @@
 import argparse
 
-from .common import with_repository
+from ._common import with_repository
 from ..cache import Cache, SecurityManager
 from ..constants import *  # NOQA
 from ..helpers import EXIT_ERROR
@@ -91,7 +91,7 @@ class RDeleteMixIn:
 
     def build_parser_rdelete(self, subparsers, common_parser, mid_common_parser):
 
-        from .common import process_epilog
+        from ._common import process_epilog
 
         rdelete_epilog = process_epilog(
             """

src/borg/archiver/recreate_cmd.py

@@ -1,7 +1,7 @@
 import argparse
 
-from .common import with_repository, Highlander
-from .common import build_matcher
+from ._common import with_repository, Highlander
+from ._common import build_matcher
 from ..archive import ArchiveRecreater
 from ..constants import *  # NOQA
 from ..compress import CompressionSpec
@@ -63,8 +63,8 @@ class RecreateMixIn:
         return self.exit_code
 
     def build_parser_recreate(self, subparsers, common_parser, mid_common_parser):
-        from .common import process_epilog
-        from .common import define_exclusion_group, define_archive_filters_group
+        from ._common import process_epilog
+        from ._common import define_exclusion_group, define_archive_filters_group
 
         recreate_epilog = process_epilog(
             """

src/borg/archiver/rename_cmd.py

@@ -1,6 +1,6 @@
 import argparse
 
-from .common import with_repository, with_archive
+from ._common import with_repository, with_archive
 from ..constants import *  # NOQA
 from ..helpers import archivename_validator
 from ..manifest import Manifest
@@ -22,7 +22,7 @@ class RenameMixIn:
         return self.exit_code
 
     def build_parser_rename(self, subparsers, common_parser, mid_common_parser):
-        from .common import process_epilog
+        from ._common import process_epilog
 
         rename_epilog = process_epilog(
             """

src/borg/archiver/rinfo_cmd.py

@@ -1,7 +1,7 @@
 import argparse
 import textwrap
 
-from .common import with_repository
+from ._common import with_repository
 from ..constants import *  # NOQA
 from ..helpers import bin_to_hex, json_print, basic_json_data
 from ..manifest import Manifest
@@ -54,7 +54,7 @@ class RInfoMixIn:
         return self.exit_code
 
     def build_parser_rinfo(self, subparsers, common_parser, mid_common_parser):
-        from .common import process_epilog
+        from ._common import process_epilog
 
         rinfo_epilog = process_epilog(
             """

src/borg/archiver/rlist_cmd.py

@@ -2,7 +2,7 @@ import argparse
 import textwrap
 import sys
 
-from .common import with_repository
+from ._common import with_repository
 from ..constants import *  # NOQA
 from ..helpers import BaseFormatter, ArchiveFormatter, json_print, basic_json_data
 from ..manifest import Manifest
@@ -38,7 +38,7 @@ class RListMixIn:
         return self.exit_code
 
     def build_parser_rlist(self, subparsers, common_parser, mid_common_parser):
-        from .common import process_epilog, define_archive_filters_group
+        from ._common import process_epilog, define_archive_filters_group
 
         rlist_epilog = (
             process_epilog(

src/borg/archiver/serve_cmd.py

@@ -22,7 +22,7 @@ class ServeMixIn:
         return EXIT_SUCCESS
 
     def build_parser_serve(self, subparsers, common_parser, mid_common_parser):
-        from .common import process_epilog
+        from ._common import process_epilog
 
         serve_epilog = process_epilog(
             """

src/borg/archiver/tar_cmds.py

@@ -24,8 +24,8 @@ from ..helpers import basic_json_data, json_print
 from ..helpers import log_multi
 from ..manifest import Manifest
 
-from .common import with_repository, with_archive, Highlander, define_exclusion_group
-from .common import build_matcher, build_filter
+from ._common import with_repository, with_archive, Highlander, define_exclusion_group
+from ._common import build_matcher, build_filter
 
 from ..logger import create_logger
 
@@ -336,7 +336,7 @@ class TarMixIn:
 
     def build_parser_tar(self, subparsers, common_parser, mid_common_parser):
 
-        from .common import process_epilog
+        from ._common import process_epilog
 
         export_tar_epilog = process_epilog(
             """

src/borg/archiver/transfer_cmd.py

@@ -1,6 +1,6 @@
 import argparse
 
-from .common import with_repository, with_other_repository
+from ._common import with_repository, with_other_repository
 from ..archive import Archive
 from ..constants import *  # NOQA
 from ..crypto.key import uses_same_id_hash, uses_same_chunker_secret
@@ -107,8 +107,8 @@ class TransferMixIn:
 
     def build_parser_transfer(self, subparsers, common_parser, mid_common_parser):
 
-        from .common import process_epilog
-        from .common import define_archive_filters_group
+        from ._common import process_epilog
+        from ._common import define_archive_filters_group
 
         transfer_epilog = process_epilog(
             """

src/borg/fuse.py

@@ -35,7 +35,7 @@ from .logger import create_logger
 logger = create_logger()
 
 from .crypto.low_level import blake2b_128
-from .archiver.common import build_matcher, build_filter
+from .archiver._common import build_matcher, build_filter
 from .archive import Archive, get_item_uid_gid
 from .hashindex import FuseVersionsIndex
 from .helpers import daemonize, daemonizing, signal_handler, format_file_size

src/borg/testsuite/archiver.py

@@ -29,7 +29,7 @@ import borg.helpers.errors
 from .. import xattr, helpers, platform
 from ..archive import Archive, ChunkBuffer
 from ..archiver import Archiver, PURE_PYTHON_MSGPACK_WARNING
-from ..archiver.common import build_filter
+from ..archiver._common import build_filter
 from ..cache import Cache, LocalCache
 from ..chunker import has_seek_hole
 from ..constants import *  # NOQA

src/borg/testsuite/helpers.py

@@ -10,7 +10,7 @@ from io import StringIO, BytesIO
 
 import pytest
 
-from ..archiver.prune import prune_within, prune_split
+from ..archiver.prune_cmd import prune_within, prune_split
 from .. import platform
 from ..constants import MAX_DATA_SIZE
 from ..helpers import Location