pyinstaller: declare dvc_ssh as hidden import (#9840)

Likely with removal of dvc-machine pyinstaller stopped picking up dvc_ssh automatically, so we need to declare it explicitly just like the rest of plugins.

dvc/__pyinstaller/hook-dvc.py

@@ -22,6 +22,7 @@ hiddenimports = [
     "dvc_hdfs",
     "dvc_oss",
     "dvc_s3",
+    "dvc_ssh",
     "dvc_webdav",
     "dvc_webhdfs",
     # https://github.com/pypa/setuptools/issues/1963

dvc/cli/parser.py

@@ -31,7 +31,6 @@ from dvc.commands import (
     install,
     ls,
     ls_url,
-    machine,
     metrics,
     move,
     params,
@@ -89,7 +88,6 @@ COMMANDS = [
     stage,
     experiments,
     check_ignore,
-    machine,
     data,
 ]
 

dvc/commands/experiments/ls.py

@@ -23,15 +23,22 @@ class CmdExperimentsList(CmdBase):
             git_remote=git_remote,
         )
 
+        from dvc.repo.experiments.utils import describe
+        from dvc.scm import Git
+
+        if name_only or sha_only:
+            names = {}
+        else:
+            assert isinstance(self.repo.scm, Git)
+            names = describe(
+                self.repo.scm,
+                (baseline for baseline in exps),
+                logger=logger,
+            )
+
         for baseline in exps:
             if not (name_only or sha_only):
-                tag_base = "refs/tags/"
-                branch_base = "refs/heads/"
-                name = baseline[:7]
-                if baseline.startswith(tag_base):
-                    name = baseline[len(tag_base) :]
-                elif baseline.startswith(branch_base):
-                    name = baseline[len(branch_base) :]
+                name = names.get(baseline) or baseline[:7]
                 ui.write(f"{name}:")
             for exp_name, rev in exps[baseline]:
                 if name_only:

dvc/commands/experiments/run.py

@@ -17,7 +17,6 @@ class CmdExperimentsRun(CmdRepro):
             jobs=self.args.jobs,
             params=self.args.set_param,
             tmp_dir=self.args.tmp_dir,
-            machine=self.args.machine,
             copy_paths=self.args.copy_paths,
             message=self.args.message,
             **self._common_kwargs,
@@ -90,15 +89,6 @@ def _add_run_common(parser):
             "your workspace."
         ),
     )
