scm: remove dvc specific message; add client kwarg

This commit removes dvc specific message hardcoded in
scm.detach_head. Now that we are decoupling scm, we are
adding `client=` kwarg to be set by the caller.
This commit is contained in:
Saugat Pachhai (सौगात)
2021-11-25 12:05:25 +02:00
committed by Ruslan Kuprieiev
parent 95c726b297
commit c9cd4a8c51
2 changed files with 9 additions and 4 deletions
+2 -2
View File
@@ -165,7 +165,7 @@ class Experiments:
the human-readable name in the experiment branch ref. Has no
effect of branch is specified.
"""
with self.scm.detach_head() as orig_head:
with self.scm.detach_head(client="dvc") as orig_head:
stash_head = orig_head
if baseline_rev is None:
baseline_rev = orig_head
@@ -810,7 +810,7 @@ class Experiments:
# `checkout --force` here will not lose any data (popping stash commit
# will result in conflict between workspace params and stashed CLI
# params, but we always want the stashed version).
with self.scm.detach_head(entry.rev, force=True):
with self.scm.detach_head(entry.rev, force=True, client="dvc"):
rev = self.stash.pop()
self.scm.set_ref(EXEC_BASELINE, entry.baseline_rev)
if entry.branch:
+7 -2
View File
@@ -317,7 +317,12 @@ class Git(Base):
commit = self.resolve_commit(parent)
@contextmanager
def detach_head(self, rev: Optional[str] = None, force: bool = False):
def detach_head(
self,
rev: Optional[str] = None,
force: bool = False,
client: str = "scm",
):
"""Context manager for performing detached HEAD SCM operations.
Detaches and restores HEAD similar to interactive git rebase.
@@ -346,7 +351,7 @@ class Git(Base):
"HEAD",
orig_head,
symbolic=symbolic,
message=f"dvc: Restore HEAD to '{name}'",
message=f"{client}: Restore HEAD to '{name}'",
)
logger.debug("Restore HEAD to '%s'", name)
self.reset()