From 435407185fa27a58eb25a552566daaf171aeafe3 Mon Sep 17 00:00:00 2001 From: dberenbaum Date: Tue, 3 Jan 2023 11:40:35 -0500 Subject: [PATCH] params/metrics diff: address test failures for missing branch key --- dvc/repo/metrics/diff.py | 3 ++- dvc/repo/params/diff.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dvc/repo/metrics/diff.py b/dvc/repo/metrics/diff.py index 04ab6c945..f6b8c1516 100644 --- a/dvc/repo/metrics/diff.py +++ b/dvc/repo/metrics/diff.py @@ -17,7 +17,8 @@ def diff(repo, *args, a_rev=None, b_rev=None, **kwargs): workspace_rev = (a_rev == "workspace") or (b_rev == "workspace") if workspace_rev and "workspace" not in metrics: active_branch = repo.scm.active_branch() - metrics["workspace"] = metrics[active_branch] + if active_branch in metrics: + metrics["workspace"] = metrics[active_branch] old = metrics.get(a_rev, {}).get("data", {}) new = metrics.get(b_rev, {}).get("data", {}) diff --git a/dvc/repo/params/diff.py b/dvc/repo/params/diff.py index 46c541a8c..8f87966ae 100644 --- a/dvc/repo/params/diff.py +++ b/dvc/repo/params/diff.py @@ -17,7 +17,8 @@ def diff(repo, *args, a_rev=None, b_rev=None, **kwargs): workspace_rev = (a_rev == "workspace") or (b_rev == "workspace") if workspace_rev and "workspace" not in params: active_branch = repo.scm.active_branch() - params["workspace"] = params[active_branch] + if active_branch in params: + params["workspace"] = params[active_branch] old = params.get(a_rev, {}).get("data", {}) new = params.get(b_rev, {}).get("data", {})