From 6c894706d46bd2c25e45715a592c85c05a8534c8 Mon Sep 17 00:00:00 2001 From: PThorpe92 Date: Tue, 12 Sep 2023 09:55:29 -0400 Subject: [PATCH 1/4] feat: document and change output for --git-repos --- man/eza.1.md | 2 +- src/output/render/git.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/eza.1.md b/man/eza.1.md index 26db56c8b..b7ee90026 100644 --- a/man/eza.1.md +++ b/man/eza.1.md @@ -200,7 +200,7 @@ These options are available when running with `--long` (`-l`): This adds a two-character column indicating the staged and unstaged statuses respectively. The status character can be ‘`-`’ for not modified, ‘`M`’ for a modified file, ‘`N`’ for a new file, ‘`D`’ for deleted, ‘`R`’ for renamed, ‘`T`’ for type-change, ‘`I`’ for ignored, and ‘`U`’ for conflicted. -Directories will be shown to have the status of their contents, which is how ‘deleted’ is possible: if a directory contains a file that has a certain status, it will be shown to have that status. +Directories will be shown to have the status of their contents, which is how ‘deleted’ is possible: if a directory contains a file that has a certain status, it will be shown to have that status. Symbols shown are `|` (green) for clean, `+` (red) for dirty, and `-`(green) for unknown. `--no-git` : Don't show Git status (always overrides `--git`, `--git-repos`, `--git-repos-no-status`) diff --git a/src/output/render/git.rs b/src/output/render/git.rs index d479be3bc..603f608c6 100644 --- a/src/output/render/git.rs +++ b/src/output/render/git.rs @@ -31,8 +31,8 @@ impl f::SubdirGitRepo { let s = match self.status { f::SubdirGitRepoStatus::NoRepo => style.paint("- "), f::SubdirGitRepoStatus::GitClean => style.fg(Color::Green).paint("| "), - f::SubdirGitRepoStatus::GitDirty => style.bold().fg(Color::Red).paint("- "), - f::SubdirGitRepoStatus::GitUnknown => style.paint("- "), + f::SubdirGitRepoStatus::GitDirty => style.bold().fg(Color::Red).paint("+ "), + f::SubdirGitRepoStatus::GitUnknown => style.fg(Color::Green).bold().paint("- "), }; TextCell { From 759ad06cc096c9d3838134ba7db62704164abf6f Mon Sep 17 00:00:00 2001 From: PThorpe92 Date: Tue, 12 Sep 2023 13:26:16 -0400 Subject: [PATCH 2/4] docs: add better explanation of git repos + no status --- man/eza.1.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/man/eza.1.md b/man/eza.1.md index dc985e028..343051396 100644 --- a/man/eza.1.md +++ b/man/eza.1.md @@ -197,16 +197,16 @@ These options are available when running with `--long` (`-l`): `--git` [if eza was built with git support] : List each file’s Git status, if tracked. +This adds a two-character column indicating the staged and unstaged statuses respectively. The status character can be ‘`-`’ for not modified, ‘`M`’ for a modified file, ‘`N`’ for a new file, ‘`D`’ for deleted, ‘`R`’ for renamed, ‘`T`’ for type-change, ‘`I`’ for ignored, and ‘`U`’ for conflicted. :Directories will be shown to have the status of their contents, which is how ‘deleted’ is possible if a directory contains a file that has a certain status, it will be shown to have that status. `--git-repos` [if eza was built with git support] : List each directory’s Git status, if tracked. +Symbols shown are `|` (green) for clean, `+` (red) for dirty, and `-`(green) for unknown. `--git-repos-no-status` [if eza was built with git support] : List if a directory is a Git repository, but not its status. +All Git repository directories will be shown as `-` (green) without status indicated. -This adds a two-character column indicating the staged and unstaged statuses respectively. The status character can be ‘`-`’ for not modified, ‘`M`’ for a modified file, ‘`N`’ for a new file, ‘`D`’ for deleted, ‘`R`’ for renamed, ‘`T`’ for type-change, ‘`I`’ for ignored, and ‘`U`’ for conflicted. - -Directories will be shown to have the status of their contents, which is how ‘deleted’ is possible: if a directory contains a file that has a certain status, it will be shown to have that status. Symbols shown are `|` (green) for clean, `+` (red) for dirty, and `-`(green) for unknown. `--no-git` : Don't show Git status (always overrides `--git`, `--git-repos`, `--git-repos-no-status`) From 08b92a06c57289b3e16320ee5301b897fb660ac3 Mon Sep 17 00:00:00 2001 From: PThorpe92 Date: Thu, 14 Sep 2023 11:00:57 -0400 Subject: [PATCH 3/4] docs: remove color specifications. change unknown git repo status to `~` --- man/eza.1.md | 2 +- src/output/render/git.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/eza.1.md b/man/eza.1.md index 343051396..d2d61e72b 100644 --- a/man/eza.1.md +++ b/man/eza.1.md @@ -201,7 +201,7 @@ This adds a two-character column indicating the staged and unstaged statuses res `--git-repos` [if eza was built with git support] : List each directory’s Git status, if tracked. -Symbols shown are `|` (green) for clean, `+` (red) for dirty, and `-`(green) for unknown. +Symbols shown are `|`= clean, `+`= dirty, and `~`= for unknown. `--git-repos-no-status` [if eza was built with git support] : List if a directory is a Git repository, but not its status. diff --git a/src/output/render/git.rs b/src/output/render/git.rs index 603f608c6..34befa6bf 100644 --- a/src/output/render/git.rs +++ b/src/output/render/git.rs @@ -32,7 +32,7 @@ impl f::SubdirGitRepo { f::SubdirGitRepoStatus::NoRepo => style.paint("- "), f::SubdirGitRepoStatus::GitClean => style.fg(Color::Green).paint("| "), f::SubdirGitRepoStatus::GitDirty => style.bold().fg(Color::Red).paint("+ "), - f::SubdirGitRepoStatus::GitUnknown => style.fg(Color::Green).bold().paint("- "), + f::SubdirGitRepoStatus::GitUnknown => style.fg(Color::Green).bold().paint("~ "), }; TextCell { From 3f1e5ef4eac431339bad34b8e007590de1775f94 Mon Sep 17 00:00:00 2001 From: PThorpe92 Date: Thu, 14 Sep 2023 11:02:30 -0400 Subject: [PATCH 4/4] docs: fix missing color specification from man page --- man/eza.1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/eza.1.md b/man/eza.1.md index d2d61e72b..abf758953 100644 --- a/man/eza.1.md +++ b/man/eza.1.md @@ -205,7 +205,7 @@ Symbols shown are `|`= clean, `+`= dirty, and `~`= for unknown. `--git-repos-no-status` [if eza was built with git support] : List if a directory is a Git repository, but not its status. -All Git repository directories will be shown as `-` (green) without status indicated. +All Git repository directories will be shown as (themed) `-` without status indicated. `--no-git`