metrics/params: diff: don't show diff if active branch is the same as workspace #8716
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dberenbaum
force-pushed
the
metrics-diff-active-branch
branch
from
843d63f
to
90de4a6
Compare
Codecov ReportBase: 93.55% // Head: 93.54% // Decreases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## main #8716 +/- ##
==========================================
- Coverage 93.55% 93.54% -0.01%
==========================================
Files 457 457
Lines 36237 36254 +17
Branches 5260 5262 +2
==========================================
+ Hits 33900 33914 +14
- Misses 1832 1835 +3
Partials 505 505
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
daavoo
reviewed
Dec 20, 2022
dberenbaum
force-pushed
the
metrics-diff-active-branch
branch
2 times, most recently
from
027763f
to
065686c
Compare
efiop
reviewed
Jan 9, 2023
dvc/repo/metrics/diff.py
Outdated
Comment on lines
14
to
17
| metrics = repo.metrics.show(*args, **kwargs, revs=[a_rev, b_rev]) | ||
|
|
||
| # workspace may have been replaced by active branch | ||
| workspace_rev = (a_rev == "workspace") or (b_rev == "workspace") | ||
| if workspace_rev and "workspace" not in metrics: | ||
| active_branch = repo.scm.active_branch() | ||
| if active_branch in metrics: | ||
| metrics["workspace"] = metrics[active_branch] | ||
|
|
There was a problem hiding this comment.
Does seem pretty weird that show doesn't return it at all. Looks like
Line 145 in 0e5674f
metrics show-specific behaviour that leaked into metrics diff. Probably needs a flag not to hide workspace metrics or it should hide it in CLI (that would be my expectation). Taking another look at #3025 ...
There was a problem hiding this comment.
@dberenbaum @daavoo Guys, do you find this
Line 145 in 0e5674f
diff at all. If having that in API is useful, then I'll make it an opt-out flag, so again we don't have to fix it in diff. I guess the latter is the simplest one anyway...
efiop
force-pushed
the
metrics-diff-active-branch
branch
from
9b78895
to
ed689da
Compare
efiop
changed the title
efiop
added
enhancement
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before, if you did
dvc metrics diff mainfrom themainbranch, you would get:This made it look like the metrics were missing in the workspace and there was some difference from
maineven in a clean repo state.After this PR, there will be no output from the command above.