yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,137 Commits 5 Branches 0 Tags
78f8d1b74178502bc0efea1f0bfdb2ca39e16367
Commit Graph
9137 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mikayla Maki 78f8d1b741 Create pull_request_template.md 2023-05-12 10:12:47 -07:00
Mikayla Maki 0e82fc526c 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 420e895c6d Send the root branch along with it's entry 2023-05-12 09:37:02 -07:00
Mikayla Maki c7dd6e5d8d 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 MakiandNathan 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
Nathan Sobo fa0fa1075e 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 cab363efba 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 060caa6d32 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 51cc2de736 compile error 😅 2023-05-11 16:07:41 -07:00
Mikayla Maki 2430c6b9eb fmt 2023-05-11 16:06:56 -07:00
Mikayla MakiandNathan aa69083b7f 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 4a6a6fd11b fmt 2023-05-11 13:25:57 -07:00
Mikayla Maki 47ea082997 Don't scan for statuses in files that are ignored 2023-05-11 13:25:07 -07:00
Mikayla Maki 491f707217 Fix test 2023-05-11 12:03:39 -07:00
Mikayla Maki 50a6410ae8 fmt 2023-05-11 12:02:25 -07:00
Mikayla Maki 4e408e7758 Added status trickle up 2023-05-11 12:01:42 -07:00
Kirill Bulatov 800b48c1fa Reintroduce more accesible modal keybindings 
Brings commit 475fc409232775d83797215870256fd5772e299f back
 2023-05-11 20:59:10 +03:00
Mikayla Maki c0d0eefb54 Update is_deleted when sending new repositories 2023-05-11 10:21:25 -07:00
Max Brunsfeld 92f456b1c5 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 e45eccbf82 ci: clear the target dir if it gets too big 2023-05-11 09:43:13 -07:00
Mikayla Maki 26658419a3 Remove the CORRECT, overly agressive deletion codepath 2023-05-11 09:24:36 -07:00
Joseph Lyons 7f91f95f70 Revert "More keybindings in macOs modals with buttons" 
This reverts commit 82ad598309.
 2023-05-11 11:37:34 -04:00
Mikayla Maki fec0b1acb4 fmt 2023-05-10 20:09:37 -07:00
Mikayla Maki ae50a2f213 Fixed bug in status deletion marking 2023-05-10 19:54:02 -07:00
Mikayla Maki 0c34c073ec Add randomized test for git statuses 2023-05-10 19:21:27 -07:00
Mikayla Maki f86853d3c9 Remove some external context from git status test 2023-05-10 17:59:33 -07:00
Mikayla Maki 54e85ca80e Fix incorrect import 2023-05-10 17:52:23 -07:00
Mikayla Maki 732949181b Add postgres migration 2023-05-10 17:50:35 -07:00
Mikayla Maki f42c88aa0a Bump protocol version 2023-05-10 17:38:29 -07:00
Mikayla Maki d0c4ee38de Add integration test for git status 2023-05-10 17:37:36 -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
Petros Amoiridis b22d0fc4fa Fix yellow to be yellow 2023-05-10 17:37:36 -07:00
Petros Amoiridis 57d45f60c5 Use theme.editor.diff for the colors 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 c1839b2ba2 Fix compile errors 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
Joseph Lyons 9f1015be60 collab 0.12.1 2023-05-10 18:16:20 -04:00
Joseph Lyons d6e43c6160 v0.87.x dev 2023-05-10 16:47:09 -04:00
Mikayla Maki ef74b4ca07 Merge pull request #2460 from zed-industries/show-dock-on-activate 
Fix bug with terminal button
 2023-05-10 09:08:45 -07:00
Mikayla Maki e22271d773 Fix bug with terminal button 2023-05-10 08:15:20 -07:00