Merged
Conversation
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.
This pull request is an improvement over #59 and attempts to fix some of the flakiness related to
Worktreeand file system changes in general. It does so in a couple of ways:Bufferwill need to recompute some internal state (possibly asynchronously) and then update themselves. This may or may not happen in the same tick of the loop as theWorktreechange, so we can't rely onWorktreehaving changed to assert conditions on upstream models that depend on it. This is achieved in 19f51bc and 37f0ba9, where we rely more on theconditionhelper to wait for derived state to get updated.saved_mtime/saved_versionat two different moments. 4884a05 addresses this by computing the diff in a background thread, but incorporating it and updatingFileHandle-related metadata (such assaved_mtime) atomically.next_scan_completeas there is no place in the codebase that uses it at the moment and it's probably detrimental to keep it around, as it invites a bad usage that introduces unexpected flakiness.Async keeps being hard.