Mikayla
67555ee5b4
Merge branch 'main' into kvark-linux
2024-02-07 11:52:44 -08:00
白山風露
42a5081aff
Use try_from_bytes for windows build ( #7500 )
...
Reduce windows build error.
Release Notes:
- N/A
2024-02-07 11:27:26 -05:00
Amin Yahyaabadi
d3562d4c9c
Fixes for file-watching, user assets, and system dependencies ( #2 )
...
* fix: avoid panics in case of non-existing path for watching
* fix: copy the themes and plugins
* Revert "add a few more libraries to the linux script"
This reverts commit 7509677003
2024-02-06 22:54:40 -08:00
Piotr Osiewicz
743f9b345f
chore: Move workspace dependencies to workspace.dependencies ( #7454 )
...
We should prefer referring to local deps via `.workspace = true` from
now on.
Release Notes:
- N/A
2024-02-06 20:41:36 +01:00
Amin Yahyaabadi
81bfa5fac4
fix: create the settings and keymaps to unblock file watching
2024-02-04 23:56:45 -08:00
Dzmitry Malyshau
8d339ede1c
linux: HACK disable watcher and crash uploader temporarily
2024-02-04 20:23:06 -08:00
Marshall Bowers
e338f34097
Sort dependencies in Cargo.toml files ( #7126 )
...
This PR sorts the dependency lists in our `Cargo.toml` files so that
they are in alphabetical order.
This should make them easier to visually scan when looking for a
dependency.
Apologies in advance for any merge conflicts 🙈
Release Notes:
- N/A
2024-01-30 21:41:29 -05:00
Marshall Bowers
176f63e86e
Add ability to copy a permalink to a line ( #7119 )
...
This PR adds the ability to copy the permalink to a line from within
Zed.
This functionality is available through the `editor: copy permalink to
line` action in the command palette:
<img width="589" alt="Screenshot 2024-01-30 at 7 07 46 PM"
src="https://github.com/zed-industries/zed/assets/1486634/332282cb-211f-4f16-9eb1-415bcfee9b7b ">
Executing this action will create a permalink to the currently selected
line(s) and copy it to the clipboard.
Here is an example line:
```
56c80e8011/src/lib.rs (L25)#6777 ](https://github.com/zed-industries/zed/issues/6777 )).
- Available via the `editor: copy permalink to line` action in the
command palette.
2024-01-30 19:20:15 -05:00
Marshall Bowers
0cb8b0e451
Clean up Cargo.toml files ( #7044 )
...
This PR cleans up some inconsistencies in the `Cargo.toml` files that
were driving me crazy.
Release Notes:
- N/A
2024-01-29 23:47:20 -05:00
Amin Yahyaabadi
1313402a6b
Introduce cross-platform file-watching ( #6855 )
...
This adds cross-platform file-watching via the
[Notify](https://github.com/notify-rs/notify ) crate. The previous
fs-events implementation is now only used on MacOS, and on other
platforms Notify is used. The watching function interface is the same.
Related to #5391 #5395 #5394 .
Release Notes:
- N/A
2024-01-29 22:18:10 +02:00
George Munyoro
49542757fd
Correctly check existence of target directory in copy_recursive function ( #6875 )
...
Fixes https://github.com/zed-industries/zed/issues/6778
Release Notes:
- Fixed issue where copy-paste for folders was not working in the
project panel
([#6778 ](https://github.com/zed-industries/zed/issues/6778 )).
2024-01-29 12:06:02 +02:00
Piotr Osiewicz
0a0a866dd5
Licenses: change license fields in Cargo.toml to AGPL-3.0-or-later. ( #5535 )
...
Release Notes:
- N/A
2024-01-27 13:51:16 +01:00
Piotr Osiewicz
f2ff7fa4d5
chore: Change AGPL-licensed crates to GPL (except for collab) ( #4231 )
...
- [x] Fill in GPL license text.
- [x] live_kit_client depends on live_kit_server as non-dev dependency,
even though it seems to only be used for tests. Is that an issue?
Release Notes:
- N/A
2024-01-24 00:26:58 +01:00
Piotr Osiewicz
21e6b09361
Remove license-file from Cargo.toml as it is apparently redundant ( #4218 )
...
Release Notes:
- N/A
2024-01-23 17:40:30 +01:00
Piotr Osiewicz
678bdddd7d
chore: Add crate licenses. ( #4158 )
...
- GPUI and all dependencies: Apache 2
- Everything else: AGPL
Here's a script that I've generated for it:
https://gist.github.com/osiewicz/6afdd6626e517da24a2092807e6f0b6e
Release Notes:
- N/A
---------
Co-authored-by: David <david@zed.dev>
2024-01-23 16:56:22 +01:00
Piotr Osiewicz
6c82380232
chore: Fix clippy::needless_borrow up to an editor
2024-01-21 15:03:24 +01:00
Mikayla
57400e9687
Fix typos detected by crate-ci/typos
2024-01-17 14:31:21 -08:00
Max Brunsfeld
f5ba22659b
Remove 2 suffix from gpui
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:59:39 -08:00
Max Brunsfeld
4305c5fdbe
Remove 2 suffix for ui, storybook, text
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:33:51 -08:00
Max Brunsfeld
0cf65223ce
Remove 2 suffix for collab, rope, settings, menu
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:29:16 -08:00
Max Brunsfeld
5ddd298b4d
Remove 2 suffix for fs, db, semantic_index, prettier
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:09:42 -08:00
Kirill Bulatov
ce8cc50ae5
Remove async_trait from the only trait that allows it now
2023-12-28 23:45:30 +02:00
Kirill Bulatov
7aea95704e
Revert unnecessary style changes
2023-10-12 16:17:41 +03:00
Kirill Bulatov
a8dfa01362
Prepare prettier file lookup code infra
2023-10-11 12:56:28 +03:00
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
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
Mikayla Maki
c6d7ed33c2
Add smoke test for collaboration
2023-05-08 14:33:59 -07:00
Mikayla Maki
26afd592c5
Wire in the branch name
2023-05-08 14:33:58 -07:00
Mikayla Maki
a58d3d8128
Add a data driven representation of the current git repository state to the worktree snapshots
...
WIP: Switch git repositories to use SumTrees
Co-authored-by: Nathan <nathan@zed.dev>
2023-05-08 14:33:58 -07:00
Max Brunsfeld
ebbe52e6b0
🎨 Specify more dependencies at the workspace level
2023-04-24 17:41:55 -07:00
Max Brunsfeld
abdccf7393
Use a workspace dependency for the futures crate
2023-04-24 09:43:31 -07:00
Max Brunsfeld
bb1cfd51b8
Add randomized test for mutating worktree during initial scan
2023-04-13 22:34:03 -07:00
Max Brunsfeld
bcf9b2f10d
Add missing random delays in FakeFs
2023-04-03 22:42:34 -07:00
Max Brunsfeld
5ecc9606af
Use synchronous locks in FakeFs
...
This way, the state can be accessed without running the deterministic
executor.
2023-04-03 18:15:07 -07:00
Antonio Scandurra
5471217089
Use the same serde version across the entire workspace
2023-03-28 09:42:00 -07:00
Max Brunsfeld
c730dca3c5
Update worktree randomized test to use worktree's public interface and the fake fs
2023-03-21 11:26:13 -07:00
Antonio Scandurra
1af8f4be19
Deserialize Theme directly into the heap to avoid stack overflow
...
Co-Authored-By: Julia Risley <julia@zed.dev>
2023-03-17 15:58:52 +01:00
Mikayla Maki
6571555c4d
Fix unwrap in git2 library causing panics in Zed
2023-03-16 13:06:23 -07:00
Mikayla Maki
ea39983f78
Removed old experiments settings and staff mode flag, added new StaffMode global that is set based on the webserver's staff bit
2023-01-27 15:43:12 -08:00
Mikayla Maki
d060114f00
Added complete scripts for generating third party license files
2023-01-23 12:47:12 -08:00
Nathan Sobo
386f7ba16d
Merge remote-tracking branch 'origin/main' into project-reconnection
2023-01-06 16:52:22 -07:00
Nathan Sobo
a6ffcdd0cf
Track open buffers when handling sync requests
...
When a host sends a buffer to a guest for the first time, they record that
they have done so in a set tied to that guest's peer id. When the guest
reconnects and syncs buffers, they do so under a different peer id, so we
need to be sure we track which buffers we have sent them to avoid sending
them the same buffer twice, which violates the guest's assumptions.
2023-01-02 20:27:59 -07:00
Max Brunsfeld
74843493f4
Assign fake fs entries' mtimes more consistently
2023-01-02 10:20:52 -08:00
Mikayla Maki
a5bccecd48
Add other line seperators to regex normalization
2022-12-30 18:18:02 -08:00
Antonio Scandurra
559e14799c
Restructure randomized test to be a bit clearer and test more stuff
2022-12-22 17:54:25 +01:00
Max Brunsfeld
c321f5d94a
Assert that buffers' file state matches in randomized collab test
...
Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-12-21 15:38:44 -08:00
Antonio Scandurra
c6e52dbef7
Fix hang due to acquiring rng lock twice
2022-11-01 09:35:53 +01:00
Antonio Scandurra
4c4ebbfa19
Start removing distinction between host and guest in random collab test
2022-11-01 08:40:08 +01:00
Mikayla Maki
1789dfb8b1
Fixed tests
2022-10-17 14:53:52 -07:00
Mikayla Maki
1f161b9aa1
Show full, absolute paths when displaying a local worktree
2022-10-17 13:35:45 -07:00
