refactor(core): re-export formatting symbols from cursive_core

This should have been done from the beginning, since we operate on these symbols in several places for formatting. This would also help a migration away from `cursive`, since now only two modules have direct dependencies on `cursive`/`cursive_core`: - git-branchless-lib for general output formatting. - git-branchless-undo for the interactive undo UI.
arxanas · Jul 2, 2024 · 0cf0817 · 0cf0817
1 parent 2428f2b
commit 0cf0817
Show file tree

Hide file tree

Showing 26 changed files with 41 additions and 77 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/git-branchless-invoke/Cargo.toml b/git-branchless-invoke/Cargo.toml
@@ -11,7 +11,6 @@ version = "0.9.0"
 [dependencies]
 clap = { workspace = true, features = ["derive"] }
 color-eyre = { workspace = true }
-cursive_core = { workspace = true }
 eyre = { workspace = true }
 git-branchless-opts = { workspace = true }
 git2 = { workspace = true }

diff --git a/git-branchless-invoke/src/lib.rs b/git-branchless-invoke/src/lib.rs
@@ -21,13 +21,11 @@ use std::path::PathBuf;
 use std::time::SystemTime;
 
 use clap::{CommandFactory, FromArgMatches, Parser};
-use cursive_core::theme::BaseColor;
-use cursive_core::utils::markup::StyledString;
 use eyre::Context;
 use git_branchless_opts::{ColorSetting, GlobalArgs};
 use lib::core::config::env_vars::{get_git_exec_path, get_path_to_git};
 use lib::core::effects::Effects;
-use lib::core::formatting::Glyphs;
+use lib::core::formatting::{BaseColor, Glyphs, StyledString};
 use lib::git::GitRunInfo;
 use lib::git::{Repo, RepoError};
 use lib::util::{ExitCode, EyreExitOr};

diff --git a/git-branchless-lib/Cargo.toml b/git-branchless-lib/Cargo.toml
@@ -51,7 +51,7 @@ chrono = { workspace = true }
 color-eyre = { workspace = true }
 concolor = { workspace = true }
 console = { workspace = true }
-cursive = { workspace = true }
+cursive_core = { workspace = true }
 eden_dag = { workspace = true }
 eyre = { workspace = true }
 futures = { workspace = true }

diff --git a/git-branchless-lib/src/core/check_out.rs b/git-branchless-lib/src/core/check_out.rs
@@ -4,13 +4,12 @@ use std::ffi::{OsStr, OsString};
 use std::fmt::Write;
 use std::time::{SystemTime, UNIX_EPOCH};
 
-use cursive::theme::BaseColor;
-use cursive::utils::markup::StyledString;
 use eyre::Context;
 use itertools::Itertools;
 use tracing::instrument;
 
 use crate::core::config::get_auto_switch_branches;
