refactor: update GitStatus to use untracked over new

Author: samcal

src/fs/feature/git.rs

@@ -368,7 +368,7 @@ fn reorient(path: &Path) -> PathBuf {
 fn working_tree_status(status: git2::Status) -> f::GitStatus {
     #[rustfmt::skip]
     return match status {
-        s if s.contains(git2::Status::WT_NEW)         => f::GitStatus::New,
+        s if s.contains(git2::Status::WT_NEW)         => f::GitStatus::Untracked,
         s if s.contains(git2::Status::WT_MODIFIED)    => f::GitStatus::Modified,
         s if s.contains(git2::Status::WT_DELETED)     => f::GitStatus::Deleted,
         s if s.contains(git2::Status::WT_RENAMED)     => f::GitStatus::Renamed,
@@ -384,7 +384,7 @@ fn working_tree_status(status: git2::Status) -> f::GitStatus {
 fn index_status(status: git2::Status) -> f::GitStatus {
     #[rustfmt::skip]
     return match status {
-        s if s.contains(git2::Status::INDEX_NEW)         => f::GitStatus::New,
+        s if s.contains(git2::Status::INDEX_NEW)         => f::GitStatus::Untracked,
         s if s.contains(git2::Status::INDEX_MODIFIED)    => f::GitStatus::Modified,
         s if s.contains(git2::Status::INDEX_DELETED)     => f::GitStatus::Deleted,
         s if s.contains(git2::Status::INDEX_RENAMED)     => f::GitStatus::Renamed,

src/fs/fields.rs

@@ -223,7 +223,7 @@ pub enum GitStatus {
 
     /// This file didn’t exist for the last commit, and is not specified in
     /// the ignored files list.
-    New,
+    Untracked,
 
     /// A file that’s been modified since the last commit.
     Modified,

src/output/render/git.rs

@@ -23,7 +23,7 @@ impl f::GitStatus {
         #[rustfmt::skip]
         return match self {
             Self::NotModified  => colours.not_modified().paint("-"),
-            Self::New          => colours.untracked().paint("N"),
+            Self::Untracked     => colours.untracked().paint("N"),
             Self::Modified     => colours.modified().paint("M"),
             Self::Deleted      => colours.deleted().paint("D"),
             Self::Renamed      => colours.renamed().paint("R"),
@@ -148,7 +148,7 @@ pub mod test {
     #[test]
     fn git_new_changed() {
         let stati = f::Git {
-            staged: f::GitStatus::New,
+            staged: f::GitStatus::Untracked,
             unstaged: f::GitStatus::Modified,
         };