WIP recursive submodules

Entering submodules works, but other commands fail, so this is not good enough yet.
jesseduffield · Feb 5, 2024 · 6456eb1 · 6456eb1
1 parent 49df908
commit 6456eb1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/pkg/commands/git_commands/submodule.go b/pkg/commands/git_commands/submodule.go
@@ -26,8 +26,8 @@ func NewSubmoduleCommands(gitCommon *GitCommon) *SubmoduleCommands {
 	}
 }
 
-func (self *SubmoduleCommands) GetConfigs() ([]*models.SubmoduleConfig, error) {
-	file, err := os.Open(".gitmodules")
+func (self *SubmoduleCommands) GetConfigs(parentName string, parentPath string) ([]*models.SubmoduleConfig, error) {
+	file, err := os.Open(filepath.Join(parentPath, ".gitmodules"))
 	if err != nil {
 		if os.IsNotExist(err) {
 			return nil, nil
@@ -55,17 +55,28 @@ func (self *SubmoduleCommands) GetConfigs() ([]*models.SubmoduleConfig, error) {
 		line := scanner.Text()
 
 		if name, ok := firstMatch(line, `\[submodule "(.*)"\]`); ok {
+			if parentName != "" {
+				name = parentName + "/" + name
+			}
 			configs = append(configs, &models.SubmoduleConfig{Name: name})
 			continue
 		}
 
 		if len(configs) > 0 {
-			lastConfig := configs[len(configs)-1]
+			lastConfigIdx := len(configs) - 1
 
 			if path, ok := firstMatch(line, `\s*path\s*=\s*(.*)\s*`); ok {
-				lastConfig.Path = path
+				if parentPath != "" {
+					configs[lastConfigIdx].Path = parentPath + "/" + path
+				} else {
+					configs[lastConfigIdx].Path = path
+				}
+				nestedConfigs, err := self.GetConfigs(configs[lastConfigIdx].Name, configs[lastConfigIdx].Path)
+				if err == nil {
+					configs = append(configs, nestedConfigs...)
+				}
 			} else if url, ok := firstMatch(line, `\s*url\s*=\s*(.*)\s*`); ok {
-				lastConfig.Url = url
+				configs[lastConfigIdx].Url = url
 			}
 		}
 	}

diff --git a/pkg/commands/git_commands/working_tree.go b/pkg/commands/git_commands/working_tree.go
@@ -342,7 +342,7 @@ func (self *WorkingTreeCommands) RemoveUntrackedFiles() error {
 
 // ResetAndClean removes all unstaged changes and removes all untracked files
 func (self *WorkingTreeCommands) ResetAndClean() error {
-	submoduleConfigs, err := self.submodule.GetConfigs()
+	submoduleConfigs, err := self.submodule.GetConfigs("", "")
 	if err != nil {
 		return err
 	}

diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go
@@ -413,7 +413,7 @@ func (self *RefreshHelper) refreshTags() error {
 }
 
 func (self *RefreshHelper) refreshStateSubmoduleConfigs() error {
-	configs, err := self.c.Git().Submodule.GetConfigs()
+	configs, err := self.c.Git().Submodule.GetConfigs("", "")
 	if err != nil {
 		return err
 	}