Add Git Integration (issue lsd-rs#7)

* 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`

.travis.yml

@@ -7,7 +7,7 @@ matrix:
     # Stable channel.
     - os: linux
       rust: stable
-      env: TARGET=x86_64-unknown-linux-gnu
+      env: TARGET=x86_64-unknown-linux-gnu FEATURES=git
     - os: linux
       rust: stable
       env: TARGET=i686-unknown-linux-gnu
@@ -19,7 +19,7 @@ matrix:
       env: TARGET=i686-unknown-linux-musl
     - os: osx
       rust: stable
-      env: TARGET=x86_64-apple-darwin
+      env: TARGET=x86_64-apple-darwin FEATURES=git
     - os: linux
       rust: stable
       env:
@@ -30,13 +30,13 @@ matrix:
     # The other platforms are disabled in order to reduce the total CI time
     - os: linux
       rust: beta
-      env: TARGET=x86_64-unknown-linux-gnu
+      env: TARGET=x86_64-unknown-linux-gnu FEATURES=git
 
     # Nightly channel.
     # The other platforms are disabled in order to reduce the total CI time
     - os: linux
       rust: nightly
-      env: TARGET=x86_64-unknown-linux-gnu
+      env: TARGET=x86_64-unknown-linux-gnu FEATURES=git
 
     # Minimum Rust supported channel.
     - os: linux

Cargo.toml

@@ -36,12 +36,18 @@ xdg = "2.1.*"
 yaml-rust = "0.4.*"
 serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.8"
+log = { version = "0.4", features = ["release_max_level_error"] }
 
 [target.'cfg(unix)'.dependencies]
 users = "0.11.*"
 
 [target.'cfg(windows)'.dependencies]
-winapi = {version = "0.3.*", features = ["aclapi", "accctrl", "winnt", "winerror", "securitybaseapi", "winbase"]}
+winapi = { version = "0.3.*", features = ["aclapi", "accctrl", "winnt", "winerror", "securitybaseapi", "winbase"] }
+
+[dependencies.git2]
+version = "0.13"
+optional = true
+default-features = false
 
 [dependencies.clap]
 features = ["suggestions", "color", "wrap_help"]
@@ -55,4 +61,6 @@ tempfile = "3"
 serial_test = "0.5"
 
 [features]
+default = []
 sudo = []
+git = ["git2"]

ci/before_deploy.bash

@@ -4,7 +4,7 @@
 set -ex
 
 build() {
-    cargo build --target "$TARGET" --release --verbose
+    cargo build --target "$TARGET" --features="$FEATURES" --release --verbose
 }
 
 pack() {

src/app.rs

@@ -1,7 +1,7 @@
 use clap::{App, Arg};
 
 pub fn build() -> App<'static, 'static> {
-    App::new("lsd")
+    let app = App::new("lsd")
         .version(crate_version!())
         .about(crate_description!())
         .arg(Arg::with_name("FILE").multiple(true).default_value("."))
@@ -192,7 +192,14 @@ pub fn build() -> App<'static, 'static> {
             Arg::with_name("sort")
                 .long("sort")
                 .multiple(true)
-                .possible_values(&["size", "time", "version", "extension"])
+                .possible_values(&[
+                    "size",
+                    "time",
+                    "version",
+                    "extension",
+                    #[cfg(feature = "git")]
+                        "git",
+                ])
                 .takes_value(true)
                 .value_name("WORD")
                 .overrides_with("timesort")
@@ -234,13 +241,15 @@ pub fn build() -> App<'static, 'static> {
                     "name",
                     "inode",
                     "links",
+                    #[cfg(feature = "git")]
+                        "git",
                 ])
                 .help("Specify the blocks that will be displayed and in what order"),
         )
         .arg(
             Arg::with_name("classic")
-            .long("classic")
-            .help("Enable classic mode (no colors or icons)"),
+                .long("classic")
+                .help("Enable classic mode (no colors or icons)"),
         )
         .arg(
             Arg::with_name("no-symlink")
@@ -271,7 +280,17 @@ pub fn build() -> App<'static, 'static> {
                 .long("dereference")
                 .multiple(true)
                 .help("When showing file information for a symbolic link, show information for the file the link references rather than for the link itself"),
+        );
+    if cfg!(feature = "git") {
+        app.arg(
+            Arg::with_name("git")
+                .long("git")
+                .multiple(true)
+                .help("Show git status on file and directory")
         )
+    } else {
+        app
+    }
 }
 
 fn validate_date_argument(arg: String) -> Result<(), String> {