move: validate new stage before move #5953
Merged
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
pmrowla
commented
May 4, 2021
| @@ -330,7 +330,7 @@ def validate_state( | |||
| def validate_kwargs(single_stage: bool = False, fname: str = None, **kwargs): | |||
| """Prepare, validate and process kwargs passed from cli""" | |||
| cmd = kwargs.get("cmd") | |||
| if not cmd: | |||
| if not cmd and not single_stage: | |||
There was a problem hiding this comment.
not sure if this should be a separate data_source kwarg instead of using single_stage? @skshetry
There was a problem hiding this comment.
We still support stages in .dvc file, so it's not just about data_source. Maybe in 3.0? 😄
dberenbaum
reviewed
May 4, 2021
| def test_move_output_overlap(tmp_dir, dvc): | ||
| from dvc.exceptions import OverlappingOutputPathsError | ||
|
|
||
| tmp_dir.dvc_gen({"foo": "foo", "dir": {"bar": "bar"}}) |
There was a problem hiding this comment.
Does this generate dir.dvc or bar.dvc? Should this test that dir.dvc does not change (and maybe that dir/bar still exists)?
Also, should both of these tests check that the .gitignore files haven't changed?
There was a problem hiding this comment.
This generates dir.dvc.
Regarding not making gitignore changes on failed stage creation, we check for that in other func tests, we shouldn't need to duplicate that here.
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.
❗ I have followed the Contributing to DVC checklist.
📖 If this PR requires documentation updates, I have created a separate PR (or issue, at least) in dvc.org and linked it here.
Thank you for the contribution - we'll try to review it as soon as possible. 🙏
Will close #5886
dvc movenow usesrepo.stage.createto create the new destination stage instead of just modifying the existingstage.pathin order to do the necessary validation (check if dest overlaps with existing output, new.dvcfile would be gitignored, etc)