Merge remote-tracking branch 'origin/dev'

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gitnu"
-version = "0.7.6"
+version = "0.7.7-alpha.2"
 authors = ["Nguyen Vu Khang <[email protected]>"]
 description = """
 gitnu indexes your git status so you can use numbers instead of filenames.
@@ -15,7 +15,6 @@ autotests = false
 edition = "2021"
 
 [dependencies]
-atty = "0.2.14"
 
 [[bin]]
 bench = false

src/cache.rs

@@ -4,10 +4,16 @@ use std::fs::File;
 use std::io::{BufRead, BufReader};
 use std::path::{Path, PathBuf};
 
-#[derive(Debug, Default)]
+#[derive(Debug)]
 pub struct Cache {
     prefix: Option<PathBuf>,
-    files: Vec<String>,
+    files: [String; MAX_CACHE_SIZE + 1],
+}
+
+impl Default for Cache {
+    fn default() -> Self {
+        Self { prefix: None, files: std::array::from_fn(|i| i.to_string()) }
+    }
 }
 
 impl Cache {
@@ -40,9 +46,10 @@ impl Cache {
             }
         };
 
-        let mut files = Vec::with_capacity(MAX_CACHE_SIZE);
-        files.push(0.to_string());
-        files.extend(lines.take(MAX_CACHE_SIZE - 1));
+        let files = std::array::from_fn(|i| match i {
+            0 => "0".to_string(),
+            i => lines.next().unwrap_or_else(|| i.to_string()),
+        });
 
         Ok(Self { prefix, files })
     }

src/main.rs

@@ -15,17 +15,13 @@ use prelude::*;
 use std::env::{args, current_dir};
 use std::path::PathBuf;
 use std::process::{Command, ExitCode, ExitStatus};
-use std::thread;
 
 /// Returning `Err` here means the failure comes from factors outside
 /// of `gitnu`. This means we should execute a full bypass to `git` to
 /// let it reflect the errors.
 fn prefetch(cwd: PathBuf) -> Result<(PathBuf, PathBuf, Aliases)> {
-    let h_git_dir = thread::spawn(move || git::dir(&cwd).map(|gd| (gd, cwd)));
-    let h_git_aliases = thread::spawn(git::aliases);
-
-    let (git_dir, cwd) = h_git_dir.join()??;
-    let git_aliases = h_git_aliases.join()?;
+    let git_dir = git::dir(&cwd)?;
+    let git_aliases = git::aliases();
     Ok((cwd, git_dir, git_aliases))
 }
 

src/parse.rs

@@ -1,4 +1,6 @@
 use std::collections::HashMap;
+#[cfg(not(test))]
+use std::io::IsTerminal;
 
 use crate::prelude::*;
 
@@ -29,7 +31,7 @@ pub fn parse<A: ArgHolder>(
     let mut git_cmd = None::<GitCommand>;
 
     #[cfg(not(test))]
-    if atty::is(atty::Stream::Stdout) {
+    if std::io::stdout().is_terminal() {
         argh.add_args(["-c", "color.ui=always"]);
     }
 

src/tests.rs

@@ -643,3 +643,14 @@ Untracked files:
 
 nothing added to commit but untracked files present\n"
 );
+
+test!(
+    max_cache_add_by_number,
+    |t| {
+        t.sh("", "git init -b main");
+        t.sh("", "touch A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 C0 C1 C2");
+        let _ = t.gitnu("", ["status"]);
+    },
+    ["add", "17-20"],
+    ["add", "B6", "B7", "B8", "B9"]
+);