Commit Graph
864 Commits
Author SHA1 Message Date
Mikayla Maki bbb68c523c Refactored apart the forward and the backwards iterator for diff hunks 2023-05-19 18:09:47 -07:00
Max Brunsfeld 34b0d6200f collab 0.12.4 2023-05-18 14:58:57 -07:00
Mikayla Maki 99fcf23798 fmt 2023-05-18 14:31:08 -07:00
Mikayla Maki 95a7d69bce Fixed an imprecise join in rejoin room 2023-05-18 14:29:18 -07:00
Max Brunsfeld 2a11a89827 collab 0.12.3 2023-05-18 12:27:08 -07:00
Joseph Lyons 55b241a4f6 collab 0.12.2 2023-05-18 12:27:01 -07:00
Max Brunsfeld c71b59b248 Log how long it takes to handle each RPC message 2023-05-18 12:24:07 -07:00
Max Brunsfeld 67a25126d4 Define theme/ui text style settings in theme crate 2023-05-17 14:44:59 -07:00
Max Brunsfeld 89204e85c0 Merge branch 'main' into setting-store 2023-05-17 09:55:24 -07:00
Max Brunsfeld cbd4771f10 Define project settings in project crate 2023-05-16 17:45:04 -07:00
Max Brunsfeld 65e3713d4d Define editor settings in editor crate 2023-05-16 17:30:29 -07:00
Max Brunsfeld 39618ae32d Define language settings in the language crate 2023-05-16 17:29:53 -07:00
Mikayla Maki 307dd2b83e Update proto names to reflect new status info 2023-05-15 16:20:01 -07:00
Mikayla Maki dfb6a2f7fc fmt 2023-05-11 12:02:25 -07:00
Mikayla Maki 5b2ee63f80 Added status trickle up 2023-05-11 12:01:42 -07:00
Mikayla Maki 5accf7cf4e Update is_deleted when sending new repositories 2023-05-11 10:21:25 -07:00
Mikayla Maki 191ac86f09 Remove the CORRECT, overly agressive deletion codepath 2023-05-11 09:24:36 -07:00
Mikayla Maki adfbbf21b2 fmt 2023-05-10 20:09:37 -07:00
Mikayla Maki f5c633e80c Fixed bug in status deletion marking 2023-05-10 19:54:02 -07:00
Mikayla Maki fca3bb3b93 Add randomized test for git statuses 2023-05-10 19:21:27 -07:00
Mikayla Maki 18becabfa5 Add postgres migration 2023-05-10 17:50:35 -07:00
Mikayla Maki 65d4c4f6ed Add integration test for git status 2023-05-10 17:37:36 -07:00
Mikayla Maki e20eaca595 Got basic replication working :) 2023-05-10 17:37:36 -07:00
Mikayla Maki 2b80dfa81d Update protos 2023-05-10 17:37:36 -07:00
Mikayla Maki 23a19d85b8 Fix bug in status detection when removing a directory 2023-05-10 17:37:36 -07:00
Mikayla Maki 0082d68d4a 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 f935047ff2 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 94a0de4c9f Fix compile errors 2023-05-10 17:37:36 -07:00
Mikayla Maki a58a33fc93 WIP: integrate status with collab 2023-05-10 17:37:36 -07:00
Max Brunsfeld cee7edabf9 Ensure the SettingsStore global is added in tests 2023-05-10 16:39:59 -07:00
Joseph Lyons 6385e51957 collab 0.12.1 2023-05-10 18:16:20 -04:00
Kirill Bulatov 915154b047 Add initial include/exclude project search UI 2023-05-10 11:11:31 +03:00
Max Brunsfeld 8fd0c9fb0e collab 0.12.0 2023-05-08 15:54:11 -07:00
Mikayla Maki 712fb5ad7f Add postgres migration 2023-05-08 14:33:59 -07:00
Mikayla Maki 1a9afd186b Restore randomized integration tests 2023-05-08 14:33:59 -07:00
Mikayla Maki 62e763d0d3 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 Maki 2c2076bd77 Adjust tests to not create repositories inside repositories 2023-05-08 14:33:59 -07:00
Mikayla MakiandMax d8dac07408 Removed scan ID from repository interfaces
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 270147d20c Finished RepositoryEntry refactoring, smoke tests passing
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla Maki 53569ece03 WIP: Change RepositoryEntry representation to be keyed off of the work directory
Removes branches button scaffolding
2023-05-08 14:33:59 -07:00
b6d6f5c650 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 8301ee43d6 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 2fe5bf419b Add proto fields for repository entry maintenance 2023-05-08 14:33:59 -07:00
Mikayla Maki c6d7ed33c2 Add smoke test for collaboration 2023-05-08 14:33:59 -07:00
Antonio Scandurra 0296974ab1 Merge pull request #2441 from zed-industries/implicit-ancestry
Determine view ancestry during layout
2023-05-05 10:58:00 +02:00
Julia eacea55aaf Fixup cases using buffer model handle id as buffer id 2023-05-04 12:32:31 -04:00
Antonio Scandurra da19edc3e3 Merge branch 'main' into implicit-ancestry 2023-05-04 14:39:58 +02:00
Joseph Lyons 053b34875b collab 0.11.0 2023-05-03 14:59:04 -04:00
Antonio Scandurra 5157442703 Fix integration test relying on deferred happening after focus
Focus is now one of the last things that happens during `flush_effects`,
and we shouldn't have relied on `defer` in the first place to verify
focus changes.
2023-05-03 19:00:32 +02:00
Antonio Scandurra c65465b0b5 Ensure workspace gets rendered in collab integration tests 2023-05-03 18:31:07 +02:00