Repository navigation
Avoid stashing changes when all changes are staged - #674
Merged
Merged
Conversation
It was suggested in #135 that a potential way to avoid unnecessary file change detection and general stashing woes would be to stash changes only when there were unstaged changes that needed to be excluded from the run. This presents a nice optimization that I wish we had considered long ago. We can simplify the logic now that we see the purpose of this feature a little more clearly: stash only when you need to. Issue #669 raised an interesting point about the difficulty to detect if a stash entry was created, so we modified the tests to check if a method call was made. This isn't great as it's peeking deep into the implementation, so we added some additional tests that ensured the methods in question actually existed. Not perfect, but gives us some confidence in the implementation. While here, we were able to: * Extract the stashing logic into a separate `stash_changes` helper method. * Simplify the `cleanup_environment` logic to just use whether changes were stashed in order to decide whether to restore. Closes #669.
sds
force-pushed
the
conservative-stash
branch
from
September 29, 2019 05:02
70ff629 to
b3f36ba
Compare
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
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.
It was suggested in #135 that a potential way to avoid unnecessary file change detection and general stashing woes would be to stash changes only when there were unstaged changes that needed to be excluded from the run.
This presents a nice optimization that I wish we had considered long ago. We can simplify the logic now that we see the purpose of this feature a little more clearly: stash only when you need to.
Issue #669 raised an interesting point about the difficulty to detect if a stash entry was created, so we modified the tests to check if a method call was made to validate the logic. This isn't great as it's peeking deep into the implementation, so we added some additional tests that ensured the methods in question actually existed. Not perfect, but gives us some confidence in the implementation.
While here, we were able to:
Extract the stashing logic into a separate
stash_changeshelper method.Simplify the
cleanup_environmentlogic to just use whether changes were stashed in order to decide whether to restore.Closes #669.