mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-25 01:34:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
12570 commits 770 branches 798 tags 246 MiB
Commit graph

79 commits

Author SHA1 Message Date
Max Brunsfeld
17925ed563 Remove unnecessary dependencies on client and rpc 2023-10-06 13:14:53 -07:00
Marshall Bowers
9e1f7c4c18
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
2d9db0fed1 Flesh out v1.0 of vim : 2023-09-20 20:44:41 -06:00
KCaverly
d85acceeec move git2 to workspace dependency globally 2023-09-19 16:13:47 -04:00
Max Brunsfeld
46429426ef 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
8fff0b0ff8 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
a3a9d024ba Fix filtering of staged statuses 2023-07-22 17:53:58 -07:00
Max Brunsfeld
b338ffe8d8 Rely on git status for any paths not matching the git index 2023-07-22 17:47:36 -07:00
Max Brunsfeld
6c09782aa2 Optimize full file status via passing in known file mtime 2023-07-22 11:53:26 -07:00
Max Brunsfeld
51d311affd Compute unstaged git status separately, to take advantage of our cached file mtimes 2023-07-21 17:58:43 -07:00
Max Brunsfeld
ff0864026e Only fetch statuses for changed paths 2023-07-21 17:08:31 -07:00
Max Brunsfeld
05b161118c Don't call git status when ignored files change 2023-07-21 17:05:42 -07:00
Max Brunsfeld
4bd415f2b6 Retrieve git statuses in one batch when scanning dirs 2023-07-21 13:50:54 -07:00
Max Brunsfeld
b9e0074793 Perform only one git statuses call when reloading a git repo after it changes 2023-07-14 14:29:22 -07:00
Piotr Osiewicz
cb24cb1ea5 vcs: Add 'create branch' button 2023-07-07 18:36:55 +02:00
Piotr Osiewicz
806268f0db Merge branch 'main' into git-menu 2023-07-03 16:25:36 +02:00
Piotr Osiewicz
54fad5969f List recent branches 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
3027e4729a Add timestamps to branches 2023-06-30 14:05:55 +02:00
Piotr Osiewicz
d8d0bdc479 WIP: git menu 2023-06-30 14:05:55 +02:00
Mikayla Maki
33f5248d4f
Add the ability to make new directories by adding slashes to a file name 2023-06-29 17:35:22 -07:00
Max Brunsfeld
8609ccdcf7 Add test coverage for FS events happening inside unloaded dirs 2023-06-29 11:55:25 -07:00
Max Brunsfeld
4424dafcd7 Fix expansion of ancestor directories when refreshing a path 2023-06-22 10:34:28 -07:00
Max Brunsfeld
55f1a6647f Model symlinks better in FakeFs, add read_link Fs method 2023-06-22 10:34:28 -07:00
Mikayla Maki
cd63ec2c7f
fmt 2023-06-07 14:20:01 -07:00
Mikayla Maki
03a96d2793
Feature gate import 2023-06-07 14:15:20 -07:00
Mikayla Maki
0ac7a3bc21
fmt 2023-06-07 14:13:57 -07:00
Mikayla Maki
28ba27c9c5
Merge branch 'main' into stream-git-statuses 2023-06-07 14:12:58 -07:00
Mikayla Maki
34e134fafb
Fix several randomized test failures with the new git status implementation 2023-06-07 14:10:17 -07:00
Mikayla Maki
a2d58068a7
Improve test generation and implement status propogation 
co-authored-by: max <max@zed.dev>
 2023-06-05 17:30:12 -07:00
Mikayla Maki
c12bdc894a
Silence not found errors 2023-06-05 15:19:59 -07:00
Mikayla Maki
9a13a2ba2c
WIP: Add status bubbling to project panel 2023-06-05 12:53:04 -07:00
Joseph Lyons
7c60f636d5 Fix typos 2023-06-02 22:02:19 -04:00
Mikayla Maki
2f97c7a4f1
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
99a0e11e70
Abandoning stateful bubbling approach 
co-authored-by: max <max@zed.dev>
 2023-06-02 14:51:40 -07:00
Mikayla Maki
3768851799
WIP: Git statuses 2023-06-01 23:27:49 -07:00
Mikayla Maki
5e43dcaab8
WIP: Add stateful status bubbling to worktree 2023-06-01 16:51:34 -07:00
Mikayla Maki
22e4086658
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
f50240181a 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
307dd2b83e
Update proto names to reflect new status info 2023-05-15 16:20:01 -07:00
Mikayla Maki
1e4ab6cd75
Add index tracking to status 2023-05-15 16:20:01 -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
Mikayla Maki
5b2ee63f80
Added status trickle up 2023-05-11 12:01:42 -07:00
Mikayla Maki
adfbbf21b2
fmt 2023-05-10 20:09:37 -07:00
Mikayla Maki
fca3bb3b93
Add randomized test for git statuses 2023-05-10 19:21:27 -07:00
Mikayla Maki
f55ca7ae3c
Fix incorrect import 2023-05-10 17:52:23 -07:00
Mikayla Maki
e20eaca595
Got basic replication working :) 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
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
a58a33fc93
WIP: integrate status with collab 2023-05-10 17:37:36 -07:00