summaryrefslogtreecommitdiffstats
path: root/src/dir.rs
diff options
context:
space:
mode:
authorBen S <ogham@bsago.me>2015-01-27 15:01:17 +0000
committerBen S <ogham@bsago.me>2015-01-27 15:01:17 +0000
commit90d4684de4d64fadcd4025c2c86e5c82857f6cd0 (patch)
tree3b47fc1594bf17cd096b0d94101ce9e20c5fc132 /src/dir.rs
parente835fe8fe352751e6ca03c1edf31705c3abe61f4 (diff)
Preliminary Git support!
This is something that I've long wanted to add. It uses libgit2 as an optional dependency.
Diffstat (limited to 'src/dir.rs')
-rw-r--r--src/dir.rs83
1 files changed, 82 insertions, 1 deletions
diff --git a/src/dir.rs b/src/dir.rs
index 0f50224..29f4106 100644
--- a/src/dir.rs
+++ b/src/dir.rs
@@ -1,5 +1,9 @@
use std::io::{fs, IoResult};
-use file::File;
+use file::{File, GREY};
+
+#[cfg(feature="git")] use ansi_term::ANSIString;
+#[cfg(feature="git")] use ansi_term::Colour::*;
+#[cfg(feature="git")] use git2;
/// A **Dir** provides a cached list of the file paths in a directory that's
/// being listed.
@@ -10,6 +14,7 @@ use file::File;
pub struct Dir {
contents: Vec<Path>,
path: Path,
+ git: Option<Git>,
}
impl Dir {
@@ -20,6 +25,7 @@ impl Dir {
fs::readdir(&path).map(|paths| Dir {
contents: paths,
path: path.clone(),
+ git: Git::new(&path).ok(),
})
}
@@ -47,4 +53,79 @@ impl Dir {
pub fn join(&self, child: Path) -> Path {
self.path.join(child)
}
+
+ /// Return whether there's a Git repository on or above this directory.
+ pub fn has_git_repo(&self) -> bool {
+ self.git.is_some()
+ }
+
+ /// 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(),
+ }
+ }
+}
+
+#[cfg(feature="git")]
+struct Git {
+ statuses: Vec<(String, git2::Status)>,
+}
+
+#[cfg(feature="git")]
+impl Git {
+ fn new(path: &Path) -> Result<Git, git2::Error> {
+ let repo = try!(git2::Repository::discover(path));
+ let statuses = try!(repo.statuses(None));
+
+ Ok(Git { statuses: statuses.iter().map(|e| (e.path().unwrap().to_string(), e.status())).collect() })
+ }
+
+ /// 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()) {
+ Some(&(_, s)) => format!("{}{}", Git::index_status(s), Git::working_tree_status(s)),
+ None => GREY.paint("--").to_string(),
+ }
+ }
+
+ /// The character to display if the file has been modified, but not staged.
+ fn working_tree_status(status: git2::Status) -> ANSIString<'static> {
+ match status {
+ s if s.contains(git2::STATUS_WT_NEW) => Green.paint("A"),
+ s if s.contains(git2::STATUS_WT_MODIFIED) => Blue.paint("M"),
+ s if s.contains(git2::STATUS_WT_DELETED) => Red.paint("D"),
+ s if s.contains(git2::STATUS_WT_RENAMED) => Yellow.paint("R"),
+ s if s.contains(git2::STATUS_WT_TYPECHANGE) => Purple.paint("T"),
+ _ => GREY.paint("-"),
+ }
+ }
+
+ /// The character to display if the file has been modified, and the change
+ /// has been staged.
+ fn index_status(status: git2::Status) -> ANSIString<'static> {
+ match status {
+ s if s.contains(git2::STATUS_INDEX_NEW) => Green.paint("A"),
+ s if s.contains(git2::STATUS_INDEX_MODIFIED) => Blue.paint("M"),
+ s if s.contains(git2::STATUS_INDEX_DELETED) => Red.paint("D"),
+ s if s.contains(git2::STATUS_INDEX_RENAMED) => Yellow.paint("R"),
+ s if s.contains(git2::STATUS_INDEX_TYPECHANGE) => Purple.paint("T"),
+ _ => GREY.paint("-"),
+ }
+ }
+}
+
+#[cfg(not(feature="git"))]
+struct Git;
+
+#[cfg(not(feature="git"))]
+impl Git {
+ fn new(_: &Path) -> Result<Git, ()> {
+ Err(())
+ }
+
+ fn status(&self, _: &Path) -> String {
+ panic!("Tried to access a Git repo without Git support!");
+ }
}