Add status for subdirectories that are git repositories #797

alpn · 2021-01-31T16:51:10Z

This PR adds an optional Repo column, showing git information about repositories located directly under the currently searched path, as requested in #730 and #420.

Currently it piggybacks the —git flag (and works in conjunction with it)

modified: src/fs/fields.rs

modified: src/output/render/git.rs

modified: src/fs/feature/git.rs

…directories that are git repos (ogham#730) modified: src/options/view.rs modified: src/output/table.rs

modified: src/output/table.rs

modified: src/output/render/git.rs modified: src/output/table.rs

--no-default-features configuration modified: src/fs/feature/mod.rs modified: src/fs/fields.rs

modified: src/fs/feature/git.rs modified: src/fs/feature/mod.rs modified: src/fs/fields.rs modified: src/output/render/git.rs modified: src/output/table.rs

ariasuni · 2021-06-27T16:10:41Z

To be honest I don’t really care about this feature so it wasn’t in my priorities, but it looks very small and clean so I think I’d like to merge it.

However:

What’s X and V? These labels are not intuitive in my opinion
I wonder if it should be the same as --git or split into its own flag

Edit: also, could you fix the small conflict with master?

ariasuni · 2021-06-30T09:04:38Z

In fact I think it’s a cool feature if it works with git submodules. Do you think you could check that?

recent trend in the git ecosystem (see - https://github.com/github/renaming) modified: src/output/render/git.rs

alpn · 2021-06-30T09:33:24Z

Thanks for the feedback @ariasuni

The X and V labels indicate the status of the the entire repository as either dirty (e.g there are uncommitted changes) or clean (the equivalent of git status returning “nothing to commit, working tree clean“) respectively.
It's somewhat inspired by oh-my-zsh, and the screenshot that @YAMLcase provided in #730.
How would you suggest to make it more intuitive?

Submodules already get detected as repos in their own right, and as such, their status will be shown as well.

YAMLcase · 2021-06-30T12:33:19Z

How would you suggest to make it more intuitive?

One option:
Nothing or an underscore/dash for clean, 1-9 for number of changed files or lines. 9 would indicate "9 or more" like some badge systems that stick to a single digit.

alpn · 2021-07-22T12:00:54Z

Thanks @YAMLcase, but honestly I prefer to keep it simple and stick to an explicit binary indicator (i.e, either clear or dirty)
However, here’s another option inspired by your comment:

Do you find it more intuitive @ariasuni?

I too was debating about adding a separate flag vs piggybacking --git, but had eventually decided to go with the latter because:

Having used this feature myself for a few months now, I never felt like a special flag was missing.
It’s simpler, and requires less changes to the code base.

That being said, I’m open to adding it if you think it’s crucial.

Otherwise, I’ve fixed the conflicts with master so it’s should be mergeable now.

adamshand · 2021-08-02T20:08:11Z

I'd love to see this merged!

modified: src/output/render/git.rs

alpn · 2021-10-10T22:22:33Z

Up to date with upstream again.
@ariasuni please let me know if there’s anything else I could do to get it merged.

bew

For the branch name, you're showing only short branch names.
It's not uncommon to work with medium to long branch names like fix-for-this-long-feature-name, I fear the result would be a lot of blank spaces..
Would it be possible to add an option to limit the size of the displayed branch name ? (like 10 or 15 chars max)

src/fs/feature/git.rs

modified: src/fs/feature/git.rs

alpn · 2021-11-14T15:22:38Z

For the branch name, you're showing only short branch names. It's not uncommon to work with medium to long branch names like fix-for-this-long-feature-name, I fear the result would be a lot of blank spaces.. Would it be possible to add an option to limit the size of the displayed branch name ? (like 10 or 15 chars max)

Thanks @bew, good point!
Added “indicative” truncation when branch name exceeds 10 chars, so this:

Becomes this:

Also fixed the other issue.

arazabishov · 2022-05-13T12:41:03Z

This is awesome! Thank you for making this change. My 2 cents, assuming that git status is used to get branch/status info.

Some git repos are massive and running git status on them can be very slow. It would be great to have a flag or a config option to switch off the clean/dirty column.
With branch names we have several options that are faster than git status, such as git rev-parse --abbrev-ref HEAD.

ariasuni · 2022-05-13T15:06:21Z

Exa uses libgit2 directly (which is slow anyway…)…

roland-5 · 2022-05-16T13:51:27Z

Is there option to change from libgit2 to https://github.com/Byron/gitoxide ?

ariasuni · 2022-05-16T16:54:31Z

It’s not very clear to me if gitoxide has a way to get status info (not even talking about the fact it has to be either a crate, or the output of the gix command for status info has to have a porcelain mode), though it sounds promising.

arazabishov · 2022-10-04T09:07:59Z

What is left on this PR to get addressed before it can be merged?

…-repos and -—git-repos-no-status The latter skips git status lookup and thereby faster

alpn · 2022-10-09T21:12:35Z

Thanks for the feedback @arazabishov

I’ve just added two dedicated flags for this feature:

--git-repos - shows both the status, and the branch name (like in the screenshots above)
--git-repos-no-status - skips the status lookup altogether and is hence much faster, as expected :)

Running exa with --git-repos-no-status returns almost immediately, even for directories with lots of repos (including, e.g linux, and openbsd)

alpn · 2023-08-12T20:21:08Z

Fixed some minor conflicts, so it's gtg again.
Would still love to see this one merged in @ariasuni :)

ariasuni · 2023-09-09T00:12:51Z

