Squashed commit of the following:

commit 7ced025d97d657b7deb9b6e311fbbc78c2ee3351 Author: Whirlwind <[email protected]> Date: Tue Aug 17 12:10:15 2021 +0800 [Optimize] Find repo by repo will not search package name
MBoxPlus · Aug 17, 2021 · 35db1c6 · 35db1c6
1 parent 1f55a64
commit 35db1c6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Native/MBoxWorkspace/CLI/Remove.swift b/Native/MBoxWorkspace/CLI/Remove.swift
@@ -77,7 +77,10 @@ extension MBCommander {
             } else {
                 for name in self.names {
                     try UI.log(verbose: "[\(name)]") {
-                        let repos = config.currentFeature.findRepo(name: name)
+                        var repos = config.currentFeature.findRepo(name: name, searchPackageName: false)
+                        if repos.count == 0 {
+                            repos = config.currentFeature.findRepo(name: name, searchPackageName: true)
+                        }
                         if repos.count == 0 {
                             UI.log(warn: "Could not find the repo `\(name)`")
                             return

diff --git a/Native/MBoxWorkspaceCore/Model/MBConfig.Feature+Repo.swift b/Native/MBoxWorkspaceCore/Model/MBConfig.Feature+Repo.swift
@@ -25,7 +25,7 @@ extension MBConfig.Feature {
                 return r
             }
         }
-        return findRepo(name: repo.name, owner: repo.owner).first
+        return findRepo(name: repo.name, owner: repo.owner, searchPackageName: false).first
     }
 
     @discardableResult

diff --git a/Native/MBoxWorkspaceCore/Model/MBConfig.Repo.swift b/Native/MBoxWorkspaceCore/Model/MBConfig.Repo.swift
@@ -418,8 +418,11 @@ extension MBConfig.Repo {
             guard let workRepo = self.workRepository else {
                 return
             }
-            if let head = head {
-                try workRepo.git?.setHEAD(head)
+            if let head = head, let git = workRepo.git {
+                if head.isBranch, git.localBranch(named: head.value) == nil {
+                    try git.createBranch(head.value, base: head)
+                }
+                try git.setHEAD(head)
             }
             let cachePath = self.worktreeCachePath
             if cachePath.isDirectory {