diff --git a/dvc/repo/experiments/show.py b/dvc/repo/experiments/show.py index 216289926..dfd28bf21 100644 --- a/dvc/repo/experiments/show.py +++ b/dvc/repo/experiments/show.py @@ -71,7 +71,9 @@ def _collect_experiment_commit( def _collect_experiment_branch( res, repo, branch, baseline, onerror: Optional[Callable] = None, **kwargs ): - exp_rev = repo.scm.resolve_rev(branch) + from dvc.scm import resolve_rev + + exp_rev = resolve_rev(repo.scm, branch) prev = None revs = list(repo.scm.branch_revs(exp_rev, baseline)) for rev in revs: diff --git a/dvc/scm/__init__.py b/dvc/scm/__init__.py index ef26017f4..bb28871a1 100644 --- a/dvc/scm/__init__.py +++ b/dvc/scm/__init__.py @@ -87,4 +87,14 @@ def resolve_rev(scm: "Git", rev: str) -> str: try: return scm.resolve_rev(rev) except InternalRevError as exc: + # `scm` will only resolve git branch and tag names, + # if rev is not a sha it may be an abbreviated experiment name + if not scm.is_sha(rev) and not rev.startswith("refs/"): + from dvc.repo.experiments.utils import exp_refs_by_name + + ref_infos = list(exp_refs_by_name(scm, rev)) + if len(ref_infos) == 1: + return scm.get_ref(str(ref_infos[0])) + if len(ref_infos) > 1: + raise RevError(f"ambiguous Git revision '{rev}'") raise RevError(str(exc)) diff --git a/dvc/scm/git/__init__.py b/dvc/scm/git/__init__.py index 53942ace1..3e10e9f26 100644 --- a/dvc/scm/git/__init__.py +++ b/dvc/scm/git/__init__.py @@ -282,7 +282,7 @@ class Git(Base): list_tags = partialmethod(_backend_func, "list_tags") list_all_commits = partialmethod(_backend_func, "list_all_commits") get_rev = partialmethod(_backend_func, "get_rev") - _resolve_rev = partialmethod(_backend_func, "resolve_rev") + resolve_rev = partialmethod(_backend_func, "resolve_rev") resolve_commit = partialmethod(_backend_func, "resolve_commit") set_ref = partialmethod(_backend_func, "set_ref") @@ -306,22 +306,6 @@ class Git(Base): validate_git_remote = partialmethod(_backend_func, "validate_git_remote") check_ref_format = partialmethod(_backend_func, "check_ref_format") - def resolve_rev(self, rev: str) -> str: - from dvc.repo.experiments.utils import exp_refs_by_name - - try: - return self._resolve_rev(rev) - except RevError: - # backends will only resolve git branch and tag names, - # if rev is not a sha it may be an abbreviated experiment name - if not self.is_sha(rev) and not rev.startswith("refs/"): - ref_infos = list(exp_refs_by_name(self, rev)) - if len(ref_infos) == 1: - return self.get_ref(str(ref_infos[0])) - if len(ref_infos) > 1: - raise RevError(f"ambiguous Git revision '{rev}'") - raise - def branch_revs( self, branch: str, end_rev: Optional[str] = None ) -> Iterable[str]: diff --git a/tests/func/experiments/test_experiments.py b/tests/func/experiments/test_experiments.py index 58bfcd66d..22fb447a2 100644 --- a/tests/func/experiments/test_experiments.py +++ b/tests/func/experiments/test_experiments.py @@ -9,6 +9,7 @@ from funcy import first from dvc.dvcfile import PIPELINE_FILE from dvc.exceptions import DvcException from dvc.repo.experiments.utils import exp_refs_by_rev +from dvc.scm import resolve_rev from dvc.utils.serialize import PythonFileCorruptedError from tests.func.test_repro_multistage import COPY_SCRIPT @@ -39,7 +40,7 @@ def test_new_simple(tmp_dir, scm, dvc, exp_stage, mocker, name, workspace): exp_name = name if name else ref_info.name assert dvc.experiments.get_exact_name(exp) == exp_name - assert scm.resolve_rev(exp_name) == exp + assert resolve_rev(scm, exp_name) == exp @pytest.mark.parametrize("workspace", [True, False]) @@ -518,7 +519,7 @@ def test_subdir(tmp_dir, scm, dvc, workspace): assert fobj.read().strip() == "foo: 2" assert dvc.experiments.get_exact_name(exp) == ref_info.name - assert scm.resolve_rev(ref_info.name) == exp + assert resolve_rev(scm, ref_info.name) == exp @pytest.mark.parametrize("workspace", [True, False]) @@ -563,7 +564,7 @@ def test_subrepo(tmp_dir, scm, workspace): assert fobj.read().strip() == "foo: 2" assert subrepo.dvc.experiments.get_exact_name(exp) == ref_info.name - assert scm.resolve_rev(ref_info.name) == exp + assert resolve_rev(scm, ref_info.name) == exp def test_queue(tmp_dir, scm, dvc, exp_stage, mocker):