-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Compute git statuses using git executable, not libgit2
- Loading branch information
1 parent
44c50da
commit a541525
Showing
4 changed files
with
214 additions
and
243 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| use crate::repository::{GitFileStatus, RepoPath}; | ||
| use anyhow::{anyhow, Result}; | ||
| use std::{ | ||
| path::{Path, PathBuf}, | ||
| process::{Command, Stdio}, | ||
| sync::Arc, | ||
| }; | ||
|
|
||
| #[derive(Clone)] | ||
| pub struct GitStatus { | ||
| pub entries: Arc<[(RepoPath, GitFileStatus)]>, | ||
| } | ||
|
|
||
| impl GitStatus { | ||
| pub(crate) fn new( | ||
| git_binary: &Path, | ||
| working_directory: &Path, | ||
| mut path_prefix: &Path, | ||
| ) -> Result<Self> { | ||
| let mut child = Command::new(git_binary); | ||
|
|
||
| if path_prefix == Path::new("") { | ||
| path_prefix = Path::new("."); | ||
| } | ||
|
|
||
| child | ||
| .current_dir(working_directory) | ||
| .args([ | ||
| "--no-optional-locks", | ||
| "status", | ||
| "--porcelain=v1", | ||
| "--untracked-files=all", | ||
| "-z", | ||
| ]) | ||
| .arg(path_prefix) | ||
| .stdin(Stdio::null()) | ||
| .stdout(Stdio::piped()) | ||
| .stderr(Stdio::piped()); | ||
|
|
||
| #[cfg(windows)] | ||
| child.creation_flags(windows::Win32::System::Threading::CREATE_NO_WINDOW.0); | ||
|
|
||
| let child = child | ||
| .spawn() | ||
| .map_err(|e| anyhow!("Failed to start git status process: {}", e))?; | ||
|
|
||
| let output = child | ||
| .wait_with_output() | ||
| .map_err(|e| anyhow!("Failed to read git blame output: {}", e))?; | ||
|
|
||
| if !output.status.success() { | ||
| let stderr = String::from_utf8_lossy(&output.stderr); | ||
| return Err(anyhow!("git status process failed: {}", stderr)); | ||
| } | ||
|
|
||
| let stdout = String::from_utf8_lossy(&output.stdout); | ||
| let mut entries = stdout | ||
| .split('\0') | ||
| .filter_map(|entry| { | ||
| if entry.is_char_boundary(3) { | ||
| let (status, path) = entry.split_at(3); | ||
| let status = status.trim(); | ||
| Some(( | ||
| RepoPath(PathBuf::from(path)), | ||
| match status { | ||
| "A" | "??" => GitFileStatus::Added, | ||
| "M" => GitFileStatus::Modified, | ||
| _ => return None, | ||
| }, | ||
| )) | ||
| } else { | ||
| None | ||
| } | ||
| }) | ||
| .collect::<Vec<_>>(); | ||
| entries.sort_unstable_by(|a, b| a.0.cmp(&b.0)); | ||
| Ok(Self { | ||
| entries: entries.into(), | ||
| }) | ||
| } | ||
|
|
||
| pub fn get(&self, path: &Path) -> Option<GitFileStatus> { | ||
| self.entries | ||
| .binary_search_by(|(repo_path, _)| repo_path.0.as_path().cmp(path)) | ||
| .ok() | ||
| .map(|index| self.entries[index].1) | ||
| } | ||
| } | ||
|
|
||
| impl Default for GitStatus { | ||
| fn default() -> Self { | ||
| Self { | ||
| entries: Arc::new([]), | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.