-    parser.add_argument(
-        "--machine",
-        default=None,
-        help=argparse.SUPPRESS,
-        # help=(
-        #     "Run this experiment on the specified 'dvc machine' instance."
-        # )
-        # metavar="<name>",
-    )
     parser.add_argument(
         "-C",
         "--copy-paths",

dvc/commands/machine.py

@@ -1,490 +0,0 @@
-import argparse
-from typing import Dict, List
-
-from dvc.cli.command import CmdBase
-from dvc.cli.utils import append_doc_link, fix_subparsers
-from dvc.commands.config import CmdConfig
-from dvc.compare import TabularData
-from dvc.config import ConfigError
-from dvc.exceptions import DvcException
-from dvc.ui import ui
-from dvc.utils import format_link
-
-
-class MachineDisabledError(ConfigError):
-    def __init__(self):
-        super().__init__("Machine feature is disabled")
-
-
-class CmdMachineConfig(CmdConfig):
-    def __init__(self, args):
-        super().__init__(args)
-        if not self.config["feature"].get("machine", False):
-            raise MachineDisabledError
-
-        if getattr(self.args, "name", None):
-            self.args.name = self.args.name.lower()
-
-    def _check_exists(self, conf):
-        if self.args.name not in conf["machine"]:
-            raise ConfigError(f"machine '{self.args.name}' doesn't exist.")
-
-
-class CmdMachineAdd(CmdMachineConfig):
-    def run(self):
-        from dvc.machine import validate_name
-
-        validate_name(self.args.name)
-
-        if self.args.default:
-            ui.write(f"Setting '{self.args.name}' as a default machine.")
-
-        with self.config.edit(self.args.level) as conf:
-            if self.args.name in conf["machine"] and not self.args.force:
-                raise ConfigError(
-                    "machine '{}' already exists. Use `-f|--force` to "
-                    "overwrite it.".format(self.args.name)
-                )
-
-            conf["machine"][self.args.name] = {"cloud": self.args.cloud}
-            if self.args.default:
-                conf["core"]["machine"] = self.args.name
-
-        return 0
-
-
-class CmdMachineRemove(CmdMachineConfig):
-    def run(self):
-        with self.config.edit(self.args.level) as conf:
-            self._check_exists(conf)
-            del conf["machine"][self.args.name]
-
-        up_to_level = self.args.level or "repo"
-        # Remove core.machine refs to this machine in any shadowing configs
-        for level in reversed(self.config.LEVELS):
-            with self.config.edit(level) as conf:
-                if conf["core"].get("machine") == self.args.name:
-                    del conf["core"]["machine"]
-
-            if level == up_to_level:
-                break
-
-        return 0
-
-
-class CmdMachineList(CmdMachineConfig):
-    TABLE_COLUMNS = [
-        "name",
-        "cloud",
-        "region",
-        "image",
-        "spot",
-        "spot_price",
-        "instance_hdd_size",
-        "instance_type",
-        "ssh_private",
-        "startup_script",
-    ]
-
-    PRIVATE_COLUMNS = ["ssh_private", "startup_script"]
-
-    def _hide_private(self, conf):
-        for machine in conf:
-            for column in self.PRIVATE_COLUMNS:
-                if column in conf[machine]:
-                    conf[machine][column] = "***"
-
-    def _show_origin(self):
-        levels = [self.args.level] if self.args.level else self.config.LEVELS
-        for level in levels:
-            conf = self.config.read(level)["machine"]
-            if self.args.name:
-                conf = conf.get(self.args.name, {})
-            self._hide_private(conf)
-            prefix = self._config_file_prefix(True, self.config, level)
-            configs = list(self._format_config(conf, prefix))
-            if configs:
-                ui.write("\n".join(configs))
-
-    def _show_table(self):
-        td = TabularData(self.TABLE_COLUMNS, fill_value="-")
-        conf = self.config.read()["machine"]
-        if self.args.name:
-            conf = {self.args.name: conf.get(self.args.name, {})}
-        self._hide_private(conf)
-        for machine, machine_config in conf.items():
-            machine_config["name"] = machine
-            td.row_from_dict(machine_config)
-        td.dropna("cols", "all")
-        td.render()
-
-    def run(self):
-        if self.args.show_origin:
-            self._show_origin()
-        else:
-            self._show_table()
-        return 0
-
-
-class CmdMachineModify(CmdMachineConfig):
-    def run(self):
-        from dvc.config import merge
-
-        with self.config.edit(self.args.level) as conf:
-            merged = self.config.load_config_to_level(self.args.level)
-            merge(merged, conf)
-            self._check_exists(merged)
-
-            if self.args.name not in conf["machine"]:
-                conf["machine"][self.args.name] = {}
-            section = conf["machine"][self.args.name]
-            if self.args.unset:
-                section.pop(self.args.option, None)
-            else:
-                section[self.args.option] = self.args.value
-        return 0
-
-
-class CmdMachineRename(CmdBase):
-    def _check_exists(self, conf):
-        if self.args.name not in conf["machine"]:
-            raise ConfigError(f"machine '{self.args.name}' doesn't exist.")
-
-    def _rename_default(self, conf):
-        if conf["core"].get("machine") == self.args.name:
-            conf["core"]["machine"] = self.args.new
-
-    def _check_before_rename(self):
-        from dvc.machine import validate_name
-
-        validate_name(self.args.new)
-
-        all_config = self.config.load_config_to_level(None)
-        if self.args.new in all_config.get("machine", {}):
-            raise ConfigError(
-                f"Rename failed. Machine '{self.args.new}' already exists."
-            )
-        ui.write(f"Rename machine '{self.args.name}' to '{self.args.new}'.")
-
-    def run(self):
-        self._check_before_rename()
-
-        with self.config.edit(self.args.level) as conf:
-            self._check_exists(conf)
-            conf["machine"][self.args.new] = conf["machine"][self.args.name]
-            try:
-                assert self.repo.machine
-                self.repo.machine.rename(self.args.name, self.args.new)
-            except DvcException as error:
-                del conf["machine"][self.args.new]
-                raise ConfigError("terraform rename failed") from error
-            del conf["machine"][self.args.name]
-            self._rename_default(conf)
-
-        up_to_level = self.args.level or "repo"
-        for level in reversed(self.config.LEVELS):
-            if level == up_to_level:
-                break
-            with self.config.edit(level) as level_conf:
-                self._rename_default(level_conf)
-
-        return 0
-
-
-class CmdMachineDefault(CmdMachineConfig):
-    def run(self):
-        if self.args.name is None and not self.args.unset:
-            conf = self.config.read(self.args.level)
-            try:
-                ui.write(conf["core"]["machine"])
-            except KeyError:
-                ui.write("No default machine set")
-                return 1
-        else:
-            with self.config.edit(self.args.level) as conf:
-                if self.args.unset:
-                    conf["core"].pop("machine", None)
-                else:
-                    merged_conf = self.config.load_config_to_level(self.args.level)
-                    if (
-                        self.args.name in conf["machine"]
-                        or self.args.name in merged_conf["machine"]
-                    ):
-                        conf["core"]["machine"] = self.args.name
-                    else:
-                        raise ConfigError(
-                            "default machine must be present in machine list."
-                        )
-        return 0
-
-
-class CmdMachineCreate(CmdBase):
-    def run(self):
-        if self.repo.machine is None:
-            raise MachineDisabledError
-
-        self.repo.machine.create(self.args.name)
-        return 0
-
-
-class CmdMachineStatus(CmdBase):
-    INSTANCE_FIELD = ["name", "instance", "status"]
-    SHOWN_FIELD = [
-        "cloud",
-        "instance_ip",
-        "instance_type",
-        "instance_hdd_size",
-        "instance_gpu",
-    ]
-    FILL_VALUE = "-"
-
-    def _add_row(
-        self,
-        name: str,
-        all_status: List[Dict],
-        td: TabularData,
-    ):
-        if not all_status:
-            row = [
-                name,
-                self.FILL_VALUE,
-                "offline",
-            ]  # back to `None` after #7167
-            td.append(row)
-        for i, status in enumerate(all_status, start=1):
-            row = [name, f"num_{i}", "running" if status else "offline"]
-            for field in self.SHOWN_FIELD:
-                value = str(status.get(field, ""))
-                row.append(value)
-            td.append(row)
-
-    def run(self):
-        if self.repo.machine is None:
-            raise MachineDisabledError
-
-        td = TabularData(
-            self.INSTANCE_FIELD + self.SHOWN_FIELD, fill_value=self.FILL_VALUE
-        )
-
-        if self.args.name:
-            all_status = list(self.repo.machine.status(self.args.name))
-            self._add_row(self.args.name, all_status, td)
-        else:
-            name_set = set()
-            for level in self.repo.config.LEVELS:
-                conf = self.repo.config.read(level)["machine"]
-                name_set.update(conf.keys())
-            name_list = list(name_set)
-            for name in sorted(name_list):
-                all_status = list(self.repo.machine.status(name))
-                self._add_row(name, all_status, td)
-
-        td.dropna("cols", "all")
-        td.render()
-        return 0
-
-
-class CmdMachineDestroy(CmdBase):
-    def run(self):
-        if self.repo.machine is None:
-            raise MachineDisabledError
-
-        self.repo.machine.destroy(self.args.name)
-        return 0
-
-
-class CmdMachineSsh(CmdBase):
-    def run(self):
-        if self.repo.machine is None:
-            raise MachineDisabledError
-
-        self.repo.machine.run_shell(self.args.name)
-        return 0
-
-
-def add_parser(subparsers, parent_parser):  # noqa: PLR0915
-    from dvc.commands.config import parent_config_parser
-
-    machine_HELP = "Set up and manage cloud machines."
-    machine_parser = subparsers.add_parser(
-        "machine",
-        parents=[parent_parser],
-        description=append_doc_link(machine_HELP, "machine"),
-        # NOTE: suppress help during development to hide command
-        # help=machine_HELP,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-
-    machine_subparsers = machine_parser.add_subparsers(
-        dest="cmd",
-        help="Use `dvc machine CMD --help` for command-specific help.",
-    )
-
-    fix_subparsers(machine_subparsers)
-
-    machine_ADD_HELP = "Add a new data machine."
-    machine_add_parser = machine_subparsers.add_parser(
-        "add",
-        parents=[parent_config_parser, parent_parser],
-        description=append_doc_link(machine_ADD_HELP, "machine/add"),
-        help=machine_ADD_HELP,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    machine_add_parser.add_argument("name", help="Name of the machine")
-    machine_add_parser.add_argument(
-        "cloud",
-        help="Machine cloud. See full list of supported clouds at {}".format(
-            format_link(
-                "https://github.com/iterative/terraform-provider-iterative#machine"
-            )
-        ),
-    )
-    machine_add_parser.add_argument(
-        "-d",
-        "--default",
-        action="store_true",
-        default=False,
-        help="Set as default machine.",
-    )
-    machine_add_parser.add_argument(
-        "-f",
-        "--force",
-        action="store_true",
-        default=False,
-        help="Force overwriting existing configs",
-    )
-    machine_add_parser.set_defaults(func=CmdMachineAdd)
-
-    machine_DEFAULT_HELP = "Set/unset the default machine."
-    machine_default_parser = machine_subparsers.add_parser(
-        "default",
-        parents=[parent_config_parser, parent_parser],
-        description=append_doc_link(machine_DEFAULT_HELP, "machine/default"),
-        help=machine_DEFAULT_HELP,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    machine_default_parser.add_argument("name", nargs="?", help="Name of the machine")
-    machine_default_parser.add_argument(
-        "-u",
-        "--unset",
-        action="store_true",
-        default=False,
-        help="Unset default machine.",
-    )
-    machine_default_parser.set_defaults(func=CmdMachineDefault)
-
-    machine_LIST_HELP = "List the configuration of one/all machines."
-    machine_list_parser = machine_subparsers.add_parser(
-        "list",
-        parents=[parent_config_parser, parent_parser],
-        description=append_doc_link(machine_LIST_HELP, "machine/list"),
-        help=machine_LIST_HELP,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    machine_list_parser.add_argument(
-        "--show-origin",
-        default=False,
-        action="store_true",
-        help="Show the source file containing each config value.",
-    )
-    machine_list_parser.add_argument(
-        "name",
-        nargs="?",
-        type=str,
-        help="name of machine to specify",
-    )
-    machine_list_parser.set_defaults(func=CmdMachineList)
-    machine_MODIFY_HELP = "Modify the configuration of an machine."
-    machine_modify_parser = machine_subparsers.add_parser(
-        "modify",
-        parents=[parent_config_parser, parent_parser],
-        description=append_doc_link(machine_MODIFY_HELP, "machine/modify"),
-        help=machine_MODIFY_HELP,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    machine_modify_parser.add_argument("name", help="Name of the machine")
-    machine_modify_parser.add_argument("option", help="Name of the option to modify.")
-    machine_modify_parser.add_argument(
-        "value", nargs="?", help="(optional) Value of the option."
-    )
-    machine_modify_parser.add_argument(
-        "-u",
-        "--unset",
-        default=False,
-        action="store_true",
-        help="Unset option.",
-    )
-    machine_modify_parser.set_defaults(func=CmdMachineModify)
-
-    machine_RENAME_HELP = "Rename a machine "
-    machine_rename_parser = machine_subparsers.add_parser(
-        "rename",
-        parents=[parent_config_parser, parent_parser],
-        description=append_doc_link(machine_RENAME_HELP, "remote/rename"),
-        help=machine_RENAME_HELP,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    machine_rename_parser.add_argument("name", help="Machine to be renamed")
-    machine_rename_parser.add_argument("new", help="New name of the machine")
-    machine_rename_parser.set_defaults(func=CmdMachineRename)
-
-    machine_REMOVE_HELP = "Remove an machine."
-    machine_remove_parser = machine_subparsers.add_parser(
-        "remove",
-        parents=[parent_config_parser, parent_parser],
-        description=append_doc_link(machine_REMOVE_HELP, "machine/remove"),
-        help=machine_REMOVE_HELP,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    machine_remove_parser.add_argument("name", help="Name of the machine to remove.")
-    machine_remove_parser.set_defaults(func=CmdMachineRemove)
-
-    machine_CREATE_HELP = "Create and start a machine instance."
-    machine_create_parser = machine_subparsers.add_parser(
-        "create",
-        parents=[parent_parser],
-        description=append_doc_link(machine_CREATE_HELP, "machine/create"),
-        help=machine_CREATE_HELP,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    machine_create_parser.add_argument("name", help="Name of the machine to create.")
-    machine_create_parser.set_defaults(func=CmdMachineCreate)
-
-    machine_STATUS_HELP = "List the status of running instances for one/all machines."
-    machine_status_parser = machine_subparsers.add_parser(
-        "status",
-        parents=[parent_parser],
-        description=append_doc_link(machine_STATUS_HELP, "machine/status"),
-        help=machine_STATUS_HELP,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    machine_status_parser.add_argument(
-        "name", nargs="?", help="(optional) Name of the machine."
-    )
-    machine_status_parser.set_defaults(func=CmdMachineStatus)
-
-    machine_DESTROY_HELP = "Destroy an machine instance."
-    machine_destroy_parser = machine_subparsers.add_parser(
-        "destroy",
-        parents=[parent_parser],
-        description=append_doc_link(machine_DESTROY_HELP, "machine/destroy"),
-        help=machine_DESTROY_HELP,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    machine_destroy_parser.add_argument(
-        "name", help="Name of the machine instance to destroy."
-    )
-    machine_destroy_parser.set_defaults(func=CmdMachineDestroy)
-
-    machine_SSH_HELP = "Connect to a machine via SSH."
-    machine_ssh_parser = machine_subparsers.add_parser(
-        "ssh",
-        parents=[parent_parser],
-        description=append_doc_link(machine_SSH_HELP, "machine/ssh"),
-        help=machine_SSH_HELP,
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    machine_ssh_parser.add_argument(
-        "name", help="Name of the machine instance to connect to."
-    )
-    machine_ssh_parser.set_defaults(func=CmdMachineSsh)

dvc/config.py

@@ -90,6 +90,7 @@ class Config(dict):
     def __init__(
         self,
         dvc_dir: Optional["StrPath"] = None,
+        local_dvc_dir: Optional["StrPath"] = None,
         validate: bool = True,
         fs: Optional["FileSystem"] = None,
         config: Optional["DictStrAny"] = None,
@@ -105,6 +106,10 @@ class Config(dict):
         if dvc_dir:
             self.dvc_dir = self.fs.path.abspath(dvc_dir)
 
+        self.local_dvc_dir = local_dvc_dir
+        if not fs and not local_dvc_dir:
+            self.local_dvc_dir = dvc_dir
+
         self.load(
             validate=validate, config=config, remote=remote, remote_config=remote_config
         )
@@ -140,7 +145,9 @@ class Config(dict):
 
         if self.dvc_dir is not None:
             files["repo"] = self.fs.path.join(self.dvc_dir, self.CONFIG)
-            files["local"] = self.fs.path.join(self.dvc_dir, self.CONFIG_LOCAL)
+
+        if self.local_dvc_dir is not None:
+            files["local"] = self.wfs.path.join(self.local_dvc_dir, self.CONFIG_LOCAL)
 
         return files
 
@@ -158,6 +165,9 @@ class Config(dict):
         with open(config_file, "w+", encoding="utf-8"):
             return Config(dvc_dir)
 
+    def merge(self, config):
+        merge(self, config)
+
     def load(
         self,
         validate: bool = True,
@@ -250,21 +260,30 @@ class Config(dict):
         return conf
 
     @staticmethod
-    def _load_paths(conf, filename):
-        abs_conf_dir = os.path.abspath(os.path.dirname(filename))
+    def _resolve(conf_dir, path):
+        from .config_schema import ExpPath, RelPath
 
-        def resolve(path):
-            from .config_schema import RelPath
+        if re.match(r"\w+://", path):
+            return path
 
-            if os.path.isabs(path) or re.match(r"\w+://", path):
-                return path
+        if os.path.isabs(path):
+            return path
 
-            # on windows convert slashes to backslashes
-            # to have path compatible with abs_conf_dir
-            if os.path.sep == "\\" and "/" in path:
-                path = path.replace("/", "\\")
+        # on windows convert slashes to backslashes
+        # to have path compatible with abs_conf_dir
+        if os.path.sep == "\\" and "/" in path:
+            path = path.replace("/", "\\")
 
-            return RelPath(os.path.join(abs_conf_dir, path))
+        expanded = os.path.expanduser(path)
+        if os.path.isabs(expanded):
+            return ExpPath(expanded, path)
+
+        return RelPath(os.path.abspath(os.path.join(conf_dir, path)))
+
+    @classmethod
+    def _load_paths(cls, conf, filename):
+        conf_dir = os.path.abspath(os.path.dirname(filename))
+        resolve = partial(cls._resolve, conf_dir)
 
         return Config._map_dirs(conf, resolve)
 
@@ -273,11 +292,17 @@ class Config(dict):
         from dvc.fs import localfs
         from dvc.utils import relpath
 
-        from .config_schema import RelPath
+        from .config_schema import ExpPath, RelPath
 
         if re.match(r"\w+://", path):
             return path
 
+        if isinstance(path, ExpPath):
+            return path.def_path
+
+        if os.path.expanduser(path) != path:
+            return localfs.path.as_posix(path)
+
         if isinstance(path, RelPath) or not os.path.isabs(path):
             path = relpath(path, conf_dir)
             return localfs.path.as_posix(path)

dvc/config_schema.py

@@ -75,6 +75,17 @@ def ByUrl(mapping):  # noqa: N802
     return validate
 
 
+class ExpPath(str):
+    __slots__ = ("def_path",)
+
+    def_path: str
+
+    def __new__(cls, string, def_path):
+        ret = super().__new__(cls, string)
+        ret.def_path = def_path
+        return ret
+
+
 class RelPath(str):
     __slots__ = ()
 

dvc/machine/__init__.py

@@ -1,227 +0,0 @@
-import logging
-import os
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Dict,
-    Iterable,
-    Iterator,
-    Mapping,
-    Optional,
-    Tuple,
-    Type,
-)
-
-from dvc.exceptions import DvcException
-
-if TYPE_CHECKING:
-    from dvc.repo import Repo
-    from dvc.types import StrPath
-
-    from .backend.base import BaseMachineBackend
-
-    BackendCls = Type[BaseMachineBackend]
-
-logger = logging.getLogger(__name__)
-
-
-RESERVED_NAMES = {"local", "localhost"}
-
-DEFAULT_STARTUP_SCRIPT = """#!/bin/bash
-sudo apt-get update
-sudo apt-get install --yes python3 python3-pip
-python3 -m pip install --upgrade pip
-
-pushd /etc/apt/sources.list.d
-sudo wget https://dvc.org/deb/dvc.list
-sudo apt-get update
-sudo apt-get install --yes dvc
-popd
-
-sudo echo "OK" > /var/log/dvc-machine-init.log
-"""
-
-
-def validate_name(name: str):
-    from dvc.exceptions import InvalidArgumentError
-
-    name = name.lower()
-    if name in RESERVED_NAMES:
-        raise InvalidArgumentError(
-            f"Machine name '{name}' is reserved for internal DVC use."
-        )
-
-
-class MachineBackends(Mapping):
-    try:
-        from .backend.terraform import TerraformBackend
-    except ImportError:
-        TerraformBackend = None  # type: ignore[assignment, misc]
-
-    DEFAULT: Dict[str, Optional["BackendCls"]] = {
-        "terraform": TerraformBackend,
-    }
-
-    def __getitem__(self, key: str) -> "BaseMachineBackend":
-        """Lazily initialize backends and cache it afterwards"""
-        initialized = self.initialized.get(key)
-        if not initialized:
-            backend = self.backends[key]
-            initialized = backend(os.path.join(self.tmp_dir, key), **self.kwargs)
-            self.initialized[key] = initialized
-        return initialized
-
-    def __init__(
-        self,
-        selected: Optional[Iterable[str]],
-        tmp_dir: "StrPath",
-        **kwargs,
-    ) -> None:
-        selected = selected or list(self.DEFAULT)
-        self.backends: Dict[str, "BackendCls"] = {}
-        for key in selected:
-            cls = self.DEFAULT.get(key)
-            if cls is None:
-                raise DvcException(
-                    f"'dvc machine' backend '{key}' is missing required "
-                    "dependencies. Install them with:\n"
-                    f"\tpip install dvc[{key}]"
-                )
-            self.backends[key] = cls
-
-        self.initialized: Dict[str, "BaseMachineBackend"] = {}
-
-        self.tmp_dir = tmp_dir
-        self.kwargs = kwargs
-
-    def __iter__(self):
-        return iter(self.backends)
-
-    def __len__(self) -> int:
-        return len(self.backends)
-
-    def close_initialized(self) -> None:
-        for backend in self.initialized.values():
-            backend.close()
-
-
-class MachineManager:
-    """Class that manages dvc cloud machines.
-
-    Args:
-        repo (dvc.repo.Repo): repo instance that belongs to the repo that
-            we are working on.
-
-    Raises:
-        config.ConfigError: thrown when config has invalid format.
-    """
-
-    CLOUD_BACKENDS = {
-        "aws": "terraform",
-        "azure": "terraform",
-    }
-
-    def __init__(
-        self, repo: "Repo", backends: Optional[Iterable[str]] = None, **kwargs
-    ):
-        self.repo = repo
-        assert self.repo.tmp_dir
-        tmp_dir = os.path.join(self.repo.tmp_dir, "machine")
-        self.backends = MachineBackends(backends, tmp_dir=tmp_dir, **kwargs)
-
-    def get_config_and_backend(
-        self,
-        name: Optional[str] = None,
-    ) -> Tuple[dict, "BaseMachineBackend"]:
-        from dvc.config import NoMachineError
-
-        if not name:
-            name = self.repo.config["core"].get("machine")
-
-        if name:
-            config = self._get_config(name=name)
-            backend = self._get_backend(config["cloud"])
-            return config, backend
-
-        if bool(self.repo.config["machine"]):
-            error_msg = (
-                "no machine specified. Setup default machine with\n"
-                "    dvc machine default <name>\n"
-            )
-        else:
-            error_msg = (
-                "no machine specified. Create a default machine with\n"
-                "    dvc machine add -d <name> <cloud>"
-            )
-
-        raise NoMachineError(error_msg)
-
-    def _get_config(self, **kwargs):
-        config = self.repo.config
-        name = kwargs.get("name")
-        if name:
-            try:
-                conf = config["machine"][name.lower()]
-                conf["name"] = name
-            except KeyError:
-                from dvc.config import MachineNotFoundError
-
-                raise MachineNotFoundError(  # noqa: B904
-                    f"machine '{name}' doesn't exist"
-                )
-        else:
-            conf = kwargs
-        return conf
-
-    def _get_backend(self, cloud: str) -> "BaseMachineBackend":
-        from dvc.config import NoMachineError
-
-        try:
-            backend = self.CLOUD_BACKENDS[cloud]
-            return self.backends[backend]
-        except KeyError:
-            raise NoMachineError(  # noqa: B904
-                f"Machine platform '{cloud}' unsupported"
-            )
-
-    def create(self, name: Optional[str]):
-        """Create and start the specified machine instance."""
-        config, backend = self.get_config_and_backend(name)
-        if "startup_script" in config:
-            with open(config["startup_script"], encoding="utf-8") as fobj:
-                startup_script = fobj.read()
-        else:
-            startup_script = DEFAULT_STARTUP_SCRIPT
-        config["startup_script"] = startup_script
-        config.pop("setup_script", None)
-        return backend.create(**config)
-
-    def destroy(self, name: Optional[str]):
-        """Destroy the specified machine instance."""
-        config, backend = self.get_config_and_backend(name)
-        return backend.destroy(**config)
-
-    def get_sshfs(self, name: Optional[str]):
-        config, backend = self.get_config_and_backend(name)
-        return backend.get_sshfs(**config)
-
-    def run_shell(self, name: Optional[str]):
-        config, backend = self.get_config_and_backend(name)
-        return backend.run_shell(**config)
-
-    def status(self, name: str) -> Iterator[Dict[Any, Any]]:
-        config, backend = self.get_config_and_backend(name)
-        return backend.instances(**config)
-
-    def rename(self, name: str, new: str):
-        """move configuration to a new location if the machine is running."""
-        config, backend = self.get_config_and_backend(name)
-        return backend.rename(new=new, **config)
-
-    def get_executor_kwargs(self, name: Optional[str]):
-        config, backend = self.get_config_and_backend(name)
-        return backend.get_executor_kwargs(**config)
-
-    def get_setup_script(self, name: Optional[str]) -> Optional[str]:
-        config, _backend = self.get_config_and_backend(name)
-        return config.get("setup_script")

dvc/machine/backend/base.py

@@ -1,50 +0,0 @@
-from abc import ABC, abstractmethod
-from contextlib import contextmanager
-from typing import TYPE_CHECKING, Iterator, Optional
-
-if TYPE_CHECKING:
-    from dvc_ssh import SSHFileSystem
-
-    from dvc.types import StrPath
-
-
-class BaseMachineBackend(ABC):
-    def __init__(self, tmp_dir: "StrPath", **kwargs):
-        self.tmp_dir = tmp_dir
-
-    @abstractmethod
-    def create(self, name: Optional[str] = None, **config):
-        """Create and start an instance of the specified machine."""
-
-    @abstractmethod
-    def destroy(self, name: Optional[str] = None, **config):
-        """Stop and destroy all instances of the specified machine."""
-
-    @abstractmethod
-    def instances(self, name: Optional[str] = None, **config) -> Iterator[dict]:
-        """Iterate over status of all instances of the specified machine."""
-
-    def close(self):  # noqa: B027
-        pass
-
-    @abstractmethod
-    def run_shell(self, name: Optional[str] = None, **config):
-        """Spawn an interactive SSH shell for the specified machine."""
-
-    @abstractmethod
-    def get_executor_kwargs(self, name: str, **config) -> dict:
-        """Return SSHExecutor kwargs which can be used for DVC
-        experiment/pipeline execution on the specified machine.
-        """
-
-    @abstractmethod
-    @contextmanager
-    def get_sshfs(
-        self, name: Optional[str] = None, **config
-    ) -> Iterator["SSHFileSystem"]:
-        """Return an sshfs instance for the default directory on the
-        specified machine."""
-
-    @abstractmethod
-    def rename(self, name: str, new: str, **config):
-        """Rename a machine instance."""

dvc/machine/backend/terraform.py

@@ -1,99 +0,0 @@
-import os
-from contextlib import contextmanager
-from functools import partial, partialmethod
-from typing import TYPE_CHECKING, Iterator, Optional
-
-from dvc_ssh import DEFAULT_PORT, SSHFileSystem
-
-from dvc.exceptions import DvcException
-
-from .base import BaseMachineBackend
-
-if TYPE_CHECKING:
-    from dvc.types import StrPath
-
-
-@contextmanager
-def _sshfs(resource: dict):
-    from tpi import TerraformProviderIterative
-
-    with TerraformProviderIterative.pemfile(resource) as pem:
-        fs = SSHFileSystem(
-            host=resource["instance_ip"],
-            user="ubuntu",
-            keyfile=pem,
-        )
-        yield fs
-
-
-class TerraformBackend(BaseMachineBackend):
-    def __init__(self, tmp_dir: "StrPath", **kwargs):
-        super().__init__(tmp_dir, **kwargs)
-        os.makedirs(tmp_dir, exist_ok=True)
-
-    @contextmanager
-    def make_tpi(self, name: str):
-        from tpi import TPIError
-        from tpi.terraform import TerraformBackend as TPIBackend
-
-        try:
-            working_dir = os.path.join(self.tmp_dir, name)
-            os.makedirs(working_dir, exist_ok=True)
-            yield TPIBackend(working_dir=working_dir)
-        except TPIError as exc:
-            raise DvcException("TPI operation failed") from exc
-
-    def _tpi_func(self, fname, name: Optional[str] = None, **config):
-        from tpi import TPIError
-
-        assert name
-        with self.make_tpi(name) as tpi:
-            func = getattr(tpi, fname)
-            try:
-                return func(name=name, **config)
-            except TPIError as exc:
-                raise DvcException(f"TPI {fname} failed") from exc
-
-    create = partialmethod(_tpi_func, "create")  # type: ignore[assignment]
-    destroy = partialmethod(_tpi_func, "destroy")  # type: ignore[assignment]
-    instances = partialmethod(_tpi_func, "instances")  # type: ignore[assignment]
-    run_shell = partialmethod(_tpi_func, "run_shell")  # type: ignore[assignment]
-
-    def get_executor_kwargs(self, name: str, **config) -> dict:
-        with self.make_tpi(name) as tpi:
-            resource = tpi.default_resource(name)
-        return {
-            "host": resource["instance_ip"],
-            "port": DEFAULT_PORT,
-            "username": "ubuntu",
-            "fs_factory": partial(_sshfs, dict(resource)),
-        }
-
-    @contextmanager
-    def get_sshfs(  # pylint: disable=unused-argument
-        self, name: Optional[str] = None, **config
-    ) -> Iterator["SSHFileSystem"]:
-        assert name
-        with self.make_tpi(name) as tpi:
-            resource = tpi.default_resource(name)
-        with _sshfs(resource) as fs:
-            yield fs
-
-    def rename(self, name: str, new: str, **config):
-        """rename a dvc machine instance to a new name"""
-        import shutil
-
-        mtype = "iterative_machine"
-
-        new_dir = os.path.join(self.tmp_dir, new)
-        old_dir = os.path.join(self.tmp_dir, name)
-        if os.path.exists(new_dir):
-            raise DvcException(f"rename failed: path {new_dir} already exists")
-
-        if not os.path.exists(old_dir):
-            return
-
-        with self.make_tpi(name) as tpi:
-            tpi.state_mv(f"{mtype}.{name}", f"{mtype}.{new}", **config)
-
-        shutil.move(old_dir, new_dir)

dvc/output.py

@@ -1090,7 +1090,7 @@ class Output:
         return len(obj) if obj else 0
 
     def unprotect(self):
-        if self.exists:
+        if self.exists and self.use_cache:
             self.cache.unprotect(self.fs_path)
 
     def get_dir_cache(self, **kwargs) -> Optional["Tree"]:

dvc/repo/__init__.py

@@ -15,7 +15,6 @@ from typing import (
 
 from dvc.exceptions import NotDvcRepoError, OutputNotFoundError
 from dvc.ignore import DvcIgnoreFilter
-from dvc.utils import env2bool
 from dvc.utils.fs import path_isin
 from dvc.utils.objects import cached_property
 
@@ -24,7 +23,6 @@ if TYPE_CHECKING:
     from dvc.fs.data import DataFileSystem
     from dvc.fs.dvc import DVCFileSystem
     from dvc.lock import LockBase
-    from dvc.machine import MachineManager
     from dvc.scm import Git, NoSCM
     from dvc.stage import Stage
     from dvc.types import DictStrAny
@@ -244,6 +242,7 @@ class Repo:
 
         return Config(
             self.dvc_dir,
+            local_dvc_dir=self.local_dvc_dir,
             fs=self.fs,
             config=self._config,
             remote=self._remote,
@@ -351,16 +350,6 @@ class Repo:
 
         return Experiments(self)
 
-    @cached_property
-    def machine(self) -> Optional["MachineManager"]:
-        from dvc.machine import MachineManager
-
-        if self.tmp_dir and (
-            self.config["feature"].get("machine", False) or env2bool("DVC_TEST")
-        ):
-            return MachineManager(self)
-        return None
-
     @property
     def fs(self) -> "FileSystem":
         return self._fs

dvc/repo/checkout.py

@@ -51,20 +51,16 @@ def _build_out_changes(index, changes):
         out_keys.append(key)
 
     out_changes = {}
-    for objects in changes.values():
-        for change in objects:
-            for out_key in out_keys:
-                if (
-                    len(out_key) > len(change.key)
-                    or change.key[: len(out_key)] != out_key
-                ):
-                    continue
+    for key, change in changes.items():
+        for out_key in out_keys:
+            if len(out_key) > len(key) or key[: len(out_key)] != out_key:
+                continue
 
-                if change.key == out_key:
-                    out_changes[out_key] = change.typ
-                elif not out_changes.get(out_key):
-                    out_changes[out_key] = MODIFY
-                break
+            if key == out_key:
+                out_changes[out_key] = change.typ
+            elif not out_changes.get(out_key):
+                out_changes[out_key] = MODIFY
+            break
 
     return out_changes
 

dvc/repo/experiments/__init__.py

@@ -136,10 +136,6 @@ class Experiments:
         **kwargs,
     ) -> "QueueEntry":
         """Queue a single experiment."""
-        if kwargs.pop("machine", None) is not None:
-            # TODO: decide how to handle queued remote execution
-            raise NotImplementedError
-
         return self.new(
             queue,
             **kwargs,

dvc/repo/experiments/collect.py

@@ -23,6 +23,7 @@ from dvc.scm import Git, SCMError, iter_revs
 from .exceptions import InvalidExpRefError
 from .refs import EXEC_BRANCH, ExpRefInfo
 from .serialize import ExpRange, ExpState, SerializableError, SerializableExp
+from .utils import describe
 
 if TYPE_CHECKING:
     from dvc.repo import Repo
@@ -308,7 +309,9 @@ def collect(
     if sha_only:
         baseline_names: Dict[str, Optional[str]] = {}
     else:
-        baseline_names = _describe(repo.scm, baseline_revs, refs=cached_refs)
+        baseline_names = describe(
+            repo.scm, baseline_revs, refs=cached_refs, logger=logger
+        )
 
     workspace_data = collect_rev(repo, "workspace", **kwargs)
     result: List["ExpState"] = [workspace_data]
@@ -337,55 +340,6 @@ def collect(
     return result
 
 
-def _describe(
-    scm: "Git",
-    revs: Iterable[str],
-    refs: Optional[Iterable[str]] = None,
-) -> Dict[str, Optional[str]]:
-    """Describe revisions using a tag, branch.
-
-    The first matching name will be returned for each rev. Names are preferred in this
-    order:
-        - current branch (if rev matches HEAD and HEAD is a branch)
-        - tags
-        - branches
-
-    Returns:
-        Dict mapping revisions from revs to a name.
-    """
-
-    head_rev = scm.get_rev()
-    head_ref = scm.get_ref("HEAD", follow=False)
-    if head_ref and head_ref.startswith("refs/heads/"):
-        head_branch = head_ref[len("refs/heads/") :]
-    else:
-        head_branch = None
-
-    tags = {}
-    branches = {}
-    ref_it = iter(refs) if refs else scm.iter_refs()
-    for ref in ref_it:
-        is_tag = ref.startswith("refs/tags/")
-        is_branch = ref.startswith("refs/heads/")
-        if not (is_tag or is_branch):
-            continue
-        rev = scm.get_ref(ref)
-        if not rev:
-            logger.debug("unresolved ref %s", ref)
-            continue
-        if is_tag and rev not in tags:
-            tags[rev] = ref[len("refs/tags/") :]
-        if is_branch and rev not in branches:
-            branches[rev] = ref[len("refs/heads/") :]
-    names: Dict[str, Optional[str]] = {}
-    for rev in revs:
-        if rev == head_rev and head_branch:
-            names[rev] = head_branch
-        else:
-            names[rev] = tags.get(rev) or branches.get(rev)
-    return names
-
-
 def _sorted_ranges(exp_ranges: Iterable["ExpRange"]) -> List["ExpRange"]:
     """Return list of ExpRange sorted by (timestamp, rev)."""
 

dvc/repo/experiments/executor/ssh.py

@@ -1,292 +0,0 @@
-import logging
-import os
-import posixpath
-import sys
-from contextlib import contextmanager
-from typing import TYPE_CHECKING, Callable, Iterable, List, Optional
-
-from dvc_ssh import SSHFileSystem
-from funcy import first
-
-from dvc.repo.experiments.refs import (
-    EXEC_BASELINE,
-    EXEC_BRANCH,
-    EXEC_HEAD,
-    EXEC_MERGE,
-    EXEC_NAMESPACE,
-)
-
-from .base import BaseExecutor, ExecutorInfo, ExecutorResult, TaskStatus
-
-if TYPE_CHECKING:
-    from queue import Queue
-
-    from dvc.repo import Repo
-    from dvc.repo.experiments.refs import ExpRefInfo
-    from dvc.repo.experiments.stash import ExpStashEntry
-    from dvc.scm import Git
-
-logger = logging.getLogger(__name__)
-
-
-@contextmanager
-def _sshfs(fs_factory, **kwargs):
-    if fs_factory:
-        with fs_factory() as fs:
-            yield fs
-        return
-    yield SSHFileSystem(**kwargs)
-
-
-class SSHExecutor(BaseExecutor):
-    """SSH experiment executor."""
-
-    WARN_UNTRACKED = True
-    QUIET = True
-    SETUP_SCRIPT_FILENAME = "exec-setup.sh"
-
-    def __init__(
-        self,
-        *args,
-        host: Optional[str] = None,
-        port: Optional[int] = None,
-        username: Optional[str] = None,
-        fs_factory: Optional[Callable] = None,
-        setup_script: Optional[str] = None,
-        **kwargs,
-    ):
-        assert host
-
-        super().__init__(*args, **kwargs)
-        self.host: str = host
-        self.port = port
-        self.username = username
-        self._fs_factory = fs_factory
-        self._repo_abspath = ""
-        self._setup_script = setup_script
-
-    @classmethod
-    def gen_dirname(cls, name: Optional[str] = None):
-        from shortuuid import uuid
-
-        return "-".join([name or "dvc-exp", "executor", uuid()])
-
-    @classmethod
-    def from_stash_entry(
-        cls,
-        repo: "Repo",
-        entry: "ExpStashEntry",
-        **kwargs,
-    ):
-        machine_name: Optional[str] = kwargs.pop("machine_name", None)
-        assert repo.machine
-        executor = cls._from_stash_entry(
-            repo,
-            entry,
-            cls.gen_dirname(entry.name),
-            location=machine_name,
-            **repo.machine.get_executor_kwargs(machine_name),
-            setup_script=repo.machine.get_setup_script(machine_name),
-        )
-        logger.debug("Init SSH executor for host '%s'", executor.host)
-        return executor
-
-    def sshfs(self):
-        return _sshfs(self._fs_factory, host=self.host, port=self.port)
-
-    @property
-    def git_url(self) -> str:
-        user = f"{self.username}@" if self.username else ""
-        port = f":{self.port}" if self.port is not None else ""
-        path = f"{self.root_dir}" if self.root_dir else ""
-        if path and not posixpath.isabs(path):
-            path = f"/~/{path}"
-        return f"ssh://{user}{self.host}{port}{path}"
-
-    @property
-    def abs_url(self) -> str:
-        assert self._repo_abspath
-        user = f"{self.username}@" if self.username else ""
-        port = f":{self.port}" if self.port is not None else ""
-        return f"ssh://{user}{self.host}{port}{self._repo_abspath}"
-
-    @staticmethod
-    def _git_client_args(fs):
-        return {
-            "password": fs.fs_args.get("password"),
-            "key_filename": first(fs.fs_args.get("client_keys", [])),
-        }
-
-    def init_git(
-        self,
-        repo: "Repo",  # noqa: ARG002
-        scm: "Git",
-        stash_rev: str,
-        entry: "ExpStashEntry",
-        infofile: Optional[str],
-        branch: Optional[str] = None,
-    ):
-        from dvc.repo.experiments.utils import push_refspec
-
-        self.status = TaskStatus.PREPARING
-        if infofile:
-            self.info.dump_json(infofile)
-
-        with self.sshfs() as fs:
-            fs.makedirs(self.root_dir)
-            self._ssh_cmd(fs, "git init .")
-            self._ssh_cmd(fs, "git config user.name dvc-exp")
-            self._ssh_cmd(fs, "git config user.email [email protected]")
-
-            result = self._ssh_cmd(fs, "pwd")
-            path = result.stdout.strip()
-            self._repo_abspath = path
-
-            # TODO: support multiple client key retries in git backends
-            # (see https://github.com/iterative/dvc/issues/6508)
-            kwargs = self._git_client_args(fs)
-
-            ref_dict = {
-                EXEC_HEAD: entry.head_rev,
-                EXEC_MERGE: stash_rev,
-                EXEC_BASELINE: entry.baseline_rev,
-            }
-            with self.set_temp_refs(scm, ref_dict):
-                exec_namespace = f"{EXEC_NAMESPACE}/"
-                refspec = [(exec_namespace, exec_namespace)]
-                push_refspec(scm, self.git_url, refspec, **kwargs)
-
-            if branch:
-                push_refspec(scm, self.git_url, [(branch, branch)], **kwargs)
-                self._ssh_cmd(fs, f"git symbolic-ref {EXEC_BRANCH} {branch}")
-            else:
-                self._ssh_cmd(fs, f"git symbolic-ref -d {EXEC_BRANCH}", check=False)
-
-            # checkout EXEC_HEAD and apply EXEC_MERGE on top of it without
-            # committing
-            head = EXEC_BRANCH if branch else EXEC_HEAD
-            self._ssh_cmd(fs, f"git checkout {head}")
-            merge_rev = scm.get_ref(EXEC_MERGE)
-            self._ssh_cmd(fs, f"git stash apply {merge_rev}")
-
-            if self._setup_script:
-                self._init_setup_script(fs)
-
-    @classmethod
-    def _setup_script_path(cls, dvc_dir: str):
-        return posixpath.join(
-            dvc_dir,
-            "tmp",
-            cls.SETUP_SCRIPT_FILENAME,
-        )
-
-    def _init_setup_script(self, fs: "SSHFileSystem"):
-        assert self._repo_abspath
-        script_path = self._setup_script_path(
-            posixpath.join(self._repo_abspath, self.dvc_dir)
-        )
-        assert self._setup_script
-        fs.put_file(self._setup_script, script_path)
-
-    def _ssh_cmd(self, sshfs, cmd, chdir=None, **kwargs):
-        working_dir = chdir or self.root_dir
-        return sshfs.fs.execute(f"cd {working_dir};{cmd}", **kwargs)
-
-    def init_cache(self, repo: "Repo", rev: str, run_cache: bool = True):
-        from dvc.repo.push import push
-
-        with self.get_odb() as odb:
-            push(
-                repo,
-                revs=[rev],
-                run_cache=run_cache,
-                odb=odb,
-                include_imports=True,
-            )
-
-    def collect_cache(
-        self, repo: "Repo", exp_ref: "ExpRefInfo", run_cache: bool = True
-    ):
-        """Collect DVC cache."""
-        from dvc.repo.experiments.pull import _pull_cache
-
-        _pull_cache(repo, exp_ref, run_cache=run_cache)
-
-    @contextmanager
-    def get_odb(self):
-        from dvc.cachemgr import CacheManager, get_odb
-
-        cache_path = posixpath.join(
-            self._repo_abspath,
-            self.dvc_dir,
-            CacheManager.CACHE_DIR,
-        )
-
-        with self.sshfs() as fs:
-            yield get_odb(fs, cache_path, **fs.config)
-
-    def fetch_exps(self, *args, **kwargs) -> Iterable[str]:
-        with self.sshfs() as fs:
-            kwargs.update(self._git_client_args(fs))
-            return super().fetch_exps(*args, **kwargs)
-
-    @classmethod
-    def reproduce(
-        cls,
-        info: "ExecutorInfo",
-        rev: str,  # noqa: ARG003
-        queue: Optional["Queue"] = None,  # noqa: ARG003
-        infofile: Optional[str] = None,
-        log_errors: bool = True,
-        log_level: Optional[int] = None,
-        copy_paths: Optional[List[str]] = None,  # noqa: ARG003
-        message: Optional[str] = None,  # noqa: ARG003
-        **kwargs,
-    ) -> "ExecutorResult":
-        """Reproduce an experiment on a remote machine over SSH.
-
-        Internally uses 'dvc exp exec-run' over SSH.
-        """
-        import json
-        import time
-        from tempfile import TemporaryFile
-
-        from asyncssh import ProcessError
-
-        fs_factory: Optional[Callable] = kwargs.pop("fs_factory", None)
-        if log_errors and log_level is not None:
-            cls._set_log_level(log_level)
-
-        with _sshfs(fs_factory) as fs:
-            while not fs.exists("/var/log/dvc-machine-init.log"):
-                logger.info("Waiting for dvc-machine startup script to complete...")
-                time.sleep(5)
-            logger.info("Reproducing experiment on '%s'", fs.fs_args.get("host"))
-            with TemporaryFile(mode="w+", encoding="utf-8") as fobj:
-                json.dump(info.asdict(), fobj)
-                fobj.seek(0)
-                fs.put_file(fobj, infofile)
-            cmd = ["source ~/.profile"]
-            script_path = cls._setup_script_path(info.dvc_dir)
-            if fs.exists(posixpath.join(info.root_dir, script_path)):
-                cmd.extend([f"pushd {info.root_dir}", f"source {script_path}", "popd"])
-            exec_cmd = f"dvc exp exec-run --infofile {infofile}"
-            if log_level is not None:
-                if log_level <= logging.TRACE:  # type: ignore[attr-defined]
-                    exec_cmd += " -vv"
-                elif log_level <= logging.DEBUG:
-                    exec_cmd += " -v"
-            cmd.append(exec_cmd)
-            try:
-                sys.stdout.flush()
-                sys.stderr.flush()
-                stdout = os.dup(sys.stdout.fileno())
-                stderr = os.dup(sys.stderr.fileno())
-                fs.fs.execute("; ".join(cmd), stdout=stdout, stderr=stderr)
-                with fs.open(infofile) as fobj:
-                    result_info = ExecutorInfo.from_dict(json.load(fobj))
-                if result_info.result_hash:
-                    return result_info.result
-            except ProcessError:
-                pass
-            return ExecutorResult(None, None, False)

dvc/repo/experiments/ls.py

@@ -31,23 +31,15 @@ def ls(
             rev = [rev]
         revs = iter_revs(repo.scm, rev, num)
         rev_set = set(revs.keys())
+
     ref_info_dict = exp_refs_by_baseline(repo.scm, rev_set, git_remote)
-
-    tags = repo.scm.describe(ref_info_dict.keys())
-    remained = {baseline for baseline, tag in tags.items() if tag is None}
-    base = "refs/heads"
-    ref_heads = repo.scm.describe(remained, base=base)
-
     results = defaultdict(list)
     for baseline in ref_info_dict:
-        name = baseline
-        if tags[baseline] or ref_heads[baseline]:
-            name = tags[baseline] or ref_heads[baseline]
         for info in ref_info_dict[baseline]:
             if git_remote:
                 exp_rev = None
             else:
                 exp_rev = repo.scm.get_ref(str(info))
-            results[name].append((info.name, exp_rev))
+            results[baseline].append((info.name, exp_rev))
 
     return results

dvc/repo/experiments/utils.py

@@ -346,3 +346,55 @@ def to_studio_params(dvc_params):
             result[file_name] = file_data.get("data", {})
 
     return result
+
+
+def describe(
+    scm: "Git",
+    revs: Iterable[str],
+    logger,
+    refs: Optional[Iterable[str]] = None,
+) -> Dict[str, Optional[str]]:
+    """Describe revisions using a tag, branch.
+
+    The first matching name will be returned for each rev. Names are preferred in this
+    order:
+        - current branch (if rev matches HEAD and HEAD is a branch)
+        - tags
+        - branches
+
+    Returns:
+        Dict mapping revisions from revs to a name.
+    """
+
+    head_rev = scm.get_rev()
+    head_ref = scm.get_ref("HEAD", follow=False)
+    if head_ref and head_ref.startswith("refs/heads/"):
+        head_branch = head_ref[len("refs/heads/") :]
+    else:
+        head_branch = None
+
+    tags = {}
+    branches = {}
+    ref_it = iter(refs) if refs else scm.iter_refs()
+    for ref in ref_it:
+        is_tag = ref.startswith("refs/tags/")
+        is_branch = ref.startswith("refs/heads/")
+        if not (is_tag or is_branch):
+            continue
+        rev = scm.get_ref(ref)
+        if not rev:
+            logger.debug("unresolved ref %s", ref)
+            continue
+        if is_tag and rev not in tags:
+            tags[rev] = ref[len("refs/tags/") :]
+        if is_branch and rev not in branches:
+            branches[rev] = ref[len("refs/heads/") :]
+
+    names: Dict[str, Optional[str]] = {}
+    for rev in revs:
+        if rev == head_rev and head_branch:
+            names[rev] = head_branch
+        else:
+            names[rev] = tags.get(rev) or branches.get(rev)
+
+    return names

dvc/repo/fetch.py

@@ -48,7 +48,7 @@ def _collect_indexes(  # noqa: PLR0913
         all_commits=all_commits,
     ):
         try:
-            repo.config.update(config)
+            repo.config.merge(config)
 
             idx = repo.index.targets_view(
                 targets,

dvc/repo/index.py

@@ -413,7 +413,7 @@ class Index:
             by_workspace[workspace].add(key)
 
         for path in self._plot_sources:
-            key = self.repo.fs.path.relparts(path, self.repo.root_dir)
+            key = self.repo.fs.path.parts(path)
             by_workspace["repo"].add(key)
 
         return dict(by_workspace)

dvc/repo/worktree.py

@@ -166,7 +166,7 @@ def push_worktree(
                     latest_only=remote_obj.worktree,
                     jobs=jobs,
                 )
-                pushed += sum(len(changes) for changes in diff.changes.values())
+                pushed += len(diff.files_create)
             except VersioningNotSupported:
                 logger.exception("")
                 raise DvcException(

pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
     "configobj>=5.0.6",
     "distro>=1.3",
     "dpath<3,>=2.1.0",
-    "dvc-data>=2.12.0,<2.13.0",
+    "dvc-data>=2.13.1,<2.14.0",
     "dvc-http>=2.29.0",
     "dvc-render>=0.3.1,<1",
     "dvc-studio-client>=0.9.2,<1",
@@ -57,7 +57,7 @@ dependencies = [
     "requests>=2.22",
     "rich>=12",
     "ruamel.yaml>=0.17.11",
-    "scmrepo>=1.0.4,<2",
+    "scmrepo>=1.2.1,<2",
     "shortuuid>=0.5",
     "shtab<2,>=1.3.4",
     "tabulate>=0.8.7",
@@ -70,7 +70,7 @@ dependencies = [
 [project.optional-dependencies]
 all = ["dvc[azure,gdrive,gs,hdfs,oss,s3,ssh,webdav,webhdfs]"]
 azure = ["dvc-azure>=2.21.2"]
-dev = ["dvc[azure,gdrive,gs,hdfs,lint,oss,s3,ssh,terraform,tests,webdav,webhdfs]"]
+dev = ["dvc[azure,gdrive,gs,hdfs,lint,oss,s3,ssh,tests,webdav,webhdfs]"]
 gdrive = ["dvc-gdrive==2.20"]
 gs = ["dvc-gs==2.22.1"]
 hdfs = ["dvc-hdfs==2.19"]
@@ -89,7 +89,6 @@ oss = ["dvc-oss==2.19"]
 s3 = ["dvc-s3==2.23.0"]
 ssh = ["dvc-ssh>=2.22.1,<3"]
 ssh_gssapi = ["dvc-ssh[gssapi]>=2.22.1,<3"]
-terraform = ["tpi[ssh]>=2.1"]
 testing = [
   "pytest-test-utils",
   "pytest-benchmark[histogram]",

tests/func/experiments/executor/test_ssh.py

@@ -1,162 +0,0 @@
-import posixpath
-from contextlib import contextmanager
-from functools import partial
-from urllib.parse import urlparse
-
-import pytest
-from dvc_ssh import SSHFileSystem
-from dvc_ssh.tests.cloud import TEST_SSH_KEY_PATH, TEST_SSH_USER
-
-from dvc.repo.experiments.executor.base import ExecutorInfo, ExecutorResult
-from dvc.repo.experiments.executor.ssh import SSHExecutor
-from dvc.repo.experiments.refs import EXEC_HEAD, EXEC_MERGE
-
-# pylint: disable-next=wildcard-import
-from tests.func.machine.conftest import *  # noqa: F403
-
-
-@contextmanager
-def _ssh_factory(cloud):
-    yield SSHFileSystem(
-        host=cloud.host,
-        port=cloud.port,
-        user=TEST_SSH_USER,
-        keyfile=TEST_SSH_KEY_PATH,
-    )
-
-
-def test_init_from_stash(tmp_dir, scm, dvc, machine_instance, mocker):
-    mock = mocker.patch.object(SSHExecutor, "_from_stash_entry")
-    mock_entry = mocker.Mock()
-    mock_entry.name = ""
-    SSHExecutor.from_stash_entry(
-        dvc,
-        mock_entry,
-        machine_name="foo",
-    )
-    _args, kwargs = mock.call_args
-    assert kwargs["host"] == machine_instance["instance_ip"]
-
-
-@pytest.mark.needs_internet
-@pytest.mark.parametrize("cloud", [pytest.lazy_fixture("git_ssh")])
-def test_init_git(tmp_dir, dvc, scm, cloud, mocker):
-    tmp_dir.scm_gen({"foo": "foo", "dir": {"bar": "bar"}}, commit="init")
-    baseline_rev = scm.get_rev()
-    tmp_dir.gen("foo", "stashed")
-    scm.gitpython.git.stash()
-    rev = scm.resolve_rev("stash@{0}")
-
-    mock = mocker.Mock(baseline_rev=baseline_rev, head_rev=baseline_rev)
-
-    root_url = cloud / SSHExecutor.gen_dirname()
-
-    executor = SSHExecutor(
-        root_dir=root_url.path,
-        dvc_dir=".dvc",
-        baseline_rev=baseline_rev,
-        host=root_url.host,
-        port=root_url.port,
-        username=TEST_SSH_USER,
-        fs_factory=partial(_ssh_factory, cloud),
-    )
-    infofile = str((root_url / "foo.run").path)
-    executor.init_git(dvc, scm, rev, mock, infofile=infofile)
-    assert root_url.path == executor._repo_abspath
-
-    fs = cloud._ssh
-    assert fs.exists(posixpath.join(executor._repo_abspath, "foo"))
-    assert fs.exists(posixpath.join(executor._repo_abspath, "dir"))
-    assert fs.exists(posixpath.join(executor._repo_abspath, "dir", "bar"))
-
-
-@pytest.mark.needs_internet
-@pytest.mark.parametrize("cloud", [pytest.lazy_fixture("git_ssh")])
-def test_init_cache(tmp_dir, dvc, scm, cloud):
-    foo = tmp_dir.dvc_gen("foo", "foo", commit="init")[0].outs[0]
-    rev = scm.get_rev()
-    scm.set_ref(EXEC_HEAD, rev)
-    scm.set_ref(EXEC_MERGE, rev)
-    root_url = cloud / SSHExecutor.gen_dirname()
-
-    executor = SSHExecutor(
-        root_dir=root_url.path,
-        dvc_dir=".dvc",
-        baseline_rev=rev,
-        host=root_url.host,
-        port=root_url.port,
-        username=TEST_SSH_USER,
-        fs_factory=partial(_ssh_factory, cloud),
-    )
-    executor.init_cache(dvc, rev)
-
-    fs = cloud._ssh
-    foo_hash = foo.hash_info.value
-    assert fs.exists(
-        posixpath.join(
-            executor._repo_abspath, ".dvc", "cache", foo_hash[:2], foo_hash[2:]
-        )
-    )
-
-
-@pytest.mark.needs_internet
-@pytest.mark.parametrize("cloud", [pytest.lazy_fixture("git_ssh")])
-def test_reproduce(tmp_dir, scm, dvc, cloud, exp_stage, mocker):
-    from sshfs import SSHFileSystem as _sshfs  # noqa: N813
-
-    rev = scm.get_rev()
-    root_url = cloud / SSHExecutor.gen_dirname()
-    mocker.patch.object(SSHFileSystem, "exists", return_value=True)
-    mock_execute = mocker.patch.object(_sshfs, "execute")
-    info = ExecutorInfo(
-        str(root_url),
-        rev,
-        "machine-foo",
-        str(root_url.path),
-        ".dvc",
-    )
-    infofile = str((root_url / "foo.run").path)
-    SSHExecutor.reproduce(
-        info,
-        rev,
-        fs_factory=partial(_ssh_factory, cloud),
-    )
-    mock_execute.assert_called_once()
-    _name, args, _kwargs = mock_execute.mock_calls[0]
-    assert f"dvc exp exec-run --infofile {infofile}" in args[0]
-
-
-@pytest.mark.needs_internet
-@pytest.mark.parametrize("cloud", [pytest.lazy_fixture("git_ssh")])
-def test_run_machine(tmp_dir, scm, dvc, cloud, exp_stage, mocker):
-    baseline = scm.get_rev()
-    factory = partial(_ssh_factory, cloud)
-    mocker.patch.object(
-        dvc.machine,
-        "get_executor_kwargs",
-        return_value={
-            "host": cloud.host,
-            "port": cloud.port,
-            "username": TEST_SSH_USER,
-            "fs_factory": factory,
-        },
-    )
-    mocker.patch.object(dvc.machine, "get_setup_script", return_value=None)
-    mock_repro = mocker.patch.object(
-        SSHExecutor,
-        "reproduce",
-        return_value=ExecutorResult("abc123", None, False),
-    )
-
-    tmp_dir.gen("params.yaml", "foo: 2")
-    dvc.experiments.run(exp_stage.addressing, machine="foo")
-    mock_repro.assert_called_once()
-    _name, _args, kwargs = mock_repro.mock_calls[0]
-    info = kwargs["info"]
-    url = urlparse(info.git_url)
-    assert url.scheme == "ssh"
-    assert url.hostname == cloud.host
-    assert url.port == cloud.port
-    assert info.baseline_rev == baseline
-    assert kwargs["infofile"] is not None
-    assert kwargs["fs_factory"] is not None

tests/func/experiments/test_experiments.py

@@ -348,7 +348,8 @@ def test_packed_args_exists(tmp_dir, scm, dvc, exp_stage, caplog):
 
 
 def test_list(tmp_dir, scm, dvc, exp_stage):
-    baseline_a = scm.get_rev()
+    baseline_old = scm.get_rev()
+
     results = dvc.experiments.run(exp_stage.addressing, params=["foo=2"])
     exp_a = first(results)
     ref_info_a = first(exp_refs_by_rev(scm, exp_a))
@@ -358,34 +359,36 @@ def test_list(tmp_dir, scm, dvc, exp_stage):
     ref_info_b = first(exp_refs_by_rev(scm, exp_b))
 
     tmp_dir.scm_gen("new", "new", commit="new")
+    baseline_new = scm.get_rev()
+
     results = dvc.experiments.run(exp_stage.addressing, params=["foo=4"])
     exp_c = first(results)
     ref_info_c = first(exp_refs_by_rev(scm, exp_c))
 
-    assert dvc.experiments.ls() == {"refs/heads/master": [(ref_info_c.name, exp_c)]}
+    assert dvc.experiments.ls() == {baseline_new: [(ref_info_c.name, exp_c)]}
 
     exp_list = dvc.experiments.ls(rev=ref_info_a.baseline_sha)
     assert {key: set(val) for key, val in exp_list.items()} == {
-        baseline_a: {(ref_info_a.name, exp_a), (ref_info_b.name, exp_b)}
+        baseline_old: {(ref_info_a.name, exp_a), (ref_info_b.name, exp_b)}
     }
 
-    exp_list = dvc.experiments.ls(rev=[baseline_a, scm.get_rev()])
+    exp_list = dvc.experiments.ls(rev=[baseline_old, baseline_new])
     assert {key: set(val) for key, val in exp_list.items()} == {
-        baseline_a: {(ref_info_a.name, exp_a), (ref_info_b.name, exp_b)},
-        "refs/heads/master": {(ref_info_c.name, exp_c)},
+        baseline_old: {(ref_info_a.name, exp_a), (ref_info_b.name, exp_b)},
+        baseline_new: {(ref_info_c.name, exp_c)},
     }
 
     exp_list = dvc.experiments.ls(all_commits=True)
     assert {key: set(val) for key, val in exp_list.items()} == {
-        baseline_a: {(ref_info_a.name, exp_a), (ref_info_b.name, exp_b)},
-        "refs/heads/master": {(ref_info_c.name, exp_c)},
+        baseline_old: {(ref_info_a.name, exp_a), (ref_info_b.name, exp_b)},
+        baseline_new: {(ref_info_c.name, exp_c)},
     }
 
     scm.checkout("branch", True)
     exp_list = dvc.experiments.ls(all_commits=True)
     assert {key: set(val) for key, val in exp_list.items()} == {
-        baseline_a: {(ref_info_a.name, exp_a), (ref_info_b.name, exp_b)},
-        "refs/heads/branch": {(ref_info_c.name, exp_c)},
+        baseline_old: {(ref_info_a.name, exp_a), (ref_info_b.name, exp_b)},
+        baseline_new: {(ref_info_c.name, exp_c)},
     }
 
 
@@ -666,7 +669,7 @@ def test_experiment_unchanged(tmp_dir, scm, dvc, exp_stage):
     dvc.experiments.run(exp_stage.addressing)
     dvc.experiments.run(exp_stage.addressing)
 
-    assert len(dvc.experiments.ls()["refs/heads/master"]) == 2
+    assert len(dvc.experiments.ls()[scm.get_rev()]) == 2
 
 
 def test_experiment_run_dry(tmp_dir, scm, dvc, exp_stage):

tests/func/experiments/test_remote.py

@@ -139,7 +139,7 @@ def test_push_ambiguous_name(tmp_dir, scm, dvc, git_upstream, exp_stage):
 
 @pytest.mark.parametrize("use_url", [True, False])
 def test_list_remote(tmp_dir, scm, dvc, git_downstream, exp_stage, use_url):
-    baseline_a = scm.get_rev()
+    baseline_old = scm.get_rev()
     results = dvc.experiments.run(exp_stage.addressing, params=["foo=2"])
     exp_a = first(results)
     ref_info_a = first(exp_refs_by_rev(scm, exp_a))
@@ -149,6 +149,8 @@ def test_list_remote(tmp_dir, scm, dvc, git_downstream, exp_stage, use_url):
     ref_info_b = first(exp_refs_by_rev(scm, exp_b))
 
     tmp_dir.scm_gen("new", "new", commit="new")
+    baseline_new = scm.get_rev()
+
     results = dvc.experiments.run(exp_stage.addressing, params=["foo=4"])
     exp_c = first(results)
     ref_info_c = first(exp_refs_by_rev(scm, exp_c))
@@ -160,15 +162,15 @@ def test_list_remote(tmp_dir, scm, dvc, git_downstream, exp_stage, use_url):
     assert downstream_exp.ls(git_remote=remote) == {}
 
     git_downstream.tmp_dir.scm.fetch_refspecs(remote, ["master:master"])
-    exp_list = downstream_exp.ls(rev=baseline_a, git_remote=remote)
+    exp_list = downstream_exp.ls(rev=baseline_old, git_remote=remote)
     assert {key: set(val) for key, val in exp_list.items()} == {
-        baseline_a: {(ref_info_a.name, None), (ref_info_b.name, None)}
+        baseline_old: {(ref_info_a.name, None), (ref_info_b.name, None)}
     }
 
     exp_list = downstream_exp.ls(all_commits=True, git_remote=remote)
     assert {key: set(val) for key, val in exp_list.items()} == {
-        baseline_a: {(ref_info_a.name, None), (ref_info_b.name, None)},
-        "refs/heads/master": {(ref_info_c.name, None)},
+        baseline_old: {(ref_info_a.name, None), (ref_info_b.name, None)},
+        baseline_new: {(ref_info_c.name, None)},
     }
 
 

tests/func/experiments/test_save.py

@@ -67,11 +67,12 @@ def test_exp_save_after_commit(tmp_dir, dvc, scm):
     dvc.experiments.save(name="exp-1", force=True)
 
     tmp_dir.scm_gen({"new_file": "new_file"}, commit="new baseline")
+    baseline_new = scm.get_rev()
     dvc.experiments.save(name="exp-2", force=True)
 
     all_exps = dvc.experiments.ls(all_commits=True)
     assert all_exps[baseline][0][0] == "exp-1"
-    assert all_exps["refs/heads/master"][0][0] == "exp-2"
+    assert all_exps[baseline_new][0][0] == "exp-2"
 
 
 def test_exp_save_with_staged_changes(tmp_dir, dvc, scm):

tests/func/machine/conftest.py

@@ -1,55 +0,0 @@
-import textwrap
-
-import pytest
-
-BASIC_CONFIG = textwrap.dedent(
-    """\
-        [feature]
-            machine = true
-        ['machine "foo"']
-            cloud = aws
-    """
-)
-
-TEST_INSTANCE = {
-    "aws_security_group": None,
-    "cloud": "aws",
-    "id": "iterative-2jyhw8j9ieov6",
-    "image": "ubuntu-bionic-18.04-amd64-server-20210818",
-    "instance_gpu": None,
-    "instance_hdd_size": 35,
-    "instance_ip": "123.123.123.123",
-    "instance_launch_time": "2021-08-25T07:13:03Z",
-    "instance_type": "m",
-    "name": "test-resource",
-    "region": "us-west",
-    "spot": False,
-    "spot_price": -1,
-    "ssh_name": None,
-    "ssh_private": "-----BEGIN RSA PRIVATE KEY-----\\n",
-    "startup_script": "IyEvYmluL2Jhc2g=",
-    "timeouts": None,
-}
-
-
-@pytest.fixture
-def machine_config(tmp_dir):
-    (tmp_dir / ".dvc" / "config").write_text(BASIC_CONFIG)
-    return BASIC_CONFIG
-
-
-@pytest.fixture
-def machine_instance(tmp_dir, dvc, mocker):
-    with dvc.config.edit() as conf:
-        conf["machine"]["foo"] = {"cloud": "aws"}
-
-    def mock_instances(name=None, **kwargs):
-        if name == "foo":
-            return iter([TEST_INSTANCE])
-        return iter([])
-
-    mocker.patch(
-        "tpi.terraform.TerraformBackend.instances",
-        mocker.MagicMock(side_effect=mock_instances),
-    )
-    return TEST_INSTANCE

tests/func/machine/test_machine_config.py

@@ -1,163 +0,0 @@
-import os
-import textwrap
-
-import pytest
-
-from dvc.cli import main
-from dvc.ui import ui
-from tests.utils import console_width
-
-from .conftest import BASIC_CONFIG
-
-
-@pytest.mark.parametrize(
-    "slot,value",
-    [
-        ("region", "us-west"),
-        ("image", "iterative-cml"),
-        ("spot", "True"),
-        ("spot_price", "1.2345"),
-        ("spot_price", "12345"),
-        ("instance_hdd_size", "10"),
-        ("instance_type", "l"),
-        ("instance_gpu", "tesla"),
-        ("ssh_private", "secret"),
-    ],
-)
-def test_machine_modify_susccess(tmp_dir, dvc, machine_config, slot, value):
-    assert main(["machine", "modify", "foo", slot, value]) == 0
-    assert (
-        tmp_dir / ".dvc" / "config"
-    ).read_text() == machine_config + f"    {slot} = {value}\n"
-    assert main(["machine", "modify", "--unset", "foo", slot]) == 0
-    assert (tmp_dir / ".dvc" / "config").read_text() == machine_config
-
-
-def test_machine_modify_startup_script(tmp_dir, dvc, machine_config):
-    slot, value = "startup_script", "start.sh"
-    assert main(["machine", "modify", "foo", slot, value]) == 0
-    assert (
-        tmp_dir / ".dvc" / "config"
-    ).read_text() == machine_config + f"    {slot} = ../{value}\n"
-    assert main(["machine", "modify", "--unset", "foo", slot]) == 0
-    assert (tmp_dir / ".dvc" / "config").read_text() == machine_config
-
-
-@pytest.mark.parametrize(
-    "slot,value,msg",
-    [
-        (
-            "region",
-            "other-west",
-            "expected one of us-west, us-east, eu-west, eu-north",
-        ),
-        ("spot_price", "NUM", "expected float"),
-        ("instance_hdd_size", "BIG", "expected int"),
-    ],
-)
-def test_machine_modify_fail(tmp_dir, dvc, machine_config, caplog, slot, value, msg):
-    assert main(["machine", "modify", "foo", slot, value]) == 251
-    assert (tmp_dir / ".dvc" / "config").read_text() == machine_config
-    assert msg in caplog.text
-
-
-FULL_CONFIG_TEXT = textwrap.dedent(
-    """\
-        [feature]
-            machine = true
-        ['machine \"bar\"']
-            cloud = azure
-        ['machine \"foo\"']
-            cloud = aws
-            region = us-west
-            image = iterative-cml
-            spot = True
-            spot_price = 1.2345
-            instance_hdd_size = 10
-            instance_type = l
-            instance_gpu = tesla
-            ssh_private = secret
-            startup_script = {}
-    """.format(
-        os.path.join("..", "start.sh")
-    )
-)
-
-
-def test_machine_list(tmp_dir, dvc, capsys):
-    from dvc.commands.machine import CmdMachineList
-
-    (tmp_dir / ".dvc" / "config").write_text(FULL_CONFIG_TEXT)
-
-    with console_width(ui.rich_console, 255):
-        assert main(["machine", "list"]) == 0
-    out, _ = capsys.readouterr()
-    for key in CmdMachineList.TABLE_COLUMNS:
-        assert f"{key}" in out
-    assert "bar     azure    -         -" in out
-    assert "foo     aws      us-west   iterative-cml  True    1.2345" in out
-    assert "10                   l                ***            ***" in out
-    assert "tesla" in out
-
-    with console_width(ui.rich_console, 255):
-        assert main(["machine", "list", "bar"]) == 0
-    out, _ = capsys.readouterr()
-    assert "foo" not in out
-    assert "name    cloud" in out
-    assert "bar     azure" in out
-
-
-def test_machine_rename_success(tmp_dir, scm, dvc, machine_config, capsys, mocker):
-    import tpi
-
-    config_file = tmp_dir / ".dvc" / "config"
-
-    mocker.patch.object(
-        tpi.terraform.TerraformBackend,
-        "state_mv",
-        autospec=True,
-        return_value=True,
-    )
-
-    os.makedirs(tmp_dir / ".dvc" / "tmp" / "machine" / "terraform" / "foo")
-
-    assert main(["machine", "rename", "foo", "bar"]) == 0
-    cap = capsys.readouterr()
-    assert "Rename machine 'foo' to 'bar'." in cap.out
-    assert config_file.read_text() == machine_config.replace("foo", "bar")
-    assert not (tmp_dir / ".dvc" / "tmp" / "machine" / "terraform" / "foo").exists()
-    assert (tmp_dir / ".dvc" / "tmp" / "machine" / "terraform" / "bar").exists()
-
-
-def test_machine_rename_none_exist(tmp_dir, scm, dvc, caplog):
-    config_alice = BASIC_CONFIG.replace("foo", "alice")
-    config_file = tmp_dir / ".dvc" / "config"
-    config_file.write_text(config_alice)
-    assert main(["machine", "rename", "foo", "bar"]) == 251
-    assert config_file.read_text() == config_alice
-    assert "machine 'foo' doesn't exist." in caplog.text
-
-
-def test_machine_rename_exist(tmp_dir, scm, dvc, caplog):
-    config_bar = BASIC_CONFIG + "['machine \"bar\"']\n    cloud = aws"
-    config_file = tmp_dir / ".dvc" / "config"
-    config_file.write_text(config_bar)
-    assert main(["machine", "rename", "foo", "bar"]) == 251
-    assert config_file.read_text() == config_bar
-    assert "Machine 'bar' already exists." in caplog.text
-
-
-def test_machine_rename_error(tmp_dir, scm, dvc, machine_config, caplog, mocker):
-    import tpi
-
-    config_file = tmp_dir / ".dvc" / "config"
-    os.makedirs(tmp_dir / ".dvc" / "tmp" / "machine" / "terraform" / "foo")
-
-    def cmd_error(self, source, destination, **kwargs):
-        raise tpi.TPIError("test error")
-
-    mocker.patch.object(tpi.terraform.TerraformBackend, "state_mv", cmd_error)
-
-    assert main(["machine", "rename", "foo", "bar"]) == 251
-    assert config_file.read_text() == machine_config
-    assert "rename failed" in caplog.text

tests/func/machine/test_machine_status.py

@@ -1,22 +0,0 @@
-from dvc.cli import main
-from dvc.ui import ui
-from tests.utils import console_width
-
-
-def test_status(tmp_dir, scm, dvc, machine_config, machine_instance, capsys):
-    assert main(["machine", "add", "bar", "aws"]) == 0
-    with console_width(ui.rich_console, 255):
-        assert main(["machine", "status"]) == 0
-    cap = capsys.readouterr()
-    assert (
-        "name    instance    status    cloud    instance_ip      "
-        "instance_type    instance_hdd_size    instance_gpu" in cap.out
-    )
-    assert (
-        "bar     -           offline   -        -                "
-        "-                -                    -" in cap.out
-    )
-    assert (
-        "foo     num_1       running   aws      123.123.123.123  "
-        "m                35                   None" in cap.out
-    )

tests/func/repro/test_repro.py

@@ -1366,3 +1366,27 @@ def test_repro_ignore_errors(mocker, tmp_dir, dvc, copy_script):
         [bar_call, stage1_call, foo_call, stage2_call],
         [foo_call, bar_call, stage1_call, stage2_call],
     )
+
+
+@pytest.mark.parametrize("persist", [True, False])
+def test_repro_external_outputs(tmp_dir, dvc, local_workspace, persist):
+    local_workspace.gen("foo", "foo")
+    foo_path = str(local_workspace / "foo")
+    bar_path = str(local_workspace / "bar")
+    outs = {"outs_no_cache": [bar_path]}
+    if persist:
+        outs = {"outs_persist_no_cache": [bar_path]}
+    dvc.run(
+        name="mystage",
+        cmd=f"cp {foo_path} {bar_path}",
+        deps=[foo_path],
+        no_exec=True,
+        **outs,
+    )
+
+    dvc.reproduce()
+    dvc.reproduce(force=True)
+
+    assert (local_workspace / "foo").read_text() == "foo"
+    assert (local_workspace / "bar").read_text() == "foo"
+    assert not (local_workspace / "cache").exists()

tests/func/test_config.py

@@ -265,14 +265,16 @@ def test_load_relative_paths(dvc, field, remote_url):
 
     # check if written paths are correct
     dvc_dir = dvc.config.dvc_dir
-    assert dvc.config["remote"]["test"][field] == os.path.join(
-        dvc_dir, "..", "file.txt"
+    assert dvc.config["remote"]["test"][field] == os.path.abspath(
+        os.path.join(dvc_dir, "..", "file.txt")
     )
 
     # load config and check that it contains what we expect
     # (relative paths are evaluated correctly)
     cfg = Config(dvc_dir)
-    assert cfg["remote"]["test"][field] == os.path.join(dvc_dir, "..", "file.txt")
+    assert cfg["remote"]["test"][field] == os.path.abspath(
+        os.path.join(dvc_dir, "..", "file.txt")
+    )
 
 
 def test_config_gdrive_fields(tmp_dir, dvc):

tests/unit/command/test_experiments.py

@@ -125,7 +125,6 @@ def test_experiments_run(dvc, scm, mocker):
         "run_all": False,
         "jobs": 1,
         "tmp_dir": False,
-        "machine": None,
         "copy_paths": [],
         "message": None,
     }
@@ -189,7 +188,7 @@ def test_experiments_list(dvc, scm, mocker):
 @pytest.mark.parametrize(
     "args,expected",
     [
-        ([], "main:\n\tsha-a [exp-a]\n"),
+        ([], "master:\n\tsha-a [exp-a]\n"),
         (["--name-only"], "exp-a\n"),
         (["--sha-only"], "sha-a\n"),
     ],
@@ -198,7 +197,7 @@ def test_experiments_list_format(mocker, capsys, args, expected, dvc, scm):
     mocker.patch(
         "dvc.repo.experiments.ls.ls",
         return_value={
-            "refs/heads/main": [
+            scm.get_rev(): [
                 ("exp-a", "sha-a"),
             ]
         },

tests/unit/command/test_machine.py

@@ -1,167 +0,0 @@
-import os
-
-import configobj
-import pytest
-
-from dvc.cli import parse_args
-from dvc.commands.machine import (
-    CmdMachineAdd,
-    CmdMachineCreate,
-    CmdMachineDestroy,
-    CmdMachineList,
-    CmdMachineModify,
-    CmdMachineRemove,
-    CmdMachineRename,
-    CmdMachineSsh,
-    CmdMachineStatus,
-)
-
-DATA = {
-    ".dvc": {
-        "config": (
-            "[feature]\n"
-            "  machine = true\n"
-            "['machine \"foo\"']\n"
-            "  cloud = aws\n"
-            "['machine \"myaws\"']\n"
-            "  cloud = aws"
-        )
-    }
-}
-
-
-def test_add(tmp_dir):
-    tmp_dir.gen({".dvc": {"config": "[feature]\n  machine = true"}})
-    cli_args = parse_args(["machine", "add", "foo", "aws"])
-    assert cli_args.func == CmdMachineAdd
-    cmd = cli_args.func(cli_args)
-    assert cmd.run() == 0
-    config = configobj.ConfigObj(str(tmp_dir / ".dvc" / "config"))
-    assert config['machine "foo"']["cloud"] == "aws"
-
-
-def test_remove(tmp_dir):
-    tmp_dir.gen(DATA)
-    cli_args = parse_args(["machine", "remove", "foo"])
-    assert cli_args.func == CmdMachineRemove
-    cmd = cli_args.func(cli_args)
-    assert cmd.run() == 0
-    config = configobj.ConfigObj(str(tmp_dir / ".dvc" / "config"))
-    assert list(config.keys()) == ["feature", 'machine "myaws"']
-
-
-def test_create(tmp_dir, dvc, mocker):
-    cli_args = parse_args(["machine", "create", "foo"])
-    assert cli_args.func == CmdMachineCreate
-
-    cmd = cli_args.func(cli_args)
-    m = mocker.patch.object(cmd.repo.machine, "create", autospec=True, return_value=0)
-
-    assert cmd.run() == 0
-    m.assert_called_once_with("foo")
-
-
-def test_status(tmp_dir, scm, dvc, mocker):
-    tmp_dir.gen(DATA)
-    cli_args = parse_args(["machine", "status", "foo"])
-    assert cli_args.func == CmdMachineStatus
-
-    cmd = cli_args.func(cli_args)
-    m = mocker.patch.object(cmd.repo.machine, "status", autospec=True, return_value=[])
-    assert cmd.run() == 0
-    m.assert_called_once_with("foo")
-
-    cli_args = parse_args(["machine", "status"])
-    cmd = cli_args.func(cli_args)
-    m = mocker.patch.object(cmd.repo.machine, "status", autospec=True, return_value=[])
-    assert cmd.run() == 0
-    assert m.call_count == 2
-    m.assert_has_calls([mocker.call("foo"), mocker.call("myaws")])
-
-
-def test_destroy(tmp_dir, dvc, mocker):
-    cli_args = parse_args(["machine", "destroy", "foo"])
-    assert cli_args.func == CmdMachineDestroy
-
-    cmd = cli_args.func(cli_args)
-    m = mocker.patch.object(cmd.repo.machine, "destroy", autospec=True, return_value=0)
-
-    assert cmd.run() == 0
-    m.assert_called_once_with("foo")
-
-
-def test_ssh(tmp_dir, dvc, mocker):
-    cli_args = parse_args(["machine", "ssh", "foo"])
-    assert cli_args.func == CmdMachineSsh
-
-    cmd = cli_args.func(cli_args)
-    m = mocker.patch.object(
-        cmd.repo.machine, "run_shell", autospec=True, return_value=0
-    )
-
-    assert cmd.run() == 0
-    m.assert_called_once_with("foo")
-
-
-@pytest.mark.parametrize("show_origin", [["--show-origin"], []])
-def test_list(tmp_dir, mocker, show_origin):
-    from dvc.compare import TabularData
-    from dvc.ui import ui
-
-    tmp_dir.gen(DATA)
-    cli_args = parse_args(["machine", "list", *show_origin, "foo"])
-    assert cli_args.func == CmdMachineList
-    cmd = cli_args.func(cli_args)
-    if show_origin:
-        m = mocker.patch.object(ui, "write", autospec=True)
-    else:
-        m = mocker.patch.object(TabularData, "render", autospec=True)
-    assert cmd.run() == 0
-    if show_origin:
-        m.assert_called_once_with(f".dvc{os.sep}config	cloud=aws")
-    else:
-        m.assert_called_once()
-
-
-def test_modified(tmp_dir):
-    tmp_dir.gen(DATA)
-    cli_args = parse_args(["machine", "modify", "foo", "cloud", "azure"])
-    assert cli_args.func == CmdMachineModify
-    cmd = cli_args.func(cli_args)
-    assert cmd.run() == 0
-    config = configobj.ConfigObj(str(tmp_dir / ".dvc" / "config"))
-    assert config['machine "foo"']["cloud"] == "azure"
-
-
-def test_rename(tmp_dir, scm, dvc):
-    tmp_dir.gen(DATA)
-    cli_args = parse_args(["machine", "rename", "foo", "bar"])
-    assert cli_args.func == CmdMachineRename
-    cmd = cli_args.func(cli_args)
-    assert cmd.run() == 0
-    config = configobj.ConfigObj(str(tmp_dir / ".dvc" / "config"))
-    assert config['machine "bar"']["cloud"] == "aws"
-
-
-@pytest.mark.parametrize(
-    "cmd,use_config",
-    [
-        ("add", True),
-        ("default", True),
-        ("remove", True),
-        ("list", True),
-        ("modify", True),
-        ("create", False),
-        ("destroy", False),
-        ("rename", True),
-        ("status", False),
-        ("ssh", False),
-    ],
-)
-def test_help_message(tmp_dir, scm, dvc, cmd, use_config, capsys):
-    try:
-        parse_args(["machine", cmd, "--help"])
-    except SystemExit:
-        pass
-    cap = capsys.readouterr()
-    assert ("--global" in cap.out) is use_config

tests/unit/machine/test_machine.py

@@ -1,36 +0,0 @@
-import pytest
-
-
-def test_validate_name():
-    from dvc.exceptions import InvalidArgumentError
-    from dvc.machine import RESERVED_NAMES, validate_name
-
-    for name in RESERVED_NAMES:
-        with pytest.raises(InvalidArgumentError):
-            validate_name(name)
-
-
-@pytest.mark.parametrize("cloud", ["aws", "azure"])
-def test_get_config_and_backend(tmp_dir, dvc, cloud):
-    from dvc.machine.backend.terraform import TerraformBackend
-
-    name = "foo"
-    with dvc.config.edit() as conf:
-        conf["machine"][name] = {"cloud": cloud}
-    config, backend = dvc.machine.get_config_and_backend(name)
-    assert config == {"cloud": cloud, "name": name}
-    assert isinstance(backend, TerraformBackend)
-
-
-def test_get_config_and_backend_nonexistent(tmp_dir, dvc):
-    from dvc.config import MachineNotFoundError
-
-    with pytest.raises(MachineNotFoundError):
-        dvc.machine.get_config_and_backend("foo")
-
-
-def test_get_config_and_backend_default(tmp_dir, dvc):
-    from dvc.config import NoMachineError
-
-    with pytest.raises(NoMachineError):
-        dvc.machine.get_config_and_backend()

tests/unit/scm/test_scm.py

@@ -76,6 +76,12 @@ def test_iter_revs(
                 commit_time_offset=0,
                 message="dummy",
                 parents=["dummy"],
+                committer_name="dummy",
+                committer_email="dummy",
+                author_name="dummy",
+                author_email="dummy",
+                author_time=datetime(2022, 6, 28).timestamp(),
+                author_time_offset=0,
             )
         if rev == rev_old:
             raise SCMError
@@ -85,6 +91,12 @@ def test_iter_revs(
             commit_time_offset=0,
             message="dummy",
             parents=["dummy"],
+            committer_name="dummy",
+            committer_email="dummy",
+            author_name="dummy",
+            author_email="dummy",
+            author_time=datetime(2022, 6, 28).timestamp(),
+            author_time_offset=0,
         )
 
     mocker.patch(

tests/unit/test_config.py

@@ -21,6 +21,29 @@ def test_to_relpath(path, expected):
     assert Config._to_relpath(os.path.join(".", "config"), path) == expected
 
 
+@pytest.mark.parametrize(
+    "path, expected",
+    [
+        ("cache", os.path.abspath(os.path.join("conf_dir", "cache"))),
+        ("dir/cache", os.path.abspath(os.path.join("conf_dir", "dir", "cache"))),
+        ("../cache", os.path.abspath("cache")),
+        (os.getcwd(), os.getcwd()),
+        ("ssh://some/path", "ssh://some/path"),
+    ],
+)
+def test_resolve(path, expected):
+    conf_dir = os.path.abspath("conf_dir")
+    assert Config._resolve(conf_dir, path) == expected
+
+
+def test_resolve_homedir():
+    # NOTE: our test suit patches $HOME, but that only works within the
+    # test itself, so we can't use expanduser in @parametrize here.
+    conf_dir = os.path.abspath("conf_dir")
+    expected = os.path.expanduser(os.path.join("~", "cache"))
+    assert Config._resolve(conf_dir, "~/cache") == expected
+
+
 def test_get_fs(tmp_dir, scm):
     tmp_dir.scm_gen("foo", "foo", commit="add foo")