9245 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mikayla Maki	5fe8b73f04	compile error 😅	2023-05-11 16:07:41 -07:00
Mikayla Maki	d526fa6f1f	fmt	2023-05-11 16:06:56 -07:00
Mikayla Maki	d538994c7f	Use more efficient sum tree traversals for removal and improve ergonomics with iter_from ... co-authored-by: Nathan <nathan@zed.dev>	2023-05-11 16:06:25 -07:00
Mikayla Maki	72655fc41d	fmt	2023-05-11 13:25:57 -07:00
Mikayla Maki	6f87f9c51f	Don't scan for statuses in files that are ignored	2023-05-11 13:25:07 -07:00
Mikayla Maki	1bb34e08bb	Fix test	2023-05-11 12:03:39 -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
Kirill Bulatov	f12dffa60c	Reintroduce more accesible modal keybindings ... Brings commit 475fc40923 back	2023-05-11 20:59:10 +03:00
Mikayla Maki	5accf7cf4e	Update is_deleted when sending new repositories	2023-05-11 10:21:25 -07:00
Max Brunsfeld	bebb5456c7	Merge pull request #2461 from zed-industries/ci-target-dir-size ... During CI, clear the target directory if it gets larger than a maximum size	2023-05-11 09:57:36 -07:00
Max Brunsfeld	3550110e57	ci: clear the target dir if it gets too big	2023-05-11 09:43:13 -07:00
Mikayla Maki	191ac86f09	Remove the CORRECT, overly agressive deletion codepath	2023-05-11 09:24:36 -07:00
Joseph Lyons	0ab94551f4	Revert "More keybindings in macOs modals with buttons" ... This reverts commit 1398a12062.	2023-05-11 11:37:34 -04:00
Julia	0f34af50a8	Use path list generated during entry reload of a refresh request	2023-05-10 23:37:02 -04: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	9800a149a6	Remove some external context from git status test	2023-05-10 17:59:33 -07:00
Mikayla Maki	f55ca7ae3c	Fix incorrect import	2023-05-10 17:52:23 -07:00
Mikayla Maki	18becabfa5	Add postgres migration	2023-05-10 17:50:35 -07:00
Max Brunsfeld	bc5b78198a	Define terminal settings in terminal crate	2023-05-10 17:43:10 -07:00
Mikayla Maki	c7166fde3b	Bump protocol version	2023-05-10 17:38:29 -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	00b345fdfe	Use sum tree traversal to remove paths	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
Petros Amoiridis	21e1bdc8cd	Fix yellow to be yellow	2023-05-10 17:37:36 -07:00
Petros Amoiridis	6b4242cded	Use theme.editor.diff for the colors	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
Mikayla Maki	18cec8d64f	Format	2023-05-10 17:37:36 -07:00
Mikayla Maki	e98507d8bf	Added git status to the project panel, added worktree test	2023-05-10 17:37:36 -07:00
Mikayla Maki	93f57430da	Track live entry status in repository	2023-05-10 17:37:36 -07:00
Mikayla Maki	bd98f78101	Fix compile error	2023-05-10 17:37:36 -07:00
Mikayla Maki	67491632cb	WIP: Track live entry status in repository ... co-authored-by: petros <petros@zed.dev>	2023-05-10 17:37:36 -07:00
Mikayla Maki	7169f5c760	Add git status to the file system abstraction ... co-authored-by: petros <petros@zed.dev>	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
Joseph Lyons	9405b49957	v0.87.x dev	2023-05-10 16:47:09 -04:00
Max Brunsfeld	68867fe2e1	Define journal settings in journal crate	2023-05-10 12:59:24 -07:00
Max Brunsfeld	aa6ea920e2	Define telemetry settings in the client crate	2023-05-10 12:59:24 -07:00
Max Brunsfeld	9b06be2aa2	Define vim_mode setting in vim crate	2023-05-10 12:59:24 -07:00
Max Brunsfeld	926d7b356d	Define auto_update setting in the auto_update crate	2023-05-10 12:59:24 -07:00
Max Brunsfeld	b6b2c5d1d1	Generalize settings JSON schema logic to work w/ arbitrary setting types	2023-05-10 12:59:24 -07:00
Max Brunsfeld	9a6a2d9d27	Start using the SettingsStore in the app	2023-05-10 12:59:24 -07:00
Max Brunsfeld	316f791a77	Add generic update method to SettingsStore	2023-05-10 12:59:24 -07:00