+use crate::core::formatting::{BaseColor, StyledString};
 use crate::git::{
     update_index, CategorizedReferenceName, GitRunInfo, MaybeZeroOid, NonZeroOid, ReferenceName,
     Repo, Stage, UpdateIndexCommand, WorkingCopySnapshot,

diff --git a/git-branchless-lib/src/core/config.rs b/git-branchless-lib/src/core/config.rs
@@ -4,12 +4,10 @@ use std::ffi::OsString;
 use std::fmt::Write;
 use std::path::PathBuf;
 
-use cursive::theme::{BaseColor, Effect, Style};
-use cursive::utils::markup::StyledString;
 use eyre::Context;
 use tracing::{instrument, warn};
 
-use crate::core::formatting::StyledStringBuilder;
+use crate::core::formatting::{BaseColor, Effect, Style, StyledString, StyledStringBuilder};
 use crate::git::{ConfigRead, GitRunInfo, GitRunOpts, Repo};
 
 use super::effects::Effects;

diff --git a/git-branchless-lib/src/core/formatting.rs b/git-branchless-lib/src/core/formatting.rs
@@ -6,9 +6,9 @@
 
 use std::fmt::Display;
 
-use cursive::theme::{Effect, Style};
-use cursive::utils::markup::StyledString;
-use cursive::utils::span::Span;
+pub use cursive_core::theme::{BaseColor, Color, ColorType, Effect, Style};
+pub use cursive_core::utils::markup::StyledString;
+pub use cursive_core::utils::span::Span;
 
 /// Pluralize a quantity, as appropriate. Example:
 ///
@@ -369,7 +369,6 @@ fn render_style_as_ansi(content: &str, style: Style) -> eyre::Result<String> {
     let Style { effects, color } = style;
     let output = {
         use console::style;
-        use cursive::theme::{BaseColor, Color, ColorType};
         let output = content.to_string();
         match color.front {
             ColorType::Palette(_) => {

diff --git a/git-branchless-lib/src/core/node_descriptors.rs b/git-branchless-lib/src/core/node_descriptors.rs
@@ -8,8 +8,6 @@ use std::sync::{Arc, Mutex};
 use std::time::SystemTime;
 
 use bstr::{ByteSlice, ByteVec};
-use cursive::theme::BaseColor;
-use cursive::utils::markup::StyledString;
 use lazy_static::lazy_static;
 use regex::Regex;
 use tracing::instrument;
@@ -18,15 +16,15 @@ use crate::core::config::{
     get_commit_descriptors_branches, get_commit_descriptors_differential_revision,
     get_commit_descriptors_relative_time,
 };
+use crate::core::eventlog::{Event, EventCursor, EventReplayer};
+use crate::core::formatting::Glyphs;
+use crate::core::formatting::{BaseColor, StyledString, StyledStringBuilder};
+use crate::core::repo_ext::RepoReferencesSnapshot;
+use crate::core::rewrite::find_rewrite_target;
 use crate::git::{
     CategorizedReferenceName, Commit, NonZeroOid, ReferenceName, Repo, ResolvedReferenceInfo,
 };
 
-use super::eventlog::{Event, EventCursor, EventReplayer};
-use super::formatting::{Glyphs, StyledStringBuilder};
-use super::repo_ext::RepoReferencesSnapshot;
-use super::rewrite::find_rewrite_target;
-
 /// An object which can be rendered in the smartlog.
 #[derive(Clone, Debug)]
 pub enum NodeObject<'repo> {

diff --git a/git-branchless-lib/src/git/object.rs b/git-branchless-lib/src/git/object.rs
@@ -1,12 +1,10 @@
 use std::path::Path;
 
 use bstr::{BString, ByteSlice};
-use cursive::theme::BaseColor;
-use cursive::utils::markup::StyledString;
 use git2::message_trailers_bytes;
 use tracing::instrument;
 
-use crate::core::formatting::{Glyphs, StyledStringBuilder};
+use crate::core::formatting::{BaseColor, Glyphs, StyledString, StyledStringBuilder};
 use crate::core::node_descriptors::{
     render_node_descriptors, CommitMessageDescriptor, CommitOidDescriptor, NodeObject, Redactor,
 };

diff --git a/git-branchless-lib/src/git/repo.rs b/git-branchless-lib/src/git/repo.rs
@@ -20,16 +20,14 @@ use std::{io, time};
 
 use bstr::ByteVec;
 use chrono::NaiveDateTime;
-use cursive::theme::BaseColor;
-use cursive::utils::markup::StyledString;
 use git2::DiffOptions;
 use itertools::Itertools;
 use thiserror::Error;
 use tracing::{instrument, warn};
 
 use crate::core::effects::{Effects, OperationType};
 use crate::core::eventlog::EventTransactionId;
-use crate::core::formatting::Glyphs;
+use crate::core::formatting::{BaseColor, Glyphs, StyledString};
 use crate::git::config::{Config, ConfigRead};
 use crate::git::object::Blob;
 use crate::git::oid::{make_non_zero_oid, MaybeZeroOid, NonZeroOid};

diff --git a/git-branchless-navigation/Cargo.toml b/git-branchless-navigation/Cargo.toml
@@ -7,7 +7,6 @@ repository = "https://github.com/arxanas/git-branchless"
 version = "0.9.0"
 
 [dependencies]
-cursive = { workspace = true }
 eden_dag = { workspace = true }
 eyre = { workspace = true }
 git-branchless-opts = { workspace = true }

diff --git a/git-branchless-navigation/src/lib.rs b/git-branchless-navigation/src/lib.rs
@@ -17,9 +17,6 @@ use std::ffi::OsString;
 use std::fmt::Write;
 use std::time::SystemTime;
 
-use cursive::theme::BaseColor;
-use cursive::utils::markup::StyledString;
-
 use lib::core::check_out::{check_out_commit, CheckOutCommitOptions, CheckoutTarget};
 use lib::core::repo_ext::RepoExt;
 use lib::util::{ExitCode, EyreExitOr};
@@ -32,7 +29,7 @@ use lib::core::config::get_next_interactive;
 use lib::core::dag::{sorted_commit_set, CommitSet, Dag};
 use lib::core::effects::Effects;
 use lib::core::eventlog::{EventLogDb, EventReplayer};
-use lib::core::formatting::Pluralize;
+use lib::core::formatting::{BaseColor, Pluralize, StyledString};
 use lib::core::node_descriptors::{
     BranchesDescriptor, CommitMessageDescriptor, CommitOidDescriptor,
     DifferentialRevisionDescriptor, NodeDescriptor, Redactor, RelativeTimeDescriptor,

diff --git a/git-branchless-record/Cargo.toml b/git-branchless-record/Cargo.toml
@@ -7,8 +7,6 @@ repository = "https://github.com/arxanas/git-branchless"
 version = "0.9.0"
 
 [dependencies]
-cursive = { version = "0.20.0", default-features = false, features = [ "crossterm-backend", ] }
-cursive_buffered_backend = { workspace = true }
 eden_dag = { workspace = true }
 eyre = { workspace = true }
 git-branchless-invoke = { workspace = true }

diff --git a/git-branchless-smartlog/Cargo.toml b/git-branchless-smartlog/Cargo.toml
@@ -7,7 +7,6 @@ repository = "https://github.com/arxanas/git-branchless"
 version = "0.9.0"
 
 [dependencies]
-cursive_core = { workspace = true }
 eden_dag = { workspace = true }
 eyre = { workspace = true }
 git-branchless-invoke = { workspace = true }

diff --git a/git-branchless-smartlog/src/lib.rs b/git-branchless-smartlog/src/lib.rs
@@ -377,14 +377,13 @@ mod render {
     use std::cmp::Ordering;
     use std::collections::HashSet;
 
-    use cursive_core::theme::{BaseColor, Effect};
-    use cursive_core::utils::markup::StyledString;
     use tracing::instrument;
 
     use lib::core::dag::{CommitSet, Dag};
     use lib::core::effects::Effects;
-    use lib::core::formatting::{set_effect, Pluralize};
-    use lib::core::formatting::{Glyphs, StyledStringBuilder};
+    use lib::core::formatting::{
+        set_effect, BaseColor, Effect, Glyphs, Pluralize, StyledString, StyledStringBuilder,
+    };
     use lib::core::node_descriptors::{render_node_descriptors, NodeDescriptor};
     use lib::git::{NonZeroOid, Repo};
 

diff --git a/git-branchless-submit/Cargo.toml b/git-branchless-submit/Cargo.toml
@@ -9,7 +9,6 @@ version = "0.9.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cursive_core = { workspace = true }
 eden_dag = { workspace = true }
 eyre = { workspace = true }
 git-branchless-invoke = { workspace = true }

diff --git a/git-branchless-submit/src/github.rs b/git-branchless-submit/src/github.rs
@@ -5,8 +5,6 @@ use std::env;
 use std::fmt::{Debug, Write};
 use std::hash::Hash;
 
-use cursive_core::theme::Effect;
-use cursive_core::utils::markup::StyledString;
 use indexmap::IndexMap;
 use itertools::Itertools;
 use lib::core::config::get_main_branch_name;
@@ -15,6 +13,7 @@ use lib::core::dag::Dag;
 use lib::core::effects::Effects;
 use lib::core::effects::OperationType;
 use lib::core::eventlog::EventLogDb;
+use lib::core::formatting::{Effect, StyledString};
 use lib::core::repo_ext::RepoExt;
 use lib::core::repo_ext::RepoReferencesSnapshot;
 use lib::git::CategorizedReferenceName;

diff --git a/git-branchless-submit/src/lib.rs b/git-branchless-submit/src/lib.rs
@@ -18,7 +18,6 @@ use std::fmt::{Debug, Write};
 use std::time::SystemTime;
 
 use branch_forge::BranchForge;
-use cursive_core::theme::{BaseColor, Effect, Style};
 use git_branchless_invoke::CommandContext;
 use git_branchless_test::{RawTestOptions, ResolvedTestOptions, Verbosity};
 use github::GithubForge;
@@ -27,7 +26,7 @@ use lazy_static::lazy_static;
 use lib::core::dag::{union_all, CommitSet, Dag};
 use lib::core::effects::Effects;
 use lib::core::eventlog::{EventLogDb, EventReplayer};
-use lib::core::formatting::{Pluralize, StyledStringBuilder};
+use lib::core::formatting::{BaseColor, Effect, Pluralize, Style, StyledStringBuilder};
 use lib::core::repo_ext::{RepoExt, RepoReferencesSnapshot};
 use lib::git::{GitRunInfo, NonZeroOid, Repo};
 use lib::try_exit_code;

diff --git a/git-branchless-submit/src/phabricator.rs b/git-branchless-submit/src/phabricator.rs
@@ -8,8 +8,6 @@ use std::process::{Command, Stdio};
 use std::str::FromStr;
 use std::time::SystemTime;
 
-use cursive_core::theme::Effect;
-use cursive_core::utils::markup::StyledString;
 use git_branchless_opts::Revset;
 use git_branchless_test::{
     run_tests, FixInfo, ResolvedTestOptions, TestOutput, TestResults, TestStatus,
@@ -21,7 +19,10 @@ use lib::core::check_out::CheckOutCommitOptions;
 use lib::core::dag::{CommitSet, Dag};
 use lib::core::effects::{Effects, OperationType, WithProgress};
 use lib::core::eventlog::EventLogDb;
-use lib::core::formatting::StyledStringBuilder;
+use lib::core::formatting::{
+    Effect, StyledString,
+    StyledStringBuilder,
+};
 use lib::core::rewrite::{
     execute_rebase_plan, BuildRebasePlanError, BuildRebasePlanOptions, ExecuteRebasePlanOptions,
     ExecuteRebasePlanResult, RebasePlanBuilder, RebasePlanPermissions, RepoResource,

diff --git a/git-branchless-test/Cargo.toml b/git-branchless-test/Cargo.toml
@@ -10,7 +10,6 @@ version = "0.9.0"
 bstr = { workspace = true }
 clap = { workspace = true }
 crossbeam = { workspace = true }
-cursive = { workspace = true }
 eden_dag = { workspace = true }
 eyre = { workspace = true }
 fslock = { workspace = true }

diff --git a/git-branchless-test/src/lib.rs b/git-branchless-test/src/lib.rs
@@ -24,8 +24,6 @@ use std::time::SystemTime;
 use bstr::ByteSlice;
 use clap::ValueEnum;
 use crossbeam::channel::{Receiver, RecvError};
-use cursive::theme::{BaseColor, Effect, Style};
-use cursive::utils::markup::StyledString;
 
 use eyre::WrapErr;
 use fslock::LockFile;
@@ -43,7 +41,10 @@ use lib::core::effects::{icons, Effects, OperationIcon, OperationType};
 use lib::core::eventlog::{
     EventLogDb, EventReplayer, EventTransactionId, BRANCHLESS_TRANSACTION_ID_ENV_VAR,
 };
-use lib::core::formatting::{Glyphs, Pluralize, StyledStringBuilder};
+use lib::core::formatting::{
+    BaseColor, Effect, Glyphs, Pluralize, Style, StyledString,
+    StyledStringBuilder,
+};
 use lib::core::repo_ext::RepoExt;
 use lib::core::rewrite::{
     execute_rebase_plan, BuildRebasePlanOptions, ExecuteRebasePlanOptions, ExecuteRebasePlanResult,