feat: untrack files (#146)

Author: Spiegie

README.md

@@ -22,6 +22,7 @@ https://github.com/Cretezy/lazyjj/assets/2672503/b5e6b4f1-ebdb-448f-af9e-361e86f
   - See a change's files from the log tab with `Enter`
   - View conflicts list in current change
   - Toggle between color words and git diff with `w`
+  - Untrack file with `x`
 - Bookmarks
   - View list of bookmarks, including from all remotes with `a`
   - Create with `c`, rename with `r`, delete with `d`, forget with `f`

src/commander/files.rs

@@ -159,6 +159,30 @@ impl Commander {
 
         self.execute_jj_command(args, true, true).map(Some)
     }
+
+    #[instrument(level = "trace", skip(self))]
+    pub fn untrack_file(&self, current_file: &File) -> Result<Option<String>, CommandError> {
+        let Some(path) = current_file.path.as_ref() else {
+            return Ok(None);
+        };
+
+        let path = if let Some(DiffType::Renamed) = current_file.diff_type
+            && let Some(captures) = RENAME_REGEX.captures(path)
+        {
+            match captures.get(2) {
+                Some(path) => path.as_str(),
+                None => return Ok(None),
+            }
+        } else {
+            path
+        };
+
+        Ok(Some(self.execute_jj_command(
+            vec!["file", "untrack", path],
+            false,
+            true,
+        )?))
+    }
 }
 
 #[cfg(test)]

src/ui/files_tab.rs

@@ -1,3 +1,5 @@
+use std::vec;
+
 use anyhow::Result;
 use tracing::instrument;
 
@@ -11,7 +13,7 @@ use crate::{
     env::{Config, DiffFormat},
     ui::{
         Component, ComponentAction, details_panel::DetailsPanel, help_popup::HelpPopup,
-        utils::tabs_to_spaces,
+        message_popup::MessagePopup, utils::tabs_to_spaces,
     },
 };
 
@@ -143,6 +145,14 @@ impl FilesTab {
         Ok(())
     }
 
+    pub fn untrack_file(&mut self, commander: &mut Commander) -> Result<()> {
+        self.file
+            .as_ref()
+            .map(|current_file| commander.untrack_file(current_file))
+            .transpose()?;
+        Ok(())
+    }
+
     fn scroll_files(&mut self, commander: &mut Commander, scroll: isize) -> Result<()> {
         if let Ok(files) = self.files_output.as_ref() {
             let current_file_index = self.get_current_file_index();
@@ -318,6 +328,19 @@ impl Component for FilesTab {
                     self.diff_format = self.diff_format.get_next(self.config.diff_tool());
                     self.refresh_diff(commander)?;
                 }
+                KeyCode::Char('x') => {
+                    // this works even for deleted files because jj doesn't return error in that case
+                    if self.untrack_file(commander).is_err() {
+                        return Ok(ComponentInputResult::HandledAction(
+                            ComponentAction::SetPopup(Some(Box::new(MessagePopup {
+                                title: "Can't untrack file".into(),
+                                messages: "Make sure that file is ignored".into(),
+                                text_align: None,
+                            }))),
+                        ));
+                    }
+                    self.set_head(commander, &commander.get_current_head()?)?;
+                }
                 KeyCode::Char('R') | KeyCode::F(5) => {
                     self.head = commander.get_head_latest(&self.head)?;
                     self.refresh_files(commander)?;
@@ -333,6 +356,7 @@ impl Component for FilesTab {
                             vec![
                                 ("j/k".to_owned(), "scroll down/up".to_owned()),
                                 ("J/K".to_owned(), "scroll down by ½ page".to_owned()),
+                                ("x".to_owned(), "untrack file".to_owned()),
                                 ("@".to_owned(), "view current change files".to_owned()),
                             ],
                             vec![