Merge pull request #166 from axdiamond/show-pending-changes

Add changes line

Author: o2sh

src/info.rs

@@ -27,6 +27,7 @@ pub struct Info {
     last_change: String,
     repo: String,
     commits: String,
+    pending: String,
     repo_size: String,
     number_of_lines: usize,
     license: String,
@@ -86,6 +87,14 @@ impl std::fmt::Display for Info {
             )?;
         }
 
+        if !self.disable_fields.pending && self.pending != "" {
+            write_buf(
+                &mut buf,
+                &self.get_formatted_info_label("Pending: ", color),
+                &self.pending,
+            )?;
+        }
+
         if !self.disable_fields.version {
             write_buf(
                 &mut buf,
@@ -304,6 +313,7 @@ impl Info {
         let (git_v, git_user) = Info::get_git_info(workdir_str);
         let version = Info::get_version(workdir_str)?;
         let commits = Info::get_commits(workdir_str, no_merges)?;
+        let pending = Info::get_pending_pending(workdir_str)?;
         let repo_size = Info::get_packed_size(workdir_str)?;
         let last_change = Info::get_last_change(workdir_str)?;
         let creation_date = Info::get_creation_time(workdir_str)?;
@@ -324,6 +334,7 @@ impl Info {
             last_change,
             repo: config.repository_url,
             commits,
+            pending,
             repo_size,
             number_of_lines,
             license: project_license,
@@ -502,6 +513,54 @@ impl Info {
         }
     }
 
+    fn get_pending_pending(dir: &str) -> Result<String> {
+        let output = Command::new("git")
+            .arg("-C")
+            .arg(dir)
+            .arg("status")
+            .arg("--porcelain")
+            .output()
+            .expect("Failed to execute git.");
+
+        let output = String::from_utf8_lossy(&output.stdout);
+
+        if output == "" {
+            Ok("".into())
+        } else {
+            let lines = output.lines();
+
+            let mut deleted = 0;
+            let mut added = 0;
+            let mut modified = 0;
+
+            for line in lines {
+                let prefix = &line[..2];
+
+                match prefix.trim() {
+                    "D" => deleted += 1,
+                    "A" | "AM" | "??" => added += 1,
+                    "M" | "MM" | "R" => modified += 1,
+                    _ => {}
+                }
+            }
+
+            let mut result = String::from("");
+            if modified > 0 {
+                result = format!("{}+-", modified)
+            }
+
+            if added > 0 {
+                result = format!("{} {}+", result, added);
+            }
+
+            if deleted > 0 {
+                result = format!("{} {}-", result, deleted);
+            }
+
+            Ok(result.into())
+        }
+    }
+
     fn get_packed_size(dir: &str) -> Result<String> {
         let output = Command::new("git")
             .arg("-C")

src/main.rs

@@ -57,6 +57,7 @@ pub struct InfoFieldOn {
     last_change: bool,
     repo: bool,
     commits: bool,
+    pending: bool,
     lines_of_code: bool,
     size: bool,
     license: bool,
@@ -75,6 +76,7 @@ enum InfoFields {
     LastChange,
     Repo,
     Commits,
+    Pending,
     LinesOfCode,
     Size,
     License,
@@ -258,6 +260,7 @@ Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
                 InfoFields::Authors => disable_fields.authors = true,
                 InfoFields::LastChange => disable_fields.last_change = true,
                 InfoFields::Repo => disable_fields.repo = true,
+                InfoFields::Pending => disable_fields.pending = true,
                 InfoFields::Commits => disable_fields.commits = true,
                 InfoFields::LinesOfCode => disable_fields.lines_of_code = true,
                 InfoFields::Size => disable_fields.size = true,