Merge pull request #13 from Luladjiev/fix_stashing_of_files

Update the way files are stashed and update rebase function to stash them too

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lgit"
-version = "0.7.2"
+version = "0.7.3"
 edition = "2021"
 authors = ["Peter Luladjiev<lgit-rs@luladjiev.com>"]
 description = "CLI tool for managing git repositories"

src/commands/branch.rs

@@ -7,15 +7,17 @@ pub fn run<T: Exec>(
     base: &str,
     verbose: bool,
 ) -> Result<(), &'static str> {
-    stash(command, verbose)?;
+    let unsaved_changes = stash(command, verbose)?;
 
     refresh_base(command, base, verbose).map_err(|()| "Failed to refresh base branch")?;
 
     command
         .exec(&["checkout", "-b", &name], verbose)
         .map_err(|()| "Failed to create branch")?;
 
-    unstash(command, verbose)?;
+    if unsaved_changes {
+        unstash(command, verbose)?;
+    }
 
     println!("Created branch {name}");
 
@@ -33,7 +35,7 @@ mod tests {
         command
             .expect_exec()
             .times(1)
-            .withf(|args, verbose| args == ["stash", "-u"] && !(*verbose))
+            .withf(|args, verbose| args == ["status", "--porcelain"] && !(*verbose))
             .returning(|_, _| Ok(String::new()));
         command
             .expect_exec()
@@ -50,11 +52,6 @@ mod tests {
             .times(1)
             .withf(|args, verbose| args == ["checkout", "-b", "test"] && !(*verbose))
             .returning(|_, _| Ok(String::new()));
-        command
-            .expect_exec()
-            .times(1)
-            .withf(|args, verbose| args == ["stash", "pop"] && !(*verbose))
-            .returning(|_, _| Ok(String::new()));
         assert_eq!(run(&command, "test", "main", false), Ok(()));
     }
 }

src/commands/rebase.rs

@@ -1,7 +1,9 @@
 use crate::commands::Exec;
-use crate::utils::refresh_base;
+use crate::utils::{refresh_base, stash, unstash};
 
 pub fn run<T: Exec>(command: &T, base: &str, verbose: bool) -> Result<(), &'static str> {
+    let unsaved_changes = stash(command, verbose)?;
+
     refresh_base(command, base, verbose).map_err(|()| "Failed to refresh base branch")?;
 
     command
@@ -12,6 +14,10 @@ pub fn run<T: Exec>(command: &T, base: &str, verbose: bool) -> Result<(), &'stat
         .exec(&["rebase", base], verbose)
         .map_err(|()| "Failed to rebase")?;
 
+    if unsaved_changes {
+        unstash(command, verbose)?;
+    }
+
     println!("Rebased onto {base}");
 
     Ok(())

src/utils.rs

@@ -37,12 +37,20 @@ fn search_branch<T: Exec>(command: &T, branch: &str, verbose: bool) -> Result<()
     }
 }
 
-pub fn stash<T: Exec>(command: &T, verbose: bool) -> Result<(), &'static str> {
+pub fn stash<T: Exec>(command: &T, verbose: bool) -> Result<bool, &'static str> {
+    let result = command
+        .exec(&["status", "--porcelain"], verbose)
+        .map_err(|()| "Failed to retrieve branch status")?;
+
+    if result.is_empty() {
+        return Ok(false);
+    }
+
     command
         .exec(&["stash", "-u"], verbose)
         .map_err(|()| "Failed to stash changes")?;
 
-    Ok(())
+    Ok(true)
 }
 
 pub fn unstash<T: Exec>(command: &T, verbose: bool) -> Result<(), &'static str> {