Commit Graph
3306 Commits
Author SHA1 Message Date
Mikayla Maki f86853d3c9 Remove some external context from git status test 2023-05-10 17:59:33 -07:00
Max Brunsfeld 22a7b8e227 Define terminal settings in terminal crate 2023-05-10 17:43:10 -07:00
Mikayla Maki d2ce29f171 Got basic replication working :) 2023-05-10 17:37:36 -07:00
Mikayla Maki e487896125 Update protos 2023-05-10 17:37:36 -07:00
Mikayla Maki 970bdb1ee1 Use sum tree traversal to remove paths 2023-05-10 17:37:36 -07:00
Mikayla Maki c2c9c36e95 Fix bug in status detection when removing a directory 2023-05-10 17:37:36 -07:00
Mikayla Maki e920ede88c Revert "Convert git status calculation to use Entry IDs as the key instead of repo relative paths"
This reverts commit 728c6892c924ebeabb086e308ec4b5f56c4fd72a.
2023-05-10 17:37:36 -07:00
Mikayla Maki ea28af0c6a Convert git status calculation to use Entry IDs as the key instead of repo relative paths 2023-05-10 17:37:36 -07:00
Mikayla Maki ac8f4d47f8 WIP: integrate status with collab 2023-05-10 17:37:36 -07:00
Mikayla Maki 36d98d60f3 Format 2023-05-10 17:37:36 -07:00
Mikayla Maki 50e99845ca Added git status to the project panel, added worktree test 2023-05-10 17:37:36 -07:00
Mikayla Maki f4e09c47c6 Track live entry status in repository 2023-05-10 17:37:36 -07:00
Mikayla Maki 1bbcc63d01 Fix compile error 2023-05-10 17:37:36 -07:00
Mikayla Makiandpetros 5ab87cd95c WIP: Track live entry status in repository
co-authored-by: petros <petros@zed.dev>
2023-05-10 17:37:36 -07:00
Mikayla Makiandpetros 94ec496577 Add git status to the file system abstraction
co-authored-by: petros <petros@zed.dev>
2023-05-10 17:37:36 -07:00
Kirill Bulatov 5291e79ecb Test the search inclusions/exclusions 2023-05-10 11:11:31 +03:00
Kirill Bulatov 95f94548db Trim glob input 2023-05-10 11:11:31 +03:00
Kirill Bulatov 44df6b5afd Draft search include/exclude logic 2023-05-10 11:11:31 +03:00
Kirill Bulatov c95f4a81e2 Add initial include/exclude project search UI 2023-05-10 11:11:31 +03:00
Antonio Scandurra ed597975e0 WIP 2023-05-09 17:14:33 +02:00
Antonio ScandurraandJulia Risley 76ac20fcab Randomly mutate worktree in addition to mutating the file-system
This ensures that we test the code path that refreshes entries.

Co-Authored-By: Julia Risley <julia@zed.dev>
2023-05-09 17:01:11 +02:00
Antonio ScandurraandJulia Risley a8877200a4 Deliver file-system change events in batches in randomized worktree test
Co-Authored-By: Julia Risley <julia@zed.dev>
2023-05-09 16:55:03 +02:00
JuliaandAntonio Scandurra 7d24931b89 Only update changed local worktree buffers
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-05-09 15:13:12 +02:00
Mikayla Maki 7a40544d05 Removed test modifications, added special case to git initialization for when the repository is inside a .git folder 2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 09b0ea9e7b Fixed randomized test failures
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 134e12a79d Removed scan ID from repository interfaces
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 1d5c06465c Finished RepositoryEntry refactoring, smoke tests passing
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla Maki c5f4722a4a WIP: Change RepositoryEntry representation to be keyed off of the work directory
Removes branches button scaffolding
2023-05-08 14:33:59 -07:00
950b5873a6 WIP: re-arranging the RepositoryEntry representation
Added branches to the randomized test to check the git branch
Added the remaining database integrations in collab

Co-authored-by: Max <max@zed.dev>
Co-authored-by: Petros <petros@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 46db4cbb79 WIP: Add repository entries to collab and synchronize when rejoining the room
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla Maki 8f3c07b943 Add proto fields for repository entry maintenance 2023-05-08 14:33:59 -07:00
Petros AmoiridisandMikayla Maki 5c1703823b Introduce BrancesButton in title bar
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-05-08 14:33:58 -07:00
Mikayla Maki da07fa114d Add branch name into title 2023-05-08 14:33:58 -07:00
Petros AmoiridisandMikayla Maki b45856e137 Display branch information per worktree root
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-05-08 14:33:58 -07:00
Mikayla Maki bb5f30a58b Fix bug in repo detection 2023-05-08 14:33:58 -07:00
Mikayla Maki 8403c589d5 Add API for accessing git branch 2023-05-08 14:33:58 -07:00
Mikayla Maki d9afcb71e7 Wire in the branch name 2023-05-08 14:33:58 -07:00
Mikayla Maki cf830b1c0e Fix repo_for and clean up repository_entries 2023-05-08 14:33:58 -07:00
Mikayla Maki f2dadb0dc9 Restored a lost API and got everything compiling 2023-05-08 14:33:58 -07:00
Mikayla Makiandpetros 0fb2dbfda6 WIP: Refactor existing git code to use new representation.
co-authored-by: petros <petros@zed.dev>
2023-05-08 14:33:58 -07:00
Mikayla MakiandNathan 627994ab94 WIP: Convert old git repository vec to new treemap based approach.
co-authored-by: Nathan <nathan@zed.dev>
2023-05-08 14:33:58 -07:00
Mikayla MakiandNathan b84f88b61a Add a data driven representation of the current git repository state to the worktree snapshots
WIP: Switch git repositories to use SumTrees

Co-authored-by: Nathan <nathan@zed.dev>
2023-05-08 14:33:58 -07:00
Julia cac502638d Fixup cases using buffer model handle id as buffer id 2023-05-04 12:32:31 -04:00
JuliaandAntonio Scandurra 99d1c15ccc Offload text::Buffer construction to background worker
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-05-04 12:32:31 -04:00
Max Brunsfeld 1486f1e91a Add copilot.disabled_globs setting 2023-05-01 13:45:47 -07:00
Max Brunsfeld 405fd098ea Merge pull request #2417 from zed-industries/hover-markdown
Render markdown more correctly in the editor hover popover
2023-04-27 14:15:04 -07:00
Julia 1b0dbd5ef3 Update test to not fail due to absence of diagnostic source 2023-04-27 15:04:48 -04:00
Julia df8cc2de32 Show source of diagnostic hovers 2023-04-27 14:35:34 -04:00
Max Brunsfeld 5b9470d2b1 Render more markdown features in hover popover 2023-04-26 15:33:10 -07:00
Antonio Scandurra 2ebdfb9019 Merge remote-tracking branch 'origin/main' into fewer-context-traits 2023-04-26 09:54:58 +02:00