Merge branch 'wt/pull-submodules'

Author: affromero

src/action.rs

@@ -41,6 +41,7 @@ pub(crate) enum Action {
     GitPush(usize),
     GitPull(usize),
     GitPullRebase(usize),
+    GitPullSubmodules(usize),
     GitOpComplete {
         index: usize,
         message: String,

src/app.rs

@@ -509,14 +509,14 @@ impl App {
                         self.git_graph.set_error(msg.clone());
                     }
                     Action::ShowContextMenu { index, row, col } => {
-                        let (ahead, behind) = self
+                        let (ahead, behind, has_submodules) = self
                             .repo_list
                             .repos
                             .get(index)
                             .and_then(|e| e.status.as_ref())
-                            .map(|s| (s.ahead, s.behind))
-                            .unwrap_or((0, 0));
-                        self.context_menu.show(index, col, row, ahead, behind);
+                            .map(|s| (s.ahead, s.behind, s.has_submodules))
+                            .unwrap_or((0, 0, false));
+                        self.context_menu.show(index, col, row, ahead, behind, has_submodules);
                     }
                     Action::HideContextMenu => {
                         self.context_menu.hide();
@@ -530,7 +530,7 @@ impl App {
                             let _ = std::io::stdout().flush();
                         }
                     }
-                    Action::GitPush(idx) | Action::GitPull(idx) | Action::GitPullRebase(idx) => {
+                    Action::GitPush(idx) | Action::GitPull(idx) | Action::GitPullRebase(idx) | Action::GitPullSubmodules(idx) => {
                         if let Some(entry) = self.repo_list.repos.get_mut(idx) {
                             let branch = entry
                                 .status
@@ -543,6 +543,9 @@ impl App {
                                 Action::GitPullRebase(_) => {
                                     vec!["pull".into(), "--rebase".into()]
                                 }
+                                Action::GitPullSubmodules(_) => {
+                                    vec!["pull".into(), "--recurse-submodules".into()]
+                                }
                                 _ => unreachable!(),
                             };
                             // Add origin <branch> so pull/push works even without upstream config

src/components/context_menu.rs

@@ -20,6 +20,7 @@ enum MenuAction {
     Push,
     Pull,
     PullRebase,
+    PullSubmodules,
 }
 
 struct MenuItem {
@@ -50,7 +51,7 @@ impl ContextMenu {
         }
     }
 
-    pub fn show(&mut self, repo_index: usize, col: u16, row: u16, ahead: usize, behind: usize) {
+    pub fn show(&mut self, repo_index: usize, col: u16, row: u16, ahead: usize, behind: usize, has_submodules: bool) {
         self.visible = true;
         self.repo_index = repo_index;
         self.position = (col, row);
@@ -90,6 +91,13 @@ impl ContextMenu {
             },
         ];
 
+        if has_submodules {
+            self.items.push(MenuItem {
+                label: "Pull --recurse-subs".into(),
+                action: MenuAction::PullSubmodules,
+            });
+        }
+
         self.state.select(Some(0));
     }
 
@@ -142,6 +150,7 @@ impl ContextMenu {
             MenuAction::Push => Action::GitPush(self.repo_index),
             MenuAction::Pull => Action::GitPull(self.repo_index),
             MenuAction::PullRebase => Action::GitPullRebase(self.repo_index),
+            MenuAction::PullSubmodules => Action::GitPullSubmodules(self.repo_index),
         };
         self.hide();
         Some(action)
@@ -232,7 +241,7 @@ impl Component for ContextMenu {
             .map(|item| {
                 let style = match item.action {
                     MenuAction::Push => Style::default().fg(Color::Green),
-                    MenuAction::Pull | MenuAction::PullRebase => Style::default().fg(Color::Yellow),
+                    MenuAction::Pull | MenuAction::PullRebase | MenuAction::PullSubmodules => Style::default().fg(Color::Yellow),
                     _ => Style::default(),
                 };
                 ListItem::new(Line::from(Span::styled(&item.label, style)))

src/components/repo_list.rs

@@ -126,6 +126,7 @@ impl RepoList {
                             behind: 0,
                             is_dirty: false,
                             worktrees: 0,
+                            has_submodules: false,
                         },
                     });
                 }

src/git/status.rs

@@ -10,6 +10,8 @@ pub(crate) struct RepoStatus {
     pub is_dirty: bool,
     /// Number of linked worktrees (excludes the main working tree)
     pub worktrees: usize,
+    /// True when .gitmodules exists (repo uses submodules)
+    pub has_submodules: bool,
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -110,13 +112,17 @@ fn query_status_inner(path: &Path, fetch: bool) -> color_eyre::Result<RepoStatus
     // Count linked worktrees (excludes the main working tree)
     let worktrees = repo.worktrees().map(|wt| wt.len()).unwrap_or(0);
 
+    // Detect submodules by checking for .gitmodules
+    let has_submodules = path.join(".gitmodules").is_file();
+
     Ok(RepoStatus {
         branch,
         files,
         ahead,
         behind,
         is_dirty,
         worktrees,
+        has_submodules,
     })
 }