enhance: update submodules individually (#1272)

Signed-off-by: leo <[email protected]>

Author: love-linger

src/Commands/Checkout.cs

@@ -11,17 +11,15 @@ public Checkout(string repo)
             Context = repo;
         }
 
-        public bool Branch(string branch, bool recurseSubmodules)
+        public bool Branch(string branch)
         {
-            var options = recurseSubmodules ? "--recurse-submodules" : string.Empty;
-            Args = $"checkout {options} --progress {branch}";
+            Args = $"checkout --force --progress {branch}";
             return Exec();
         }
 
-        public bool Branch(string branch, string basedOn, bool recurseSubmodules)
+        public bool Branch(string branch, string basedOn)
         {
-            var options = recurseSubmodules ? "--recurse-submodules" : string.Empty;
-            Args = $"checkout {options} --progress -b {branch} {basedOn}";
+            Args = $"checkout --force --progress -b {branch} {basedOn}";
             return Exec();
         }
 

src/ViewModels/Checkout.cs

@@ -68,8 +68,15 @@ public override Task<bool> Sure()
                     }
                 }
 
-                var rs = new Commands.Checkout(_repo.FullPath).Use(log).Branch(Branch, updateSubmodules);
-                if (needPopStash)
+                var rs = new Commands.Checkout(_repo.FullPath).Use(log).Branch(Branch);
+                if (rs && updateSubmodules)
+                {
+                    var submodules = new Commands.QuerySubmodules(_repo.FullPath).Result();
+                    foreach (var submodule in submodules)
+                        new Commands.Submodule(_repo.FullPath).Use(log).Update(submodule.Path, true, true, false);
+                }
+
+                if (rs && needPopStash)
                     rs = new Commands.Stash(_repo.FullPath).Use(log).Pop("stash@{0}");
 
                 log.Complete();

src/ViewModels/Clone.cs

@@ -101,7 +101,6 @@ public override Task<bool> Sure()
         {
             ProgressDescription = "Clone ...";
 
-            // Create a temp log.
             var log = new CommandLog("Clone");
             Use(log);
 
@@ -139,11 +138,10 @@ public override Task<bool> Sure()
                     config.Set("remote.origin.sshkey", _sshKey);
                 }
 
-                // individually update submodule (if any)
                 if (InitAndUpdateSubmodules)
                 {
-                    var submoduleList = new Commands.QuerySubmodules(path).Result();
-                    foreach (var submodule in submoduleList)
+                    var submodules = new Commands.QuerySubmodules(path).Result();
+                    foreach (var submodule in submodules)
                         new Commands.Submodule(path).Use(log).Update(submodule.Path, true, true, false);
                 }
 

src/ViewModels/CreateBranch.cs

@@ -142,8 +142,15 @@ public override Task<bool> Sure()
                         }
                     }
 
-                    succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(fixedName, _baseOnRevision, updateSubmodules);
-                    if (needPopStash)
+                    succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(fixedName, _baseOnRevision);
+                    if (succ && updateSubmodules)
+                    {
+                        var submodules = new Commands.QuerySubmodules(_repo.FullPath).Result();
+                        foreach (var submodule in submodules)
+                            new Commands.Submodule(_repo.FullPath).Use(log).Update(submodule.Path, true, true, false);
+                    }
+
+                    if (succ && needPopStash)
                         new Commands.Stash(_repo.FullPath).Use(log).Pop("stash@{0}");
                 }
                 else