9201 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mikayla Maki	5e2aaf45a0	Fix repository initialization bug	2023-05-13 10:38:24 -07:00
Mikayla Maki	3534665e2b	Merge pull request #2468 from zed-industries/touch-up-status ... Improve status integration	2023-05-13 09:38:02 -07:00
Mikayla Maki	04041af78b	Fixed bug with failing to clear git file status	2023-05-13 02:40:22 -07:00
Mikayla Maki	62c445da57	Match priority of folder highlights to vscode	2023-05-13 02:30:59 -07:00
Mikayla Maki	41bef2e444	Refactor out git status into FileName component ... Integrate file name component into the editor's tab content	2023-05-13 02:26:45 -07:00
Joseph T. Lyons	e1c1100c7b	Merge pull request #2466 from zed-industries/update-release-links ... Update release links	2023-05-12 14:08:10 -04:00
Joseph Lyons	b70c874a0e	Update release links	2023-05-12 14:04:36 -04:00
Mikayla Maki	ad7ed56e6b	Delete pull_request_template.md	2023-05-12 10:15:13 -07:00
Mikayla Maki	4663ac8abf	Create pull_request_template.md	2023-05-12 10:14:54 -07:00
Mikayla Maki	e71846c653	Create pull_request_template.md	2023-05-12 10:12:47 -07:00
Mikayla Maki	deac8a6ff9	Merge pull request #2465 from zed-industries/stream-branch-first ... Send the root branch along with it's entry	2023-05-12 09:45:40 -07:00
Mikayla Maki	60320c6b09	Send the root branch along with it's entry	2023-05-12 09:37:02 -07:00
Mikayla Maki	54e9e7c35b	Merge pull request #2464 from zed-industries/remove-between ... Add TreeMap::remove_between that can take abstract start and end points	2023-05-12 08:59:56 -07:00
Mikayla Maki	6ef0f70528	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
Nathan Sobo	ee3637216e	Add TreeMap::remove_between that can take abstract start and end points ... This commit introduces a new adaptor trait for SeekTarget that works around frustrating issues with lifetimes. It wraps the arguments in a newtype wrapper that lives on the stack to avoid the lifetime getting extended to the caller of the method. This allows us to introduce a PathSuccessor object that can be passed as the end argument of remove_between to remove a whole subtree.	2023-05-12 08:21:01 -07:00
Kirill Bulatov	89352a2bdc	Merge pull request #2463 from zed-industries/kb/reapply-modal-accessibility ... Reintroduce more accesible modal keybindings	2023-05-12 06:11:04 +03:00
Mikayla Maki	defc9c8591	Merge pull request #2455 from zed-industries/git-status-viewer ... Add Git Status to the project panel	2023-05-11 16:13:34 -07:00
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
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