Skip to content

Commit

Permalink
metrics: show: remove active branch from tags only show call
Browse files Browse the repository at this point in the history
  • Loading branch information
pared committed Jun 18, 2019
1 parent c023b8d commit 38642eb
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
3 changes: 3 additions & 0 deletions dvc/repo/metrics/show.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,9 @@ def show(
if metrics:
res[branch] = metrics

if all_tags and not all_branches:
res.pop(repo.scm.active_branch())

if not res:
if path:
raise BadMetricError(path)
Expand Down
23 changes: 23 additions & 0 deletions tests/func/test_metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -829,3 +829,26 @@ def test(self, dvc_repo, caplog):
in caplog.text
)
assert 0 == ret


def test_should_not_display_current_branch_on_display_tag(
git, dvc_repo, repo_dir
):
def write_metric_code(metric_filename, metric_value):
return "with open('{}', 'w') as fobj:\n fobj.write('{}')".format(
metric_filename, metric_value
)

metric_filename = "metric"
metric_stage = metric_filename + Stage.STAGE_FILE_SUFFIX
code = write_metric_code(metric_filename, 0.5)
run_command = 'python -c "{}"'

dvc_repo.run(cmd=run_command.format(code), metrics=[metric_filename])
git.index.add([metric_filename, metric_stage])
git.index.commit("first")
tag = "v1.0"
git.git.tag(tag)

metrics = dvc_repo.metrics.show(all_tags=True)
assert set(metrics.keys()) == {tag}

0 comments on commit 38642eb

Please sign in to comment.