Skip to content

Update Worktrees when the file system changes #15

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.

Sign up for GitHub

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

Merged
nathansobo merged 104 commits into from
Apr 27, 2021
Merged

Update Worktrees when the file system changes #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
0cc5e8f
Replace easy-parallel with scoped-pool for path searches
nathansobo Apr 14, 2021
3803eb8
Inline clone
nathansobo Apr 8, 2021
cdfd613
Switch worktree entries to HashMap
nathansobo Apr 8, 2021
3c0bbe5
Store root entry id
nathansobo Apr 8, 2021
24cdfd2
Identify Worktree entries by their inode
nathansobo Apr 8, 2021
41f50cd
Require a context when constructing a worktree
nathansobo Apr 13, 2021
bc34ff5
Add a failing test for detecting a file move
nathansobo Apr 13, 2021
f3a0a11
WIP
nathansobo Apr 13, 2021
e3fbb97
Throttle worktree state updates on the main thread
nathansobo Apr 13, 2021
e4f41de
Invert condition when opening entries
nathansobo Apr 14, 2021
26f9127
Spawn worktree scanning on the scoped pool
nathansobo Apr 14, 2021
cbc1d83
Get worktree out of the way so we can try again
nathansobo Apr 14, 2021
36e6ed3
WIP
nathansobo Apr 14, 2021
db8cce9
Merge branch 'master' into rescan
nathansobo Apr 15, 2021
0bbff09
WIP
as-cii Apr 15, 2021
070069d
Ensure top of cursor stack is either empty or a leaf node
as-cii Apr 15, 2021
cefc753
Re-introduce fuzzy-matching on the new `WorkTree` implementation
as-cii Apr 15, 2021
497dedb
Get file IO test passing on new worktree
maxbrunsfeld Apr 15, 2021
fbaab12
Add fsevent crate to workspace
maxbrunsfeld Apr 15, 2021
6d3dc85
Tweak fsevent flags
maxbrunsfeld Apr 15, 2021
4878bf8
Make EventStream interface more flexible
maxbrunsfeld Apr 16, 2021
3fa4e5a
Fill out some missing parts of the new worktree module
maxbrunsfeld Apr 16, 2021
0caf908
Remove unused timer module
nathansobo Apr 16, 2021
e55abc4
Silence warning about binary name
nathansobo Apr 16, 2021
5648c67
Perform path matching on Worktree snapshots
nathansobo Apr 16, 2021
358fad8
Replace the old worktree with the new one
nathansobo Apr 16, 2021
af47ef9
Remove unused throttle module
nathansobo Apr 16, 2021
b55acb6
Fix warning
nathansobo Apr 16, 2021
fd12117
Start on rescanning Worktree
as-cii Apr 16, 2021
fbd5fbd
Parallelize scanning of changed directories
as-cii Apr 16, 2021
09c4d65
:lipstick:
as-cii Apr 16, 2021
457d945
Avoid unnecessary cloning of items when calling `SumTree::edit`
as-cii Apr 16, 2021
b68b0fc
Add simple unit test for `SumTree::{edit,get}`
as-cii Apr 16, 2021
ce5fbbb
WIP
as-cii Apr 16, 2021
e19a56c
WIP
as-cii Apr 16, 2021
6a54972
WIP: Lay down a skeleton for another attempt at rescan
nathansobo Apr 16, 2021
5b05e57
Start filling out new structure for processing fs events
maxbrunsfeld Apr 16, 2021
17f2df3
Update entries' filenames when handling move events
maxbrunsfeld Apr 17, 2021
ca62d01
Start on a randomized test for `Worktree`
as-cii Apr 19, 2021
f29c429
Recompute the PathEntry for each file under a re-parented subtree
as-cii Apr 19, 2021
2c72f9c
Don't change parent entries for moves within the same directory
as-cii Apr 19, 2021
06858c0
Enable logging automatically when passing a SEED env variable
as-cii Apr 19, 2021
f8f6a85
WIP
as-cii Apr 19, 2021
122926d
WIP: Associate entry names with directory children
as-cii Apr 19, 2021
3e93fb9
Get worktree randomized test passing
maxbrunsfeld Apr 19, 2021
0fd3f55
:lipstick: Reduce nesting in Snapshot::remove_path
maxbrunsfeld Apr 19, 2021
47f0b94
Add an example executable for fsevents
maxbrunsfeld Apr 19, 2021
e44a59d
Worktree: handle files being renamed to overwrite dirs
maxbrunsfeld Apr 19, 2021
f06164a
:lipstick: process_events
maxbrunsfeld Apr 19, 2021
f27b01f
Get all worktree tests passing
maxbrunsfeld Apr 19, 2021
8fb79a3
Enable split debuginfo for faster compiles
maxbrunsfeld Apr 19, 2021
69a43af
Add a method for waiting until a worktree's current scan is complete
maxbrunsfeld Apr 20, 2021
a4c1fe5
WIP: Add a condition method to model and view handles for use in tests
nathansobo Apr 20, 2021
d11d548
Rework `Worktree::scan_complete` to use a watch
as-cii Apr 20, 2021
ebb7124
Use `scan_complete` and the new `ModelHandle::condition` test method
as-cii Apr 20, 2021
cd7dccd
Replace remaining usages of `finish_pending_tasks` with `condition`
as-cii Apr 20, 2021
37444ac
Time out `condition` after 200ms and add basic unit tests for it
as-cii Apr 20, 2021
ddd746b
Use `env_logger` instead of `simplelog` in tests
as-cii Apr 20, 2021
dcc2bdf
Panic when awaiting conditions on dropped entities
nathansobo Apr 20, 2021
1a8e909
Ensure we remove broadcast channels after all conditions resolve
nathansobo Apr 20, 2021
9899614
Remove task_done condvar which supported finish_pending_tasks
nathansobo Apr 20, 2021
5cbbf62
WIP
nathansobo Apr 20, 2021
85f8537
Worktree: silence log message when dir is overwritten by file
maxbrunsfeld Apr 20, 2021
265ad90
Stop processing events if root path is deleted
maxbrunsfeld Apr 20, 2021
9fd8acd
Use our own scoped_pool implementation
maxbrunsfeld Apr 20, 2021
b20f5e9
Fully halt background scanner threads when dropping Worktree
maxbrunsfeld Apr 20, 2021
9518cef
Merge pull request #23 from zed-industries/fix-mac-mini-failures
maxbrunsfeld Apr 20, 2021
fd8125b
Re-enable file finder test and bind `menu:select-{next-prev}`
as-cii Apr 21, 2021
031d5ac
WIP
as-cii Apr 21, 2021
56b48c8
WIP: Establish new invariant-maintaining API for mutating worktree sn…
nathansobo Apr 21, 2021
a898acf
WIP
nathansobo Apr 21, 2021
ce28dc3
Fix missing insert in populate_dir
maxbrunsfeld Apr 21, 2021
955268e
Check worktree invariants in randomized test
maxbrunsfeld Apr 21, 2021
8e0ca20
Store paths as strings on PathMatch structs
maxbrunsfeld Apr 21, 2021
427930c
wip - gitignore handling on rescan
maxbrunsfeld Apr 21, 2021
499e55e
Start work on handling changes to gitignore files
maxbrunsfeld Apr 22, 2021
af3bc23
Recompute ignore status when .gitignore changes or for new entries
as-cii Apr 22, 2021
19a2856
Let ignore edits batch naturally without imposing a max batch len
as-cii Apr 22, 2021
f3b663e
Ignore `.git` folder
as-cii Apr 22, 2021
c429a93
Remove `is_ignored` from `PathEntry` and lean more on the tree instead
as-cii Apr 22, 2021
9723e46
Replace linear scan of entries with a custom `FileIter`
as-cii Apr 22, 2021
928ce0e
Clear descendants of existing children when scanning a directory
as-cii Apr 22, 2021
99f51c0
Simulate `.gitignore`s in the randomized test
as-cii Apr 22, 2021
b2e7a2c
Log when there's an error while scanning a directory
as-cii Apr 22, 2021
3e44a0a
Avoid redundant clearing of descendants when scanning dirs
maxbrunsfeld Apr 22, 2021
b37b047
Start work on excluding separate mount dirs
maxbrunsfeld Apr 22, 2021
ae5f02d
Use getmntinfo(3) to list mounted volumes
maxbrunsfeld Apr 22, 2021
8f2fc07
Restructure Worktree to index entries by path
as-cii Apr 23, 2021
ec2e1c3
Rename `PathSearch::Sibling` to `PathSearch::Successor`
as-cii Apr 23, 2021
c9d7249
WIP
nathansobo Apr 23, 2021
dced946
WIP
nathansobo Apr 23, 2021
054203d
Fix fuzzy matching after removing root dirname from stored paths
maxbrunsfeld Apr 23, 2021
6a7308b
Avoid storing redundant copies of file paths
maxbrunsfeld Apr 23, 2021
9cd1d5e
Avoid cloning entry in `Snapshot::entry_for_path`
as-cii Apr 24, 2021
f770a70
WIP: Maintain an IgnoreStack while scanning
nathansobo Apr 25, 2021
111d98d
Keep ignore status up-to-date as events are processed
as-cii Apr 26, 2021
6535304
WIP: Start on updating file handles
as-cii Apr 26, 2021
9753e67
Update filehandle paths when renames occur
maxbrunsfeld Apr 26, 2021
870925e
Rerender tabs when buffers' file handles change
nathansobo Apr 26, 2021
e7c5942
Fix handling of uppercase characters in fuzzy finding
maxbrunsfeld Apr 26, 2021
733dc15
Ignore .git directories
maxbrunsfeld Apr 26, 2021
09f5c7c
Fix scrollwheel events in uniformlist
maxbrunsfeld Apr 26, 2021
55fcc58
Cancel outstanding fuzzy-matching calls before starting a new one
maxbrunsfeld Apr 26, 2021
f29f1b0
Preserve selected file finder path when Worktree changes
nathansobo Apr 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'zed'",
"name": "Debug executable 'Zed'",
"cargo": {
"args": [
"build",
"--bin=zed",
"--bin=Zed",
"--package=zed"
],
"filter": {
"name": "zed",
"name": "Zed",
"kind": "bin"
}
},
Expand Down Expand Up @@ -63,4 +63,4 @@
"cwd": "${workspaceFolder}"
}
]
}
}
Loading