Use diff for tracked path statuses #466
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
This was referenced May 24, 2021
mattseddon
force-pushed
the
use-diff-in-repo-status
branch
from
a1b9c09 to
025a410
Compare
mattseddon
changed the title
rogermparent
approved these changes
May 24, 2021
mattseddon
force-pushed
the
use-diff-in-repo-status
branch
from
e295af1 to
950436f
Compare
mattseddon
force-pushed
the
add-new-decorations
branch
from
b1cec0c to
ce6c696
Compare
mattseddon
force-pushed
the
use-diff-in-repo-status
branch
from
950436f to
5d2a3ab
Compare
|
Code Climate has analyzed commit e803274 and detected 0 issues on this pull request. The test coverage on the diff in this pull request is 95.2% (50% is the threshold). This pull request will bring the total coverage in the repository to 88.2% (0.0% change). View more on Code Climate. |
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.
4/5
master<- #463 <- #464 <- #465 <- this <- #467This PR moves us from exclusively using
statusto derive the status of each of our tracked paths by using a combination ofstatusanddiff. The logic is as follows:We use the output of
difffor all statuses that are notmodified. That means there is no difference between the output ofdiffand what we display foradded,deleted,renamed¬ in cache.For
modifiedwe provide astatusoverlay. If the path is found instatusit is essentially changed twice, once with respect to git (HEAD) and once with respect to dvc (cache). We give these paths the originalmodifiedstatus. If the path is not found in the status output then it is only modified with respect to git (HEAD) i.e the file matches what is expected by dvc (cache). We say that these path arestageModifiedi.e the data placeholders (or lock file) are ready to be committed into git.For demos and further explanation see #318 (comment)
See #463 for description of chain.