mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 21:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Only share worktrees when UpdateProject succeeded

Browse source
This commit is contained in:
Antonio Scandurra 2023-01-06 10:41:11 -07:00
parent 8c5a0ca3a4
commit 0d31c8c1c8
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
crates/project/src/project.rs
View file

@ -1026,19 +1026,21 @@ impl Project {
let Some(this) = this.upgrade(&cx) else { break };
let worktrees =
this.read_with(&cx, |this, cx| this.worktrees(cx).collect::<Vec<_>>());
this.read_with(&cx, |this, cx| {
this.client.request(proto::UpdateProject {
project_id,
worktrees: this.worktree_metadata_protos(cx),
let update_project = this
.read_with(&cx, |this, cx| {
this.client.request(proto::UpdateProject {
project_id,
worktrees: this.worktree_metadata_protos(cx),
})
})
})
.await
.log_err();
for worktree in worktrees {
worktree.update(&mut cx, |worktree, cx| {
let worktree = &mut worktree.as_local_mut().unwrap();
worktree.share(project_id, cx).detach_and_log_err(cx)
});
.await;
if update_project.is_ok() {
for worktree in worktrees {
worktree.update(&mut cx, |worktree, cx| {
let worktree = &mut worktree.as_local_mut().unwrap();
worktree.share(project_id, cx).detach_and_log_err(cx)
});
}
}
for tx in txs.drain(..) {