yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,023 Commits 5 Branches 0 Tags
ea579ebcb71bfbcd2a5a1eda4fa00aab29439a5c
Commit Graph
75 Commits
Author SHA1 Message Date
Kirill Bulatov 249fea65c8 Revert unnecessary style changes 2023-10-12 16:17:41 +03:00
Kirill Bulatov 0410fee03d Prepare prettier file lookup code infra 2023-10-11 12:56:28 +03:00
Max Brunsfeld 803aef698d Remove unnecessary dependencies on client and rpc 2023-10-06 13:14:53 -07:00
Marshall BowersNate ButlerPiotr OsiewiczNate
 		3353d919ac Mainline GPUI2 UI work (#3079) 
This PR mainlines the current state of new GPUI2-based UI from the
`gpui2-ui` branch.

Release Notes:

- N/A

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Co-authored-by: Nate <nate@zed.dev>
 2023-10-02 18:20:47 -04:00
Conrad Irwin 12cbf801f3 Flesh out v1.0 of vim : 2023-09-20 20:44:41 -06:00
Max BrunsfeldJosephMikayla
 		da054bfbb5 Avoid accidental gpui transitive dependency in collab 
* Make Fs depend on Text, not vise versa

Co-authored-by: Joseph <joseph@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-30 13:16:01 -07:00
Max Brunsfeld 511307ebe5 Fix pathspec in staged_statuses 
Enable non-literal matching so that directory paths match
all files contained within them.
 2023-07-23 21:36:29 -07:00
Max Brunsfeld ab164495c8 Fix filtering of staged statuses 2023-07-22 17:53:58 -07:00
Max Brunsfeld 2e1af62222 Rely on git status for any paths not matching the git index 2023-07-22 17:47:36 -07:00
Max Brunsfeld bf9410bbb7 Optimize full file status via passing in known file mtime 2023-07-22 11:53:26 -07:00
Max Brunsfeld 143e0d5e8b Compute unstaged git status separately, to take advantage of our cached file mtimes 2023-07-21 17:58:43 -07:00
Max Brunsfeld da4f477e1f Only fetch statuses for changed paths 2023-07-21 17:08:31 -07:00
Max Brunsfeld 956a700cb8 Don't call git status when ignored files change 2023-07-21 17:05:42 -07:00
Max Brunsfeld 3146f7052a Retrieve git statuses in one batch when scanning dirs 2023-07-21 13:50:54 -07:00
Max Brunsfeld 7614c594fc Perform only one git statuses call when reloading a git repo after it changes 2023-07-14 14:29:22 -07:00
Piotr Osiewicz ac0900bfcb vcs: Add 'create branch' button 2023-07-07 18:36:55 +02:00
Piotr Osiewicz a66ff10080 Merge branch 'main' into git-menu 2023-07-03 16:25:36 +02:00
Piotr Osiewicz 9a8f668cf1 List recent branches 2023-06-30 14:05:55 +02:00
Piotr Osiewicz cdab13dd6c Add timestamps to branches 2023-06-30 14:05:55 +02:00
Piotr Osiewicz 4b369afbc8 WIP: git menu 2023-06-30 14:05:55 +02:00
Mikayla Maki f416d9ef00 Add the ability to make new directories by adding slashes to a file name 2023-06-29 17:35:22 -07:00
Max Brunsfeld d0bc39d7fe Add test coverage for FS events happening inside unloaded dirs 2023-06-29 11:55:25 -07:00
Max Brunsfeld bfb334ed74 Fix expansion of ancestor directories when refreshing a path 2023-06-22 10:34:28 -07:00
Max Brunsfeld 72d9e05681 Model symlinks better in FakeFs, add read_link Fs method 2023-06-22 10:34:28 -07:00
Mikayla Maki 2def300bb0 fmt 2023-06-07 14:20:01 -07:00
Mikayla Maki 17120701fc Feature gate import 2023-06-07 14:15:20 -07:00
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 Makiandmax 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 Makiandmax 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 Makiandmax 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 MakiandJulia 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
JuliaandAntonio 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 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
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