scm: remove exp related behaviours from scm.resolve_rev

This commit is contained in:
Saugat Pachhai (सौगात)
2021-11-24 11:39:39 +05:45
committed by Saugat Pachhai
parent 13ca959e98
commit 48581715b6
4 changed files with 18 additions and 21 deletions
+3 -1
View File
@@ -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:
+10
View File
@@ -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))
+1 -17
View File
@@ -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]:
+4 -3
View File
@@ -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):