Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split worktree updates coming from an SSH server

Browse source 
Previously, we would send the initial set of paths / changeset for a worktree
in its entirety and we think this was causing the server to panic.

Co-Authored-By: Thorsten <thorsten@zed.dev>
Co-Authored-By: Bennet <bennet@zed.dev>
Co-Authored-By: Kirill <kirill@zed.dev>
This commit is contained in:
Antonio Scandurra 2024-10-24 15:10:54 +02:00
parent 29c2df73e1
commit 3e7a2e5c30
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/worktree/src/worktree.rs
View file

@ -36,7 +36,10 @@ use postage::{
prelude::{Sink as _, Stream as _}, prelude::{Sink as _, Stream as _},
watch, watch,
}; };
use rpc::{proto, AnyProtoClient}; use rpc::{
proto::{self, split_worktree_update},
AnyProtoClient,
};
pub use settings::WorktreeId; pub use settings::WorktreeId;
use settings::{Settings, SettingsLocation, SettingsStore}; use settings::{Settings, SettingsLocation, SettingsStore};
use smallvec::{smallvec, SmallVec}; use smallvec::{smallvec, SmallVec};
@ -1812,13 +1815,17 @@ impl RemoteWorktree {
self.update_observer = Some(tx); self.update_observer = Some(tx);
cx.spawn(|this, mut cx| async move { cx.spawn(|this, mut cx| async move {
let mut update = initial_update; let mut update = initial_update;
loop { 'outer: loop {
// SSH projects use a special project ID of 0, and we need to // SSH projects use a special project ID of 0, and we need to
// remap it to the correct one here. // remap it to the correct one here.
update.project_id = project_id; update.project_id = project_id;
if !callback(update).await {
break; for chunk in split_worktree_update(update) {
if !callback(chunk).await {
break 'outer;
}
} }
if let Some(next_update) = rx.next().await { if let Some(next_update) = rx.next().await {
update = next_update; update = next_update;
} else { } else {