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

Allow reviewing of agent changes without Git (#27668)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Antonio Scandurra 2025-03-28 19:58:53 +01:00 • committed by GitHub
parent 8a307e7b89
commit 94ed0b7767
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 2271 additions and 1095 deletions
Download patch file Download diff file Expand all files Collapse all files

249
crates/project/src/git_store.rs
View file

@ -20,10 +20,10 @@ use git::{
blame::Blame,
parse_git_remote_url,
repository::{
Branch, CommitDetails, DiffType, GitIndex, GitRepository, GitRepositoryCheckpoint,
PushOptions, Remote, RemoteCommandOutput, RepoPath, ResetMode,
Branch, CommitDetails, DiffType, GitRepository, GitRepositoryCheckpoint, PushOptions,
Remote, RemoteCommandOutput, RepoPath, ResetMode,
},
status::{FileStatus, GitStatus},
status::FileStatus,
BuildPermalinkParams, GitHostingProviderRegistry,
};
use gpui::{
@ -146,22 +146,6 @@ pub struct GitStoreCheckpoint {
checkpoints_by_work_dir_abs_path: HashMap<PathBuf, GitRepositoryCheckpoint>,
}
#[derive(Clone, Debug)]
pub struct GitStoreDiff {
diffs_by_work_dir_abs_path: HashMap<PathBuf, String>,
}
#[derive(Clone, Debug)]
pub struct GitStoreIndex {
indices_by_work_dir_abs_path: HashMap<PathBuf, GitIndex>,
}
#[derive(Default)]
pub struct GitStoreStatus {
#[allow(dead_code)]
statuses_by_work_dir_abs_path: HashMap<PathBuf, GitStatus>,
}
pub struct Repository {
pub repository_entry: RepositoryEntry,
pub merge_message: Option<String>,
@ -755,113 +739,6 @@ impl GitStore {
})
}
pub fn diff_checkpoints(
&self,
base_checkpoint: GitStoreCheckpoint,
target_checkpoint: GitStoreCheckpoint,
cx: &App,
) -> Task<Result<GitStoreDiff>> {
let repositories_by_work_dir_abs_path = self
.repositories
.values()
.map(|repo| {
(
repo.read(cx)
.repository_entry
.work_directory_abs_path
.clone(),
repo,
)
})
.collect::<HashMap<_, _>>();
let mut tasks = Vec::new();
for (work_dir_abs_path, base_checkpoint) in base_checkpoint.checkpoints_by_work_dir_abs_path
{
if let Some(target_checkpoint) = target_checkpoint
.checkpoints_by_work_dir_abs_path
.get(&work_dir_abs_path)
.cloned()
{
if let Some(repository) = repositories_by_work_dir_abs_path.get(&work_dir_abs_path)
{
let diff = repository
.read(cx)
.diff_checkpoints(base_checkpoint, target_checkpoint);
tasks.push(async move {
let diff = diff.await??;
anyhow::Ok((work_dir_abs_path, diff))
});
}
}
}
cx.background_spawn(async move {
let diffs_by_path = future::try_join_all(tasks).await?;
Ok(GitStoreDiff {
diffs_by_work_dir_abs_path: diffs_by_path.into_iter().collect(),
})
})
}
pub fn create_index(&self, cx: &App) -> Task<Result<GitStoreIndex>> {
let mut indices = Vec::new();
for repository in self.repositories.values() {
let repository = repository.read(cx);
let work_dir_abs_path = repository.repository_entry.work_directory_abs_path.clone();
let index = repository.create_index().map(|index| index?);
indices.push(async move {
let index = index.await?;
anyhow::Ok((work_dir_abs_path, index))
});
}
cx.background_executor().spawn(async move {
let indices = future::try_join_all(indices).await?;
Ok(GitStoreIndex {
indices_by_work_dir_abs_path: indices.into_iter().collect(),
})
})
}
pub fn apply_diff(
&self,
mut index: GitStoreIndex,
diff: GitStoreDiff,
cx: &App,
) -> Task<Result<()>> {
let repositories_by_work_dir_abs_path = self
.repositories
.values()
.map(|repo| {
(
repo.read(cx)
.repository_entry
.work_directory_abs_path
.clone(),
repo,
)
})
.collect::<HashMap<_, _>>();
let mut tasks = Vec::new();
for (work_dir_abs_path, diff) in diff.diffs_by_work_dir_abs_path {
if let Some(repository) = repositories_by_work_dir_abs_path.get(&work_dir_abs_path) {
if let Some(branch) = index
.indices_by_work_dir_abs_path
.remove(&work_dir_abs_path)
{
let apply = repository.read(cx).apply_diff(branch, diff);
tasks.push(async move { apply.await? });
}
}
}
cx.background_spawn(async move {
future::try_join_all(tasks).await?;
Ok(())
})
}
/// Blames a buffer.
pub fn blame_buffer(
&self,
@ -1406,7 +1283,7 @@ impl GitStore {
let index_text = if current_index_text.is_some() {
local_repo
.repo()
.load_index_text(None, relative_path.clone())
.load_index_text(relative_path.clone())
.await
} else {
None
@ -1521,87 +1398,6 @@ impl GitStore {
Some(status.status)
}
pub fn status(&self, index: Option<GitStoreIndex>, cx: &App) -> Task<Result<GitStoreStatus>> {
let repositories_by_work_dir_abs_path = self
.repositories
.values()
.map(|repo| {
(
repo.read(cx)
.repository_entry
.work_directory_abs_path
.clone(),
repo,
)
})
.collect::<HashMap<_, _>>();
let mut tasks = Vec::new();
if let Some(index) = index {
// When we have an index, just check the repositories that are part of it
for (work_dir_abs_path, git_index) in index.indices_by_work_dir_abs_path {
if let Some(repository) = repositories_by_work_dir_abs_path.get(&work_dir_abs_path)
{
let status = repository.read(cx).status(Some(git_index));
tasks.push(
async move {
let status = status.await??;
anyhow::Ok((work_dir_abs_path, status))
}
.boxed(),
);
}
}
} else {
// Otherwise, check all repositories
for repository in self.repositories.values() {
let repository = repository.read(cx);
let work_dir_abs_path = repository.repository_entry.work_directory_abs_path.clone();
let status = repository.status(None);
tasks.push(
async move {
let status = status.await??;
anyhow::Ok((work_dir_abs_path, status))
}
.boxed(),
);
}
}
cx.background_executor().spawn(async move {
let statuses = future::try_join_all(tasks).await?;
Ok(GitStoreStatus {
statuses_by_work_dir_abs_path: statuses.into_iter().collect(),
})
})
}
pub fn load_index_text(
&self,
index: Option<GitStoreIndex>,
buffer: &Entity<Buffer>,
cx: &App,
) -> Task<Option<String>> {
let Some((repository, path)) =
self.repository_and_path_for_buffer_id(buffer.read(cx).remote_id(), cx)
else {
return Task::ready(None);
};
let git_index = index.and_then(|index| {
index
.indices_by_work_dir_abs_path
.get(&repository.read(cx).repository_entry.work_directory_abs_path)
.copied()
});
let text = repository.read(cx).load_index_text(git_index, path);
cx.background_spawn(async move {
let text = text.await;
text.ok().flatten()
})
}
pub fn repository_and_path_for_buffer_id(
&self,
buffer_id: BufferId,
@ -2851,24 +2647,11 @@ impl Repository {
self.repository_entry.status()
}
pub fn status(&self, index: Option<GitIndex>) -> oneshot::Receiver<Result<GitStatus>> {
self.send_job(move |repo, _cx| async move {
match repo {
RepositoryState::Local(git_repository) => git_repository.status(index, &[]).await,
RepositoryState::Remote { .. } => Err(anyhow!("not implemented yet")),
}
})
}
pub fn load_index_text(
&self,
index: Option<GitIndex>,
path: RepoPath,
) -> oneshot::Receiver<Option<String>> {
pub fn load_index_text(&self, path: RepoPath) -> oneshot::Receiver<Option<String>> {
self.send_job(move |repo, _cx| async move {
match repo {
RepositoryState::Local(git_repository) => {
git_repository.load_index_text(index, path).await
git_repository.load_index_text(path).await
}
RepositoryState::Remote { .. } => None,
}
@ -3779,26 +3562,6 @@ impl Repository {
}
})
}
pub fn create_index(&self) -> oneshot::Receiver<Result<GitIndex>> {
self.send_job(move |repo, _cx| async move {
match repo {
RepositoryState::Local(git_repository) => git_repository.create_index().await,
RepositoryState::Remote { .. } => Err(anyhow!("not implemented yet")),
}
})
}
pub fn apply_diff(&self, index: GitIndex, diff: String) -> oneshot::Receiver<Result<()>> {
self.send_job(move |repo, _cx| async move {
match repo {
RepositoryState::Local(git_repository) => {
git_repository.apply_diff(index, diff).await
}
RepositoryState::Remote { .. } => Err(anyhow!("not implemented yet")),
}
})
}
}
fn get_permalink_in_rust_registry_src(

6
crates/project/src/lsp_store.rs
View file

@ -1228,7 +1228,7 @@ impl LocalLspStore {
.await;
buffer.handle.update(cx, |buffer, cx| {
buffer.start_transaction();
buffer.apply_diff(diff, cx);
buffer.apply_diff(diff, true, cx);
transaction_id_format =
transaction_id_format.or(buffer.end_transaction(cx));
if let Some(transaction_id) = transaction_id_format {
@ -1362,7 +1362,7 @@ impl LocalLspStore {
zlog::trace!(logger => "Applying changes");
buffer.handle.update(cx, |buffer, cx| {
buffer.start_transaction();
buffer.apply_diff(diff, cx);
buffer.apply_diff(diff, true, cx);
transaction_id_format =
transaction_id_format.or(buffer.end_transaction(cx));
if let Some(transaction_id) = transaction_id_format {
@ -1405,7 +1405,7 @@ impl LocalLspStore {
zlog::trace!(logger => "Applying changes");
buffer.handle.update(cx, |buffer, cx| {
buffer.start_transaction();
buffer.apply_diff(diff, cx);
buffer.apply_diff(diff, true, cx);
transaction_id_format =
transaction_id_format.or(buffer.end_transaction(cx));
if let Some(transaction_id) = transaction_id_format {