Ignore "extensions.worktreeconfig" error

- Ignore "extensions.worktreeconfig" error until the upstream issue is
  resolved and git2-rs receives the fix.
  - Issue: libgit2/libgit2#6044
- Add unknown status with red color
- Change unpushed status to use blue color
- Split crate imports from external ones in gfold crate

Signed-off-by: Nick Gerace <[email protected]>

CHANGELOG.md

@@ -8,7 +8,14 @@ For new changes prior to version 4.0.0, please see [CHANGELOG_PRE_V4](./docs/CHA
 
 ## Unreleased
 
-The latest version contains all changes.
+<!-- The latest version contains all changes. -->
+
+### Changed
+
+- Add "unknown" status for repositories hitting the "extensions.worktreeconfig" error
+- Bump dependencies
+- Change "unpushed" color to blue
+- Ignore the "extensions.worktreeconfig" error until the corresponding upstream issue is resolved: https://github.com/libgit2/libgit2/issues/6044
 
 ## 4.1.2 - 2022-12-20
 

crates/gfold/src/cli.rs

@@ -1,13 +1,14 @@
 //! This module contains the CLI entrypoint, CLI options and config generation based on the user's
 //! settings and environment.
 
-use crate::config::{ColorMode, Config, DisplayMode};
-use crate::error::Error;
-use crate::run;
 use clap::Parser;
 use log::debug;
 use std::env;
 
+use crate::config::{ColorMode, Config, DisplayMode};
+use crate::error::Error;
+use crate::run;
+
 const HELP: &str = "\
 More information: https://github.com/nickgerace/gfold
 

crates/gfold/src/config.rs

@@ -1,10 +1,11 @@
 //! This module contains the config specification and functionality for creating a config.
 
-use crate::error::Error;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 use std::{env, fs, io};
 
+use crate::error::Error;
+
 /// This struct is the actual config type consumed through the codebase. It is boostrapped via its
 /// public methods and uses [`EntryConfig`], a private struct, under the hood in order to
 /// deserialize empty, non-existent, partial, and complete config files.

crates/gfold/src/display.rs

@@ -1,14 +1,15 @@
 //! This module contains the functionality for displaying reports to `stdout`.
 
-use crate::config::{ColorMode, DisplayMode};
-use crate::display::color::ColorHarness;
-use crate::error::Error;
-use crate::report::LabeledReports;
 use log::debug;
 use log::warn;
 use std::io;
 use std::path::Path;
 
+use crate::config::{ColorMode, DisplayMode};
+use crate::display::color::ColorHarness;
+use crate::error::Error;
+use crate::report::LabeledReports;
+
 mod color;
 
 const PAD: usize = 2;

crates/gfold/src/display/color.rs

@@ -1,10 +1,11 @@
 //! This module provides a harness for non-trivial displays of information to `stdout`.
 
-use crate::config::ColorMode;
-use crate::status::Status;
 use std::io::{self, Write};
 use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
 
+use crate::config::ColorMode;
+use crate::status::Status;
+
 /// This harness provides methods to write to `stdout`. It maps the internal [`ColorMode`] type to
 /// our dependency's [`ColorChoice`] type due to discrepancies in behavior and naming.
 pub struct ColorHarness {
@@ -26,9 +27,10 @@ impl ColorHarness {
     pub fn write_status(&self, status: &Status, status_width: usize) -> io::Result<()> {
         let mut stdout = StandardStream::stdout(self.color_choice);
         stdout.set_color(ColorSpec::new().set_fg(Some(match status {
-            Status::Bare => Color::Red,
+            Status::Bare | Status::Unknown => Color::Red,
             Status::Clean => Color::Green,
-            _ => Color::Yellow,
+            Status::Unpushed => Color::Blue,
+            Status::Unclean => Color::Yellow,
         })))?;
         write!(
             &mut stdout,

crates/gfold/src/report.rs

@@ -1,15 +1,16 @@
 //! This module contains the functionality for generating reports.
 
-use crate::config::DisplayMode;
-use crate::error::Error;
-use crate::status::Status;
 use git2::{ErrorCode, Reference, Remote, Repository, StatusOptions};
-use log::{debug, trace};
+use log::{debug, error, trace};
 use rayon::prelude::*;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 use std::path::Path;
 
+use crate::config::DisplayMode;
+use crate::error::Error;
+use crate::status::Status;
+
 mod target;
 
 const HEAD: &str = "HEAD";
@@ -106,14 +107,25 @@ fn generate_report(repo_path: &Path, include_email: bool) -> anyhow::Result<Repo
         "attempting to generate report for repository at path: {:?}",
         repo_path
     );
-    let repo = Repository::open(repo_path)?;
+
+    let repo = match Repository::open(repo_path) {
+        Ok(repo) => repo,
+        Err(e) if e.message() == "unsupported extension name extensions.worktreeconfig" => {
+            error!("skipping error ({e}) until upstream libgit2 issue is resolved: https://github.com/libgit2/libgit2/issues/6044");
+            let unknown_report = Report::new(repo_path, "unknown", &Status::Unknown, None, None)?;
+            return Ok(unknown_report);
+        }
+        Err(e) => return Err(e.into()),
+    };
+
     let head = match repo.head() {
         Ok(head) => Some(head),
         Err(ref e) if e.code() == ErrorCode::UnbornBranch || e.code() == ErrorCode::NotFound => {
             None
         }
         Err(e) => return Err(e.into()),
     };
+
     let branch = match &head {
         Some(head) => head
             .shorthand()

crates/gfold/src/status.rs

@@ -8,6 +8,7 @@ pub enum Status {
     Bare,
     Clean,
     Unclean,
+    Unknown,
     Unpushed,
 }
 
@@ -17,6 +18,7 @@ impl Status {
             Self::Bare => "bare",
             Self::Clean => "clean",
             Self::Unclean => "unclean",
+            Self::Unknown => "unknown",
             Self::Unpushed => "unpushed",
         }
     }