Skip to content

Reset the diff view on target-branch change and post rebase #1800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggordonhall merged 4 commits into from
Jan 8, 2026
Merged

Reset the diff view on target-branch change and post rebase #1800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
706e11a
Reset the diff view on target-branch change and post rebase
abcpro1 Dec 21, 2025
bf62f25
Remove unbounded channel
abcpro1 Jan 7, 2026
83c2cc7
fmt
abcpro1 Jan 8, 2026
0cf2b24
use git service
abcpro1 Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions crates/local-deployment/src/container.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ use services::services::{
config::Config,
container::{ContainerError, ContainerRef, ContainerService},
diff_stream::{self, DiffStreamHandle},
git::{Commit, GitCli, GitService},
git::{GitCli, GitService},
image::ImageService,
notification::NotificationService,
queued_message::QueuedMessageService,
Expand Down Expand Up @@ -631,20 +631,11 @@ impl LocalContainerService {
/// Returns a stream that owns the filesystem watcher - when dropped, watcher is cleaned up
async fn create_live_diff_stream(
&self,
worktree_path: &Path,
base_commit: &Commit,
stats_only: bool,
path_prefix: Option<String>,
args: diff_stream::DiffStreamArgs,
) -> Result<DiffStreamHandle, ContainerError> {
diff_stream::create(
self.git().clone(),
worktree_path.to_path_buf(),
base_commit.clone(),
stats_only,
path_prefix,
)
.await
.map_err(|e| ContainerError::Other(anyhow!("{e}")))
diff_stream::create(args)
.await
.map_err(|e| ContainerError::Other(anyhow!("{e}")))
}

/// Extract the last assistant message from the MsgStore history
Expand Down Expand Up @@ -1271,12 +1262,19 @@ impl ContainerService for LocalContainerService {
};

let stream = self
.create_live_diff_stream(
&worktree_path,
&base_commit,
.create_live_diff_stream(diff_stream::DiffStreamArgs {
git_service: self.git().clone(),
db: self.db().clone(),
workspace_id: workspace.id,
repo_id: repo.id,
repo_path: repo.path.clone(),
worktree_path: worktree_path.clone(),
branch: branch.to_string(),
target_branch: target_branch.clone(),
base_commit: base_commit.clone(),
stats_only,
Some(repo.name.clone()),
)
path_prefix: Some(repo.name.clone()),
})
.await?;

streams.push(Box::pin(stream));
Expand Down
Loading