Closing this, since exa is unmaintained (see #1243), and this has been merged in the active fork eza. Thanks!

alpn added 8 commits January 31, 2021 09:34

Add SubdirGitRepo and SubdirGitRepoStatus types (ogham#730)

d214daa

modified: src/fs/fields.rs

Add render() implementation for SubdirGitRepo (ogham#730)

d0470d3

modified: src/output/render/git.rs

Add SubdirGitRepo::from_path() (ogham#730)

f931eec

modified: src/fs/feature/git.rs

Add Columns a flag to determine whether or not to show status for sub…

b55fde4

…directories that are git repos (ogham#730) modified: src/options/view.rs modified: src/output/table.rs

Add SubdirGitRepoStatus variant to Columns (ogham#730)

22a1b29

modified: src/output/table.rs

Remove unused colours parameter from f::SubdirGitRepo::render()

c63455b

modified: src/output/render/git.rs modified: src/output/table.rs

Add a dummy SubdirGitRepo::from_path() implementation for

da3ce93

--no-default-features configuration modified: src/fs/feature/mod.rs modified: src/fs/fields.rs

Add git branch info to Repo column

f17cf3d

modified: src/fs/feature/git.rs modified: src/fs/feature/mod.rs modified: src/fs/fields.rs modified: src/output/render/git.rs modified: src/output/table.rs

alpn mentioned this pull request Mar 26, 2021

Feature Request: Show git branch, status for subdirectories that are git repos #730

Open

ariasuni added features › git Things to do with Git features › ui Things to do with the UI and removed features › git Things to do with Git features › ui Things to do with the UI labels Jun 22, 2021

Merge branch 'master' into master

778374e

Add "main" as an alternative name for default branch, in accordance with

5a35944

recent trend in the git ecosystem (see - https://github.com/github/renaming) modified: src/output/render/git.rs

alpn added 3 commits October 6, 2021 08:44

Merge branch 'master' of https://github.com/ogham/exa

87eb5ed

Merge branch 'master' of https://github.com/ogham/exa

4504da0

Modify git repo clean/dirty indicators

d5381b3

modified: src/output/render/git.rs

Merge branch 'ogham:master' into master

d9e2003

bew reviewed Nov 13, 2021

View reviewed changes

src/fs/feature/git.rs Outdated Show resolved Hide resolved

alpn added 2 commits November 14, 2021 08:45

Optimize status lookup of subdir git repos

4510551

modified: src/fs/feature/git.rs

Add indicative truncation for long branch names

881c61e

modified: src/fs/feature/git.rs

alpn added 5 commits December 5, 2021 12:14

Merge branch 'ogham:master' into master

bc5b457

Merge branch 'ogham:master' into master

36159b3

Merge branch 'ogham:master' into master

a090985

Merge branch 'ogham:master' into master

b8ecd67

Merge branch 'ogham:master' into master

2f1f30e

alpn added 2 commits October 8, 2022 14:55

Merge branch 'ogham:master' into master

33cef20

Add dedicated flags for displaying sub-directory git repo info, -—git…

7703560

…-repos and -—git-repos-no-status The latter skips git status lookup and thereby faster

Fix interface for #[cfg(not(feature = "git"))] mode

ff0dd7f

cafkafk mentioned this pull request Jul 29, 2023

(exa PR) 797: Add status for subdirectories that are git repositories eza-community/eza#62

Merged

This was referenced Jul 29, 2023

All the open pulls from exa syphar/zetta#11

Open

All the exa issues eza-community/eza#65

Closed

Merge branch 'master' into master

3969725

ariasuni force-pushed the master branch from 36c003b to fb05c42 Compare September 5, 2023 23:14

ariasuni closed this Sep 9, 2023

cafkafk mentioned this pull request Sep 12, 2023

feat: document and change output for --git-repos eza-community/eza#283

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add status for subdirectories that are git repositories #797

Add status for subdirectories that are git repositories #797

alpn commented Jan 31, 2021 •

edited

Loading

ariasuni commented Jun 27, 2021 •

edited

Loading

ariasuni commented Jun 30, 2021 •

edited

Loading

alpn commented Jun 30, 2021 •

edited

Loading

YAMLcase commented Jun 30, 2021

alpn commented Jul 22, 2021

adamshand commented Aug 2, 2021

alpn commented Oct 10, 2021

bew left a comment

alpn commented Nov 14, 2021 •

edited

Loading

arazabishov commented May 13, 2022

ariasuni commented May 13, 2022

roland-5 commented May 16, 2022

ariasuni commented May 16, 2022

arazabishov commented Oct 4, 2022

alpn commented Oct 9, 2022

alpn commented Aug 12, 2023

ariasuni commented Sep 9, 2023

Add status for subdirectories that are git repositories #797

Add status for subdirectories that are git repositories #797

Conversation

alpn commented Jan 31, 2021 • edited Loading

ariasuni commented Jun 27, 2021 • edited Loading

ariasuni commented Jun 30, 2021 • edited Loading

alpn commented Jun 30, 2021 • edited Loading

YAMLcase commented Jun 30, 2021

alpn commented Jul 22, 2021

adamshand commented Aug 2, 2021

alpn commented Oct 10, 2021

bew left a comment

Choose a reason for hiding this comment

alpn commented Nov 14, 2021 • edited Loading

arazabishov commented May 13, 2022

ariasuni commented May 13, 2022

roland-5 commented May 16, 2022

ariasuni commented May 16, 2022

arazabishov commented Oct 4, 2022

alpn commented Oct 9, 2022

alpn commented Aug 12, 2023

ariasuni commented Sep 9, 2023

alpn commented Jan 31, 2021 •

edited

Loading

ariasuni commented Jun 27, 2021 •

edited

Loading

ariasuni commented Jun 30, 2021 •

edited

Loading

alpn commented Jun 30, 2021 •

edited

Loading

alpn commented Nov 14, 2021 •

edited

Loading