collect workspace only when hide_workspace is False; add tests

Author: skshetry

dvc/commands/experiments/show.py

@@ -326,5 +326,4 @@ def add_parser(experiments_subparsers, parent_parser):
         action="store_true",
         help="Force re-collection of experiments instead of loading from exp cache.",
     )
-
     experiments_show_parser.set_defaults(func=CmdExperimentsShow)

dvc/repo/experiments/collect.py

@@ -303,12 +303,11 @@ def collect(
         baseline_names = describe(
             repo.scm, baseline_revs, refs=cached_refs, logger=logger
         )
-    workspace_data = collect_rev(repo, "workspace", **kwargs)
-    result: list[ExpState]
-    if hide_workspace:
-        result = []
-    else:
-        result = [workspace_data]
+
+    result: list[ExpState] = []
+    if not hide_workspace:
+        workspace_data = collect_rev(repo, "workspace", **kwargs)
+        result.append(workspace_data)
 
     queued = collect_queued(repo, baseline_revs, **kwargs) if not hide_queued else {}
     active = collect_active(repo, baseline_revs, **kwargs)

tests/func/experiments/test_show.py

@@ -87,14 +87,27 @@ def test_show_branch_and_tag_name(tmp_dir, scm, dvc, exp_stage):
 
 
 @pytest.mark.vscode
-def test_show_simple(tmp_dir, scm, dvc, exp_stage):
-    assert dvc.experiments.show()[0].dumpd() == {
+def test_show(tmp_dir, scm, dvc, exp_stage):
+    workspace_result = {
         "rev": "workspace",
         "name": None,
         "data": make_data(rev="workspace"),
         "error": None,
         "experiments": None,
     }
+    branch_result = {
+        "rev": scm.get_rev(),
+        "name": "master",
+        "data": make_data(rev=scm.get_rev()),
+        "error": None,
+        "experiments": None,
+    }
+
+    ret = [d.dumpd() for d in dvc.experiments.show()]
+    assert ret == [workspace_result, branch_result]
+
+    ret = [d.dumpd() for d in dvc.experiments.show(hide_workspace=True)]
+    assert ret == [branch_result]
 
 
 @pytest.mark.vscode