summaryrefslogtreecommitdiffstats
path: root/src/feature
diff options
context:
space:
mode:
authorBen S <ogham@bsago.me>2015-05-10 18:03:15 +0100
committerBen S <ogham@bsago.me>2015-05-10 18:03:15 +0100
commitc6d8c21e805adee457d0fdce3e8b04e184f7a3f8 (patch)
tree70184d57b8efd1f793ecf5834a7fa2b2c3841e1b /src/feature
parentd9319c48b427881a197d96a15b941534646f42ac (diff)
Finally, do the same for the Git column.
Diffstat (limited to 'src/feature')
-rw-r--r--src/feature/git.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/feature/git.rs b/src/feature/git.rs
index 03e6a5d..db9cc0e 100644
--- a/src/feature/git.rs
+++ b/src/feature/git.rs
@@ -4,7 +4,6 @@ use ansi_term::{ANSIString, ANSIStrings};
use git2;
use colours::Colours;
-use file::GREY;
/// Container of Git statuses for all the files in this folder's Git repository.
pub struct Git {
@@ -35,7 +34,7 @@ impl Git {
.find(|p| p.0.as_path() == path);
match status {
Some(&(_, s)) => ANSIStrings( &[Git::index_status(c, s), Git::working_tree_status(c, s) ]).to_string(),
- None => GREY.paint("--").to_string(),
+ None => c.punctuation.paint("--").to_string(),
}
}
@@ -58,7 +57,7 @@ impl Git {
s if s.contains(git2::STATUS_WT_DELETED) => colours.git.deleted.paint("D"),
s if s.contains(git2::STATUS_WT_RENAMED) => colours.git.renamed.paint("R"),
s if s.contains(git2::STATUS_WT_TYPECHANGE) => colours.git.typechange.paint("T"),
- _ => GREY.paint("-"),
+ _ => colours.punctuation.paint("-"),
}
}
@@ -71,7 +70,7 @@ impl Git {
s if s.contains(git2::STATUS_INDEX_DELETED) => colours.git.deleted.paint("D"),
s if s.contains(git2::STATUS_INDEX_RENAMED) => colours.git.renamed.paint("R"),
s if s.contains(git2::STATUS_INDEX_TYPECHANGE) => colours.git.typechange.paint("T"),
- _ => GREY.paint("-"),
+ _ => colours.punctuation.paint("-"),
}
}
}