Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-06-11 19:52:22 +00:00
Code Issues Projects Releases Wiki Activity

Implement Git status for directories

Browse Source
This commit is contained in:
Ben S 2015-01-28 10:43:19 +00:00
parent f6cbfc7276
commit f794f5eda6
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/dir.rs
View File

@ -60,10 +60,11 @@ impl Dir {
}
/// Get a string describing the Git status of the given file.
pub fn git_status(&self, path: &Path) -> String {
match self.git {
Some(ref git) => git.status(path),
None => GREY.paint("--").to_string(),
pub fn git_status(&self, path: &Path, prefix_lookup: bool) -> String {
match (&self.git, prefix_lookup) {
(&Some(ref git), false) => git.status(path),
(&Some(ref git), true) => git.dir_status(path),
(&None, _) => GREY.paint("--").to_string(),
}
}
}
@ -88,12 +89,27 @@ impl Git {
/// Get the status for the file at the given path, if present.
fn status(&self, path: &Path) -> String {
match self.statuses.iter().find(|&&(ref p, _)| path.as_str().unwrap() == p.as_slice()) {
let status = self.statuses.iter()
.find(|p| p.0 == path.as_str().unwrap());
match status {
Some(&(_, s)) => format!("{}{}", Git::index_status(s), Git::working_tree_status(s)),
None => GREY.paint("--").to_string(),
}
}
/// Get the combined status for all the files whose paths begin with the
/// path that gets passed in. This is used for getting the status of
/// directories, which don't really have an 'official' status.
fn dir_status(&self, dir: &Path) -> String {
let status = self.statuses.iter()
.filter(|p| p.0.starts_with(dir.as_str().unwrap()))
.fold(git2::Status::empty(), |a, b| a | b.1);
match status {
s => format!("{}{}", Git::index_status(s), Git::working_tree_status(s)),
}
}
/// The character to display if the file has been modified, but not staged.
fn working_tree_status(status: git2::Status) -> ANSIString<'static> {
match status {

6
src/file.rs
View File

@ -372,7 +372,11 @@ impl<'a> File<'a> {
}
fn git_status(&self) -> Cell {
let status = self.dir.map(|d| d.git_status(&self.path)).unwrap_or("NO".to_string());
let status = match self.dir {
Some(d) => d.git_status(&self.path, self.stat.kind == io::FileType::Directory),
None => GREY.paint("--").to_string(),
};
Cell { text: status, length: 2 }
}
}