Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

state: always use working trees #3871

Merged
merged 2 commits into from May 25, 2020

Conversation

pmrowla
Copy link
Contributor

@pmrowla pmrowla commented May 25, 2020

  • ❗ 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. If the CLI API is changed, I have updated tab completion scripts.

  • ❌ 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. πŸ™

PR forces State to always use WorkingTree rather than repo.tree (since state needs to be able to look up local cache files even if repo.tree is a brancher GitTree). Once Remote is refactored to use trees, we should also consider making State owned by the local cache and not Repo, so that state always uses the local cache working tree.

Closes #3812, closes #3857.

@pmrowla pmrowla requested review from pared, skshetry and efiop May 25, 2020 07:25
@efiop efiop merged commit d53b740 into iterative:master May 25, 2020
@pmrowla pmrowla deleted the 3812-push-pull-all-commits branch May 25, 2020 13:42
@efiop
Copy link
Member

efiop commented May 25, 2020

@pmrowla One thing that worries me here is that we will once again parse dvcignores in the project. Even though it is not critical, we should keep that in mind for the following patches. It probably makes sense to create self.repo.wtree and use it, that way dvcignore won't beparsed. CC @pared

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

fetch giving unexpected error for all tags and all commits push all commits unexpected error in 1.0
4 participants