Merge pull request #4820 from gitbutlerapp/unapply-only-hunks-from-lane

Only discard the files changes inside the lane

Author: estib-vega

apps/desktop/src/lib/file/FileContextMenu.svelte

@@ -14,6 +14,7 @@
 	import { join } from '@tauri-apps/api/path';
 	import { open as openFile } from '@tauri-apps/api/shell';
 
+	export let branchId: string | undefined;
 	export let target: HTMLElement | undefined;
 	export let isUnapplied;
 
@@ -115,7 +116,12 @@
 			style="error"
 			kind="solid"
 			onclick={() => {
-				branchController.unapplyFiles(item.files);
+				if (!branchId) {
+					console.error('Branch ID is not set');
+					toasts.error('Failed to discard changes');
+					return;
+				}
+				branchController.unapplyFiles(branchId, item.files);
 				close();
 			}}
 		>

apps/desktop/src/lib/file/FileListItem.svelte

@@ -85,7 +85,12 @@
 	});
 </script>
 
-<FileContextMenu bind:this={contextMenu} target={draggableEl} {isUnapplied} />
+<FileContextMenu
+	bind:this={contextMenu}
+	target={draggableEl}
+	{isUnapplied}
+	branchId={$branch?.id}
+/>
 
 <FileListItem
 	id={`file-${file.id}`}

apps/desktop/src/lib/vbranches/branchController.ts

@@ -226,11 +226,12 @@ export class BranchController {
 		}
 	}
 
-	async unapplyFiles(files: LocalFile[]) {
+	async unapplyFiles(branchId: string, files: LocalFile[]) {
 		try {
 			await invoke<void>('reset_files', {
 				projectId: this.projectId,
-				files: files.flatMap((f) => f.path).join('\n')
+				branchId,
+				files: files.flatMap((f) => f.path)
 			});
 		} catch (err) {
 			showError('Failed to unapply file changes', err);

crates/gitbutler-branch-actions/src/actions.rs

@@ -25,6 +25,7 @@ use gitbutler_oplog::{
 use gitbutler_project::{FetchResult, Project};
 use gitbutler_reference::{ReferenceName, Refname, RemoteRefname};
 use gitbutler_repo::{credentials::Helper, RepoActionsExt, RepositoryExt};
+use std::path::PathBuf;
 use tracing::instrument;
 
 #[derive(Clone, Copy, Default)]
@@ -285,7 +286,12 @@ impl VirtualBranchActions {
         branch::unapply_ownership(&ctx, ownership, guard.write_permission()).map_err(Into::into)
     }
 
-    pub fn reset_files(&self, project: &Project, files: &Vec<String>) -> Result<()> {
+    pub fn reset_files(
+        &self,
+        project: &Project,
+        branch_id: BranchId,
+        files: &[PathBuf],
+    ) -> Result<()> {
         let ctx = open_with_verify(project)?;
         assure_open_workspace_mode(&ctx)
             .context("Resetting a file requires open workspace mode")?;
@@ -294,7 +300,7 @@ impl VirtualBranchActions {
             SnapshotDetails::new(OperationKind::DiscardFile),
             guard.write_permission(),
         );
-        branch::reset_files(&ctx, files).map_err(Into::into)
+        branch::reset_files(&ctx, branch_id, files, guard.write_permission()).map_err(Into::into)
     }
 
     pub fn amend(

crates/gitbutler-branch-actions/src/virtual.rs

@@ -32,12 +32,7 @@ use gitbutler_repo::{
 use gitbutler_time::time::now_since_unix_epoch_ms;
 use serde::Serialize;
 use std::collections::HashSet;
-use std::{
-    borrow::Cow,
-    collections::HashMap,
-    path::{Path, PathBuf},
-    vec,
-};
+use std::{borrow::Cow, collections::HashMap, path::PathBuf, vec};
 use tracing::instrument;
 
 // this struct is a mapping to the view `Branch` type in Typescript
@@ -183,28 +178,32 @@ pub fn unapply_ownership(
 }
 
 // reset a file in the project to the index state
-pub(crate) fn reset_files(ctx: &CommandContext, files: &Vec<String>) -> Result<()> {
+pub(crate) fn reset_files(
+    ctx: &CommandContext,
+    branch_id: BranchId,
+    files: &[PathBuf],
+    perm: &mut WorktreeWritePermission,
+) -> Result<()> {
     ctx.assure_resolved()?;
 
-    // for each tree, we need to checkout the entry from the index at that path
-    // or if it doesn't exist, remove the file from the working directory
-    let repo = ctx.repository();
-    let index = repo.index().context("failed to get index")?;
-    for file in files {
-        let entry = index.get_path(Path::new(file), 0);
-        if entry.is_some() {
-            repo.checkout_index_path_builder(Path::new(file))
-                .context("failed to checkout index")?;
-        } else {
-            // find the project root
-            let project_root = &ctx.project().path;
-            let path = Path::new(file);
-            //combine the project root with the file path
-            let path = &project_root.join(path);
-            std::fs::remove_file(path).context("failed to remove file")?;
-        }
-    }
+    let branch = ctx
+        .project()
+        .virtual_branches()
+        .list_branches_in_workspace()
+        .context("failed to read virtual branches")?
+        .into_iter()
+        .find(|b| b.id == branch_id)
+        .with_context(|| {
+            format!("could not find applied branch with id {branch_id} to reset files from")
+        })?;
+    let claims: Vec<_> = branch
+        .ownership
+        .claims
+        .into_iter()
+        .filter(|claim| files.contains(&claim.file_path))
+        .collect();
 
+    unapply_ownership(ctx, &BranchOwnershipClaims { claims }, perm)?;
     Ok(())
 }
 fn find_base_tree<'a>(

crates/gitbutler-tauri/src/virtual_branches.rs

@@ -14,6 +14,7 @@ pub mod commands {
     use gitbutler_reference::{
         normalize_branch_name as normalize_name, ReferenceName, Refname, RemoteRefname,
     };
+    use std::path::PathBuf;
     use tauri::State;
     use tracing::instrument;
 
@@ -250,15 +251,11 @@ pub mod commands {
         windows: State<'_, WindowState>,
         projects: State<'_, projects::Controller>,
         project_id: ProjectId,
-        files: &str,
+        branch_id: BranchId,
+        files: Vec<PathBuf>,
     ) -> Result<(), Error> {
         let project = projects.get(project_id)?;
-        // convert files to Vec<String>
-        let files = files
-            .split('\n')
-            .map(std::string::ToString::to_string)
-            .collect::<Vec<String>>();
-        VirtualBranchActions.reset_files(&project, &files)?;
+        VirtualBranchActions.reset_files(&project, branch_id, &files)?;
         emit_vbranches(&windows, project_id);
         Ok(())
     }