Mikayla Maki
e66ecae7ac
fmt
2023-06-07 14:13:57 -07:00
Mikayla Maki
35ef109e8d
Merge branch 'main' into stream-git-statuses
2023-06-07 14:12:58 -07:00
Mikayla Maki
7b7282fa47
Fix several randomized test failures with the new git status implementation
2023-06-07 14:10:17 -07:00
Mikayla Maki and max
032d8e4aa1
Improve test generation and implement status propogation
...
co-authored-by: max <max@zed.dev >
2023-06-05 17:30:12 -07:00
Mikayla Maki
a6143e450d
Silence not found errors
2023-06-05 15:19:59 -07:00
Mikayla Maki
af3189be5b
WIP: Add status bubbling to project panel
2023-06-05 12:53:04 -07:00
Joseph Lyons
4b5a7ec94a
Fix typos
2023-06-02 22:02:19 -04:00
Mikayla Maki and max
c589b13748
Remove stale comments
...
Implement status bubbling query with sum tree traversals
co-authored-by: max <max@zed.dev >
2023-06-02 16:41:01 -07:00
Mikayla Maki and max
16ba8467d8
Abandoning stateful bubbling approach
...
co-authored-by: max <max@zed.dev >
2023-06-02 14:51:40 -07:00
Mikayla Maki
1e44d43940
WIP: Git statuses
2023-06-01 23:27:49 -07:00
Mikayla Maki
319f9d7377
WIP: Add stateful status bubbling to worktree
2023-06-01 16:51:34 -07:00
Mikayla Maki and Julia
3df36f560f
WIP: Move statuses to be on their associated file entries in worktree
...
co-authored-by: Julia <julia@zed.dev >
2023-05-31 11:03:11 -07:00
Julia and Antonio Scandurra
73f16b1aa1
Avoid removing fake fs entry when rename fails later in the process
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-05-16 13:00:39 -04:00
Mikayla Maki
ee2b629435
Update proto names to reflect new status info
2023-05-15 16:20:01 -07:00
Mikayla Maki
ccdc38eec2
Add index tracking to status
2023-05-15 16:20:01 -07:00
Mikayla Maki and Nathan
bdf7e377f8
Made the map seek target a publicly implementable interface
...
Integrated remove_range with the existing git code
co-authored-by: Nathan <nathan@zed.dev >
2023-05-12 08:37:32 -07:00
Mikayla Maki
4e408e7758
Added status trickle up
2023-05-11 12:01:42 -07:00
Mikayla Maki
fec0b1acb4
fmt
2023-05-10 20:09:37 -07:00
Mikayla Maki
0c34c073ec
Add randomized test for git statuses
2023-05-10 19:21:27 -07:00
Mikayla Maki
54e85ca80e
Fix incorrect import
2023-05-10 17:52:23 -07:00
Mikayla Maki
d2ce29f171
Got basic replication working :)
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 and petros
5ab87cd95c
WIP: Track live entry status in repository
...
co-authored-by: petros <petros@zed.dev >
2023-05-10 17:37:36 -07:00
Mikayla Maki and petros
94ec496577
Add git status to the file system abstraction
...
co-authored-by: petros <petros@zed.dev >
2023-05-10 17:37:36 -07:00
Mikayla Maki
adf07dc837
Add smoke test for collaboration
2023-05-08 14:33:59 -07:00
Mikayla Maki
d9afcb71e7
Wire in the branch name
2023-05-08 14:33:58 -07:00
Mikayla Maki and Nathan
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
Max Brunsfeld
d1f33d7052
🎨 Specify more dependencies at the workspace level
2023-04-24 17:41:55 -07:00
Max Brunsfeld
a17f009b00
Use a workspace dependency for the futures crate
2023-04-24 09:43:31 -07:00
Max Brunsfeld
ef57a8e02a
Add randomized test for mutating worktree during initial scan
2023-04-13 22:34:03 -07:00
Max Brunsfeld
d8ea3febae
Add missing random delays in FakeFs
2023-04-03 22:42:34 -07:00
Max Brunsfeld
2d21ddd72f
Use synchronous locks in FakeFs
...
This way, the state can be accessed without running the deterministic
executor.
2023-04-03 18:15:07 -07:00
Antonio Scandurra
ba4c257b50
Use the same serde version across the entire workspace
2023-03-28 09:42:00 -07:00
Max Brunsfeld
918d0daddb
Update worktree randomized test to use worktree's public interface and the fake fs
2023-03-21 11:26:13 -07:00
Antonio Scandurra and Julia Risley
e2c6eaa335
Deserialize Theme directly into the heap to avoid stack overflow
...
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-03-17 15:58:52 +01:00
Mikayla Maki
9a08b3e02c
Fix unwrap in git2 library causing panics in Zed
2023-03-16 13:06:23 -07:00
Mikayla Maki
edb2d2cd3f
Removed old experiments settings and staff mode flag, added new StaffMode global that is set based on the webserver's staff bit
2023-01-27 15:43:12 -08:00
Mikayla Maki
fc7532d74d
Added complete scripts for generating third party license files
2023-01-23 12:47:12 -08:00
Nathan Sobo
94bc34e332
Merge remote-tracking branch 'origin/main' into project-reconnection
2023-01-06 16:52:22 -07:00
Nathan Sobo
fe90759634
Track open buffers when handling sync requests
...
When a host sends a buffer to a guest for the first time, they record that
they have done so in a set tied to that guest's peer id. When the guest
reconnects and syncs buffers, they do so under a different peer id, so we
need to be sure we track which buffers we have sent them to avoid sending
them the same buffer twice, which violates the guest's assumptions.
2023-01-02 20:27:59 -07:00
Max Brunsfeld
a1a24db841
Assign fake fs entries' mtimes more consistently
2023-01-02 10:20:52 -08:00
Mikayla Maki
10f1bdcdcc
Add other line seperators to regex normalization
2022-12-30 18:18:02 -08:00
Antonio Scandurra
d4fd5df990
Restructure randomized test to be a bit clearer and test more stuff
2022-12-22 17:54:25 +01:00
Max Brunsfeld and Nathan Sobo
c07f90cb54
Assert that buffers' file state matches in randomized collab test
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2022-12-21 15:38:44 -08:00
Antonio Scandurra
f5c4414586
Fix hang due to acquiring rng lock twice
2022-11-01 09:35:53 +01:00
Antonio Scandurra
dc17421e1d
Start removing distinction between host and guest in random collab test
2022-11-01 08:40:08 +01:00
Mikayla Maki
e02528e8c0
Fixed tests
2022-10-17 14:53:52 -07:00
Mikayla Maki