Git integration (issue #7) #495

hpwxf · 2021-03-07T22:23:16Z

Add git integration (cf issue #7)

Use git2-rs to get git info. Unfortunately, it is not available on all targets. To enable it, use cargo build --features=git.
In travis config, this feature is enabled using a new FEATURES environment variable (where it is not set, git2-rs does not compile; cf https://travis-ci.com/github/hpwxf/lsd/builds/219208311).
git_stub.rs file contains a minimal set of empty/disabled features to minimize condition compilation in other files.

New git block is located by default on the left of name block and its location can be set using --blocks option
Use lsd --git --long to enable git status info (only available on long display)
Additional feature: sort by git status using lsd --sort=git --long
Default display use icons. Text display is also available.

NB: crate `log` has also been defined in Cargo.toml to provide debug feature. `release_max_level_error` feature disables log macros in release mode.

Use cargo fmt
Add necessary tests
Add changelog entry

codecov-io · 2021-03-07T22:25:59Z

Codecov Report

Merging #495 (c7baca2) into master (7254816) will increase coverage by 0.27%.
The diff coverage is 85.95%.

@@            Coverage Diff             @@
##           master     #495      +/-   ##
==========================================
+ Coverage   88.48%   88.76%   +0.27%     
==========================================
  Files          36       40       +4     
  Lines        3535     3951     +416     
==========================================
+ Hits         3128     3507     +379     
- Misses        407      444      +37

Impacted Files	Coverage Δ
src/config_file.rs	`69.23% <ø> (ø)`
src/core.rs	`0.00% <0.00%> (ø)`
src/flags.rs	`100.00% <ø> (ø)`
src/git_stub.rs	`0.00% <0.00%> (ø)`
src/main.rs	`10.00% <ø> (ø)`
src/sort.rs	`96.02% <0.00%> (-1.95%)`	⬇️
src/meta/git_file_status.rs	`25.00% <25.00%> (ø)`
src/icon.rs	`97.05% <33.33%> (-0.57%)`	⬇️
src/meta/mod.rs	`41.66% <62.50%> (+2.19%)`	⬆️
src/color.rs	`78.94% <79.59%> (+0.30%)`	⬆️
... and 13 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7254816...c7baca2. Read the comment docs.

hpwxf · 2021-03-09T19:40:18Z

I found a bug when I use options -a, -l and --git together. Processing of . and .. directories do something strange which breaks the layout. I will fix it (and ok with -Al --git)

hpwxf · 2021-03-23T17:34:25Z

Since git2 has inconsistent behaviors on

arm-unknown-linux-gnueabihf
i686-pc-windows-msvc
x86_64-pc-windows-gnu
x86_64-pc-windows-msvc
and a compilation error on
i686-pc-windows-gnu
I will investigate what happens in git2.

* Enabled using `cargo build --feature=git` * git block is by default on the left of name block * use `lsd --git --long` to enable git status info (only available on long display) * sort by git status using `lsd --sort=git --long`

Test enum completeness in color map using enum iteration from strum macros

Parent directory git status will not fetch another parent repository if different of the current one.

…r git2-rs

color::tests::test_elem_map_completeness verify the consistency between between Elem value and theme. Elem::TreeEdge could be re-enabled when its theme will ok.

hpwxf · 2021-04-03T20:44:32Z

Since git2-rs requires rust 1.45, I had to upgrade RUST_MIN_SRV to 1.45
Using a complex conditional compilation, git feature is always enabled except on
- arm-unknown-linux-gnueabihf (tests fail in git2-rs)
- i686-pc-windows-gnu (compilation fails in git2-rs)
new tests have been done to improve overall coverage (not only in new code for git feature)

hpwxf · 2021-04-03T21:05:31Z

NB: to support conditional compilation, I used a stub file (git_stub.rs) to provide minimal objects to avoid function signature to change or to be also conditional. This technique could reduce the patch coverage since only one version is covered by tests.

meain · 2021-04-20T05:20:25Z

Hey, sorry about the delay. I have been pretty busy the past few weeks. Will try to get this reviewed by this week.

gwennlbh · 2021-07-19T20:11:19Z

If I may give feedback, I've been using this branch on my machine for more than a week and found no issues whatsoever.

BrandonStaab · 2021-11-11T04:13:05Z

There is inconsistent behavior when listing outside of a repo vs inside a repo as compared with the yellow squares. Similarly using --tree outside of a repo doesn't display status.

hpwxf · 2021-11-11T19:54:17Z

There is inconsistent behavior when listing outside of a repo vs inside a repo as compared with the yellow squares. Similarly using --tree outside of a repo doesn't display status.

Thank you for your comment. I will check ASAP (probably next week) what happens in this case and how to fix it.

BrandonStaab · 2021-11-12T03:28:19Z

Thank you for your comment. I will check ASAP (probably next week) what happens in this case and how to fix it.

Also I just noticed that the directory .. shows a question mark, but it isn't a repo so it shouldn't have any styling. I put a green box around the mark in question.

hpwxf · 2022-09-11T11:48:51Z

Since git2-rs requires rust 1.45, I had to upgrade RUST_MIN_SRV to 1.45

Using a complex conditional compilation, git feature is always enabled except on

arm-unknown-linux-gnueabihf (tests fail in git2-rs)

i686-pc-windows-gnu (compilation fails in git2-rs)

new tests have been done to improve overall coverage (not only in new code for git feature)

May be https://crates.io/crates/git-repository could be a simple replacement to git2-rs.

meain · 2022-09-11T13:43:27Z

Hey @hpwxf , sorry for kinda abandoning this PR. If you are still interested and won't mind fixing up the conflicts and addressing the previous issue we can get this in.

meain · 2022-09-11T13:44:28Z

May be crates.io/crates/git-repository could be a simple replacement to git2-rs.

What do you think are the primary advantages of switching to this?

meain · 2022-10-09T13:33:48Z

I'm closing this, but if folks want to continue on this, we can open this back up and continue work on this. Sorry that the work you did could not get merged.

hpwxf requested review from meain and Peltoche as code owners March 7, 2021 22:23

hpwxf force-pushed the git-integration-issue-7 branch from f197535 to 4556325 Compare March 23, 2021 12:53

hpwxf added 22 commits April 3, 2021 20:27

Add Git Integration (issue lsd-rs#7)

06c42ec

* Enabled using `cargo build --feature=git` * git block is by default on the left of name block * use `lsd --git --long` to enable git status info (only available on long display) * sort by git status using `lsd --sort=git --long`

Update doc for git integration

2458042

Add entry in CHANGELOG

7bf131d

Apply cargo fmt

21ca44a

Remove test directory

f540b26

Fix Clippy report

642d13d

Refzctor to relocate non well supported #[cfg(feature = "git")]

8e5dcfe

Fix fmt format

23db360

Add more tests for colors and sort

5b15bf0

Test enum completeness in color map using enum iteration from strum macros

Fix format

e0189e7

Fix lsd -al --git layout

0fda017

Parent directory git status will not fetch another parent repository if different of the current one.

Simplify fix for lsd -al --git layout

2446e51

Fix format

50168cf

Add non redundancy test on git icons

dcfcec9

Add more tests for a better coverage

a2fbb3c

Upgrade RUST_MIN_SRV from 1.43.1 to 1.45 to follow minimal version fo…

a81f542

…r git2-rs

Exclude git2 feature on all target where git2 is not OK

e9d81ca

Add support of feature in conditional compilation

83d7909

cargo fmt

c59ac8f

Fix new merged test after rebase

263fb65

Put Elem::TreeEdge enum value in comment as not enabled

61eb418

color::tests::test_elem_map_completeness verify the consistency between between Elem value and theme. Elem::TreeEdge could be re-enabled when its theme will ok.

Remove logger

c7baca2

hpwxf force-pushed the git-integration-issue-7 branch from 4556325 to c7baca2 Compare April 3, 2021 20:40

Force CI (due to docker error)

d8475ce

hpwxf mentioned this pull request Sep 11, 2022

Create a git integration #7

Closed

meain closed this Oct 9, 2022

zwpaper mentioned this pull request Oct 26, 2022

Unable to Change Color Theme with Default theme example #756

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Git integration (issue #7) #495

Git integration (issue #7) #495

hpwxf commented Mar 7, 2021 •

edited

Loading

codecov-io commented Mar 7, 2021 •

edited

Loading

hpwxf commented Mar 9, 2021 •

edited

Loading

hpwxf commented Mar 23, 2021

hpwxf commented Apr 3, 2021

hpwxf commented Apr 3, 2021

meain commented Apr 20, 2021

gwennlbh commented Jul 19, 2021

BrandonStaab commented Nov 11, 2021

hpwxf commented Nov 11, 2021 •

edited

Loading

BrandonStaab commented Nov 12, 2021

hpwxf commented Sep 11, 2022

meain commented Sep 11, 2022

meain commented Sep 11, 2022

meain commented Oct 9, 2022

Git integration (issue #7) #495

Git integration (issue #7) #495

Conversation

hpwxf commented Mar 7, 2021 • edited Loading

NB: crate log has also been defined in Cargo.toml to provide debug feature. release_max_level_error feature disables log macros in release mode.

codecov-io commented Mar 7, 2021 • edited Loading

Codecov Report

hpwxf commented Mar 9, 2021 • edited Loading

hpwxf commented Mar 23, 2021

hpwxf commented Apr 3, 2021

hpwxf commented Apr 3, 2021

meain commented Apr 20, 2021

gwennlbh commented Jul 19, 2021

BrandonStaab commented Nov 11, 2021

hpwxf commented Nov 11, 2021 • edited Loading

BrandonStaab commented Nov 12, 2021

hpwxf commented Sep 11, 2022

meain commented Sep 11, 2022

meain commented Sep 11, 2022

meain commented Oct 9, 2022

hpwxf commented Mar 7, 2021 •

edited

Loading

NB: crate `log` has also been defined in Cargo.toml to provide debug feature. `release_max_level_error` feature disables log macros in release mode.

codecov-io commented Mar 7, 2021 •

edited

Loading

hpwxf commented Mar 9, 2021 •

edited

Loading

hpwxf commented Nov 11, 2021 •

edited

Loading