Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2025-01-23 13:58:23 +00:00
Code Issues Projects Releases Wiki Activity

Only display Git column for directories with repos

Browse Source 
This fixes the previous commit.
This commit is contained in:
Benjamin Sago 2017-09-02 00:04:22 +01:00
parent 558b13880b
commit 9cda05df20
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fs/feature/git.rs
View File

@ -23,7 +23,7 @@ pub struct GitCache {
impl GitCache { impl GitCache {
pub fn has_anything_for(&self, index: &Path) -> bool { pub fn has_anything_for(&self, index: &Path) -> bool {
true self.repos.iter().any(|e| e.has_path(index))
} }
pub fn get(&self, index: &Path, prefix_lookup: bool) -> f::Git { pub fn get(&self, index: &Path, prefix_lookup: bool) -> f::Git {

3
src/output/details.rs
View File

@ -144,7 +144,8 @@ impl<'a> Render<'a> {
let mut rows = Vec::new(); let mut rows = Vec::new();
if let Some(ref table) = self.opts.table { if let Some(ref table) = self.opts.table {
if self.dir.is_none() { git = None } if self.dir.is_none() { git = None }
if let (Some(g), Some(d)) = (git, self.dir) { if !g.has_anything_for(&d.path) { git = None } }
let mut table = Table::new(&table, git, &self.colours); let mut table = Table::new(&table, git, &self.colours);
if self.opts.header { if self.opts.header {

1
src/output/grid_details.rs
View File

@ -169,6 +169,7 @@ impl<'a> Render<'a> {
fn make_table<'t>(&'a self, options: &'a TableOptions, mut git: Option<&'a GitCache>, drender: &DetailsRender) -> (Table<'a>, Vec<DetailsRow>) { fn make_table<'t>(&'a self, options: &'a TableOptions, mut git: Option<&'a GitCache>, drender: &DetailsRender) -> (Table<'a>, Vec<DetailsRow>) {
if self.dir.is_none() { git = None } if self.dir.is_none() { git = None }
if let (Some(g), Some(d)) = (git, self.dir) { if !g.has_anything_for(&d.path) { git = None } }
let mut table = Table::new(options, git, self.colours); let mut table = Table::new(options, git, self.colours);
let mut rows = Vec::new(); let mut rows = Vec::new();

3
xtests/run.sh
View File

@ -213,7 +213,8 @@ $exa $testcases/git/additions $testcases/git2/deeply \
$exa $testcases/git2/deeply/nested/directory $testcases/git/edits \ $exa $testcases/git2/deeply/nested/directory $testcases/git/edits \
$testcases/git2/target $testcases/git2/deeply $testcases/git --git --long | diff -q - $results/git_21221 || exit 1 $testcases/git2/target $testcases/git2/deeply $testcases/git --git --long | diff -q - $results/git_21221 || exit 1
$exa $testcases/files -l --git | diff -q - $results/files_l || exit 1 # no git status for dirs
COLUMNS=40 $exa $testcases/files -lG --git | diff -q - $results/files_lG_40 || exit 1 # that aren't under git
# Hidden files # Hidden files