implement update

Pistonite · Nov 25, 2023 · 3492ff1 · 3492ff1
1 parent b20bf29
commit 3492ff1
Show file tree

Hide file tree

Showing 7 changed files with 315 additions and 89 deletions.
diff --git a/README.md b/README.md
@@ -78,8 +78,7 @@ It also deletes submodules that are deleted by others (by running `status --fix
 
 ### Show submodule status
 ```bash
-magoo status [--all]
-magoo status --fix [--all]
+magoo status [--long] [--all] [--fix]
 ```
 Shows everything ![magoo](https://raw.githubusercontent.com/Pistonite/magoo/main/magoo.webp) knows about submodules in the current repo.
 
@@ -108,10 +107,10 @@ the `BRANCH` specified when you add it.
    ```
 
 ### Remove submodules
+![magoo](https://raw.githubusercontent.com/Pistonite/magoo/main/magoo.webp) can remove a submodule with ease:
 ```bash
-magoo remove NAME [--force]
+magoo remove NAME
 ```
-`--force` will discard any changes made in the submodule (`git submodule deinit --force`)
 
 Note: Newer versions of git lets you delete a submodule with `git rm`. However, it doesn't delete the content in
 `.git/modules`. ![magoo](https://raw.githubusercontent.com/Pistonite/magoo/main/magoo.webp) deletes those.
diff --git a/README.txtpp.md b/README.txtpp.md
@@ -106,8 +106,7 @@ It also deletes submodules that are deleted by others (by running `status --fix
 
 ### Show submodule status
 ```bash
-magoo status [--all]
-magoo status --fix [--all]
+magoo status [--long] [--all] [--fix]
 ```
 TXTPP#tag MAGOO
 TXTPP#include magoo.txt
@@ -142,10 +141,12 @@ the `BRANCH` specified when you add it.
    ```
 
 ### Remove submodules
+TXTPP#tag MAGOO
+TXTPP#include magoo.txt
+MAGOO can remove a submodule with ease:
 ```bash
-magoo remove NAME [--force]
+magoo remove NAME
 ```
-`--force` will discard any changes made in the submodule (`git submodule deinit --force`)
 
 TXTPP#tag MAGOO
 TXTPP#include magoo.txt

diff --git a/src/git.rs b/src/git.rs
@@ -204,6 +204,12 @@ impl GitContext {
 
 /// Wrapper implementation for git commands
 impl GitContext {
+    /// Run `git status` and print the status
+    pub fn status(&self) -> Result<(), GitError> {
+        self.run_git_command(&["status"], true)?;
+        Ok(())
+    }
+
     /// Run `git -C top_level ls-files ...`
     pub fn ls_files(&self, extra_args: &[&str]) -> Result<Vec<String>, GitError> {
         let top_level_dir = self.top_level_dir()?.display().to_string();
@@ -387,15 +393,61 @@ impl GitContext {
         Ok(())
     }
 
+    /// Runs `git submodule set-branch`. Path should be from top level
+    pub fn submodule_set_branch(&self, path: &str, branch: Option<&str>) -> Result<(), GitError> {
+        let top_level_dir = self.top_level_dir()?.display().to_string();
+        let mut args = vec!["-C", &top_level_dir, "submodule", "set-branch"];
+        match branch {
+            Some(branch) => {
+                args.push("--branch");
+                args.push(branch);
+            }
+            None => {
+                args.push("--default");
+            }
+        }
+        args.push("--");
+        args.push(path);
+        self.run_git_command(&args, true)?;
+        Ok(())
+    }
+
+    /// Runs `git submodule set-url`. Path should be from top level
+    pub fn submodule_set_url(&self, path: &str, url: &str) -> Result<(), GitError> {
+        let top_level_dir = self.top_level_dir()?.display().to_string();
+        self.run_git_command(
+            &[
+                "-C",
+                &top_level_dir,
+                "submodule",
+                "set-url",
+                "--",
+                path,
+                url,
+            ],
+            true,
+        )?;
+        Ok(())
+    }
+
     /// Runs `git submodule update [-- <path>]`. Path should be from top level
-    pub fn submodule_update(&self, path: Option<&str>, force: bool) -> Result<(), GitError> {
+    pub fn submodule_update(
+        &self,
+        path: Option<&str>,
+        force: bool,
+        remote: bool,
+    ) -> Result<(), GitError> {
         let top_level_dir = self.top_level_dir()?.display().to_string();
         let mut args = vec!["-C", &top_level_dir, "submodule", "update"];
 
         if force {
             args.push("--force");
         }
 
+        if remote {
+            args.push("--remote");
+        }
+
         if let Some(path) = path {
             args.push("--");
             args.push(path);
@@ -523,7 +575,7 @@ pub enum GitError {
     LockFailed(String, std::io::Error),
 
     #[error("fix the issues above and try again.")]
-    NeedFix,
+    NeedFix(bool /* should show fatal */),
 }
 
 /// Helper trait to canonicalize a path and return a [`GitError`] if failed