Extract commands to a separate module: remove cmd_ prefix in imports

dvc/command/data_sync.py

@@ -3,7 +3,7 @@ import os
 
 from boto.s3.connection import S3Connection
 
-from dvc.command.cmd_base import CmdBase
+from dvc.command.base import CmdBase
 from dvc.logger import Logger
 from dvc.exceptions import DvcException
 from dvc.utils import run

dvc/command/import.py

@@ -4,8 +4,8 @@ import re
 import fasteners
 import requests
 
-from dvc.command.cmd_base import CmdBase
-from dvc.command.cmd_data_sync import sizeof_fmt
+from dvc.command.base import CmdBase
+from dvc.command.data_sync import sizeof_fmt
 from dvc.logger import Logger
 from dvc.exceptions import DvcException
 from dvc.state_file import StateFile

dvc/command/init.py

@@ -1,7 +1,7 @@
 import os
 from pathlib import Path
 
-from dvc.command.cmd_base import CmdBase
+from dvc.command.base import CmdBase
 from dvc.logger import Logger
 from dvc.config import Config
 from dvc.exceptions import DvcException

dvc/command/remove.py

@@ -3,7 +3,7 @@ import os
 import fasteners
 from boto.s3.connection import S3Connection
 
-from dvc.command.cmd_base import CmdBase
+from dvc.command.base import CmdBase
 from dvc.exceptions import DvcException
 from dvc.logger import Logger
 from dvc.utils import run

dvc/command/repro.py

@@ -2,8 +2,8 @@ import os
 
 import fasteners
 
-from dvc.command.cmd_base import CmdBase
-from dvc.command.cmd_run import CmdRun
+from dvc.command.base import CmdBase
+from dvc.command.run import CmdRun
 from dvc.logger import Logger
 from dvc.exceptions import DvcException
 from dvc.path.data_item import NotInDataDirError

dvc/command/run.py

@@ -5,7 +5,7 @@ import fasteners
 
 from dvc.path.data_item import NotInDataDirError
 from dvc.git_wrapper import GitWrapper
-from dvc.command.cmd_base import CmdBase
+from dvc.command.base import CmdBase
 from dvc.logger import Logger
 from dvc.exceptions import DvcException
 from dvc.repository_change import RepositoryChange

tests/test_cmd_data_remove.py

@@ -1,6 +1,6 @@
 import os
 
-from dvc.command.cmd_data_remove import CmdDataRemove, DataRemoveError
+from dvc.command.remove import CmdDataRemove, DataRemoveError
 from dvc.path.data_item import DataItemError
 from tests.basic_env import DirHierarchyEnvironment