dvc: get rid of CleanTree#4221
Merged
Merged
Conversation
CleanTree is a very awkward wrapper that spreads the context across the codebase and results in unexpected behaviour when using it. This PR starts moving dvcignore-related logic into the trees themselves (it makes a lot of sense, kinda like `state`) so they could deal with it however they like. There are at least two temporary ugly parts about this PR: 1) dvcignore is used by individual trees and not packed into tree/base.py yet; 2) `dvcignore_root` argument. This one is caused by the dvcignore trying to collect everything topdown starting from the certain root dir. What it should do instead is for a certain path that is being checked look up the tree through the parents until it finds repo root (.dvc dir) and then stop. That would handle subrepos as well. At the same time we need to leverage existing dvcignore trie structure to cache those results.
efiop
commented
Jul 16, 2020
| root = self.dvcignore_root or self.tree_root | ||
| if not self.use_dvcignore: | ||
| return DvcIgnoreFilterNoop(self, root) | ||
| self.use_dvcignore = False |
Contributor
Author
There was a problem hiding this comment.
Avoiding recursion. Could wrap this hack in try: finally but will be replaced in the following patch anyway.
efiop
commented
Jul 16, 2020
Comment on lines
+77
to
+82
| if self._git_object_by_path(path) is None: | ||
| return False | ||
|
|
||
| return not self.dvcignore.is_ignored_file( | ||
| path | ||
| ) and not self.dvcignore.is_ignored_dir(path) |
Contributor
Author
There was a problem hiding this comment.
just mimicing old CleanTree. Could reconsider whether or not we really need to deny direct access here. E.g. you could force git add for a gitignored file.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
CleanTree is a very awkward wrapper that spreads the context across
the codebase and results in unexpected behaviour when using it.
This PR starts moving dvcignore-related logic into the trees themselves
(it makes a lot of sense, kinda like
state) so they could deal withit however they like.
There are at least two temporary ugly parts about this PR:
dvcignore is used by individual trees and not packed into
tree/base.py yet;
dvcignore_rootargument. This one is caused by the dvcignore tryingto collect everything topdown starting from the certain root dir. What
it should do instead is for a certain path that is being checked look up
the tree through the parents until it finds repo root (.dvc dir) and
then stop. That would handle subrepos as well. At the same time we need
to leverage existing dvcignore trie structure to cache those results.
Related to #4050
❗ 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.
❌ I will check DeepSource, CodeClimate, and other sanity checks below. (We consider them recommendatory and don't expect everything to be addressed. Please fix things that actually improve code or fix bugs.)
Thank you for the contribution - we'll try to review it as soon as possible. 🙏