build: delete git-branchless-testing crate

The `git-branchless-lib` crate has a dev-dependency on `git-branchless-testing`, and `git-branchless-testing` has a dependency on `git-branchless-lib`, inducing a circular dependency that means they can't be published to crates.io. This commit collapses them into the same crate again to resolve this circular dependency.

Cargo.toml

@@ -20,7 +20,6 @@ members = [
     "git-branchless-smartlog",
     "git-branchless-submit",
     "git-branchless-test",
-    "git-branchless-testing",
     "git-branchless-undo",
     "git-branchless",
     "git-record",
@@ -105,6 +104,5 @@ vt100 = "0.15.2"
 assert_cmd = "2.0.7"
 cc = "1.0.83"
 criterion = { version = "0.5.1", features = ["html_reports"] }
-git-branchless-testing = { version = "0.8.0", path = "git-branchless-testing" }
 insta = "1.31.0"
 maplit = "1.0.2"

git-branchless-hook/Cargo.toml

@@ -20,5 +20,4 @@ regex = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
-git-branchless-testing = { workspace = true }
 insta = { workspace = true }

git-branchless-hook/tests/test_hook.rs

@@ -1,4 +1,4 @@
-use git_branchless_testing::{make_git, GitRunOptions};
+use lib::testing::{make_git, GitRunOptions};
 
 #[test]
 fn test_is_rebase_underway() -> eyre::Result<()> {

git-branchless-lib/Cargo.toml

@@ -60,6 +60,7 @@ indicatif = { workspace = true }
 itertools = { workspace = true }
 lazy_static = { workspace = true }
 once_cell = { workspace = true }
+portable-pty = { workspace = true }
 rayon = { workspace = true }
 regex = { workspace = true }
 rusqlite = { workspace = true }
@@ -73,9 +74,9 @@ tracing = { workspace = true }
 tracing-chrome = { workspace = true }
 tracing-error = { workspace = true }
 tracing-subscriber = { workspace = true }
+vt100 = { workspace = true }
 
 [dev-dependencies]
 cc = { workspace = true }
 criterion = { workspace = true }
-git-branchless-testing = { workspace = true }
 insta = { workspace = true }

git-branchless-lib/src/lib.rs

@@ -11,4 +11,5 @@
 
 pub mod core;
 pub mod git;
+pub mod testing;
 pub mod util;

git-branchless-testing/src/lib.rs → git-branchless-lib/src/testing.rs

@@ -11,16 +11,16 @@ use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 
+use crate::core::config::env_vars::{
+    get_git_exec_path, get_path_to_git, should_use_separate_command_binary, TEST_GIT,
+    TEST_SEPARATE_COMMAND_BINARIES,
+};
+use crate::git::{GitRunInfo, GitVersion, NonZeroOid, Repo};
+use crate::util::get_sh;
 use color_eyre::Help;
 use eyre::Context;
 use itertools::Itertools;
 use lazy_static::lazy_static;
-use lib::core::config::env_vars::{
-    get_git_exec_path, get_path_to_git, should_use_separate_command_binary, TEST_GIT,
-    TEST_SEPARATE_COMMAND_BINARIES,
-};
-use lib::git::{GitRunInfo, GitVersion, NonZeroOid, Repo};
-use lib::util::get_sh;
 use once_cell::sync::OnceCell;
 use regex::{Captures, Regex};
 use tempfile::TempDir;

git-branchless-lib/tests/test_eventlog.rs

@@ -5,7 +5,7 @@ use branchless::core::eventlog::{
     testing::new_event_replayer, Event, EventLogDb, EventTransactionId,
 };
 use branchless::git::{MaybeZeroOid, NonZeroOid, ReferenceName};
-use git_branchless_testing::make_git;
+use branchless::testing::make_git;
 
 #[test]
 fn test_drop_non_meaningful_events() -> eyre::Result<()> {

git-branchless-lib/tests/test_git_run.rs

@@ -1,5 +1,5 @@
 use branchless::git::{GitRunInfo, GitRunOpts};
-use git_branchless_testing::make_git;
+use branchless::testing::make_git;
 
 #[test]
 fn test_hook_working_dir() -> eyre::Result<()> {

git-branchless-lib/tests/test_git_tree.rs

@@ -5,7 +5,7 @@ use std::{
 };
 
 use branchless::git::{dehydrate_tree, get_changed_paths_between_trees, hydrate_tree, FileMode};
-use git_branchless_testing::make_git;
+use branchless::testing::make_git;
 
 #[test]
 fn test_hydrate_tree() -> eyre::Result<()> {

git-branchless-lib/tests/test_repo.rs

@@ -2,7 +2,7 @@ use branchless::git::{
     AmendFastOptions, BranchType, CherryPickFastOptions, FileMode, FileStatus, GitVersion,
     StatusEntry,
 };
-use git_branchless_testing::make_git;
+use branchless::testing::make_git;
 
 #[test]
 fn test_parse_git_version_output() {

git-branchless-lib/tests/test_rewrite_evolve.rs

@@ -2,8 +2,8 @@ use branchless::core::eventlog::{EventLogDb, EventReplayer};
 use branchless::core::formatting::Glyphs;
 use branchless::core::rewrite::find_rewrite_target;
 use branchless::git::MaybeZeroOid;
+use branchless::testing::{make_git, Git, GitRunOptions};
 use branchless::{core::effects::Effects, git::NonZeroOid};
-use git_branchless_testing::{make_git, Git, GitRunOptions};
 
 fn find_rewrite_target_helper(
     effects: &Effects,

git-branchless-lib/tests/test_rewrite_plan.rs

@@ -15,7 +15,7 @@ use branchless::core::rewrite::{
     execute_rebase_plan, BuildRebasePlanOptions, ExecuteRebasePlanOptions, ExecuteRebasePlanResult,
     RebasePlan, RebasePlanBuilder, RepoResource,
 };
-use git_branchless_testing::{make_git, Git};
+use branchless::testing::{make_git, Git};
 
 #[test]
 fn test_cache_shared_between_builders() -> eyre::Result<()> {

git-branchless-lib/tests/test_snapshot.rs

@@ -4,7 +4,7 @@ use branchless::core::effects::Effects;
 use branchless::core::eventlog::EventLogDb;
 use branchless::core::formatting::Glyphs;
 use branchless::git::WorkingCopyChangesType;
-use git_branchless_testing::{make_git, GitRunOptions};
+use branchless::testing::{make_git, GitRunOptions};
 
 #[test]
 fn test_has_conflicts() -> eyre::Result<()> {

git-branchless-lib/tests/test_status.rs

@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use branchless::core::effects::Effects;
 use branchless::core::formatting::Glyphs;
 use branchless::git::{FileMode, FileStatus, StatusEntry, WorkingCopyChangesType};
-use git_branchless_testing::make_git;
+use branchless::testing::make_git;
 
 #[test]
 fn test_parse_status_line() {

git-branchless-query/Cargo.toml

@@ -19,5 +19,4 @@ lib = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
-git-branchless-testing = { workspace = true }
 insta = { workspace = true }

git-branchless-query/tests/test_query.rs

@@ -1,4 +1,4 @@
-use git_branchless_testing::{make_git, GitRunOptions};
+use lib::testing::{make_git, GitRunOptions};
 
 #[test]
 fn test_query() -> eyre::Result<()> {

git-branchless-record/Cargo.toml

@@ -20,5 +20,4 @@ scm-record = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
-git-branchless-testing = { workspace = true }
 insta = { workspace = true }

git-branchless-record/tests/test_record.rs

@@ -1,5 +1,5 @@
-use git_branchless_testing::pty::{run_in_pty, PtyAction, DOWN_ARROW};
-use git_branchless_testing::{make_git, GitInitOptions, GitRunOptions};
+use lib::testing::pty::{run_in_pty, PtyAction, DOWN_ARROW};
+use lib::testing::{make_git, GitInitOptions, GitRunOptions};
 
 #[test]
 fn test_record_unstaged_changes() -> eyre::Result<()> {

git-branchless-revset/Cargo.toml

@@ -31,5 +31,4 @@ tracing = { workspace = true }
 lalrpop = { workspace = true }
 
 [dev-dependencies]
-git-branchless-testing = { workspace = true }
 insta = { workspace = true }

git-branchless-revset/src/eval.rs

@@ -350,12 +350,12 @@ pub(super) fn eval_number_rhs(
 mod tests {
     use std::borrow::Cow;
 
-    use git_branchless_testing::{make_git, GitRunOptions};
     use lib::core::effects::Effects;
     use lib::core::eventlog::{EventLogDb, EventReplayer};
     use lib::core::formatting::Glyphs;
     use lib::core::repo_ext::RepoExt;
     use lib::git::Commit;
+    use lib::testing::{make_git, GitRunOptions};
 
     use super::*;
     use crate::Expr;

git-branchless-reword/Cargo.toml

@@ -20,5 +20,4 @@ tempfile = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
-git-branchless-testing = { workspace = true }
 insta = { workspace = true }

git-branchless-reword/src/lib.rs

@@ -700,7 +700,7 @@ fn render_status_report(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use git_branchless_testing::make_git;
+    use lib::testing::make_git;
     use std::collections::BTreeMap;
 
     #[test]

git-branchless-smartlog/Cargo.toml

@@ -17,5 +17,4 @@ lib = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
-git-branchless-testing = { workspace = true }
 insta = { workspace = true }

git-branchless-smartlog/tests/test_smartlog.rs

@@ -1,4 +1,4 @@
-use git_branchless_testing::{extract_hint_command, make_git, GitRunOptions};
+use lib::testing::{extract_hint_command, make_git, GitRunOptions};
 
 #[test]
 fn test_init_smartlog() -> eyre::Result<()> {

git-branchless-submit/Cargo.toml

@@ -28,5 +28,4 @@ tracing = { workspace = true }
 
 [dev-dependencies]
 clap = { workspace = true }
-git-branchless-testing = { workspace = true }
 insta = { workspace = true }

git-branchless-submit/tests/test_phabricator_forge.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use git_branchless_testing::{make_git, GitRunOptions, GitWrapper};
+use lib::testing::{make_git, GitRunOptions, GitWrapper};
 
 fn mock_env(git: &GitWrapper) -> HashMap<String, String> {
     git.get_base_env(0)

git-branchless-submit/tests/test_submit.rs

@@ -1,8 +1,8 @@
-use git_branchless_testing::{
+use lib::git::GitVersion;
+use lib::testing::{
     make_git_with_remote_repo, remove_nondeterministic_lines, GitInitOptions, GitRunOptions,
     GitWrapperWithRemoteRepo,
 };
-use lib::git::GitVersion;
 
 /// Minimum version due to changes in the output of `git push`.
 const MIN_VERSION: GitVersion = GitVersion(2, 36, 0);

git-branchless-test/Cargo.toml

@@ -32,6 +32,5 @@ tracing = { workspace = true }
 
 [dev-dependencies]
 assert_cmd = { workspace = true }
-git-branchless-testing = { workspace = true }
 insta = { workspace = true }
 maplit = { workspace = true }

git-branchless-test/src/lib.rs

@@ -2960,7 +2960,7 @@ pub fn subcommand_clean(
 
 #[cfg(test)]
 mod tests {
-    use git_branchless_testing::make_git;
+    use lib::testing::make_git;
 
     use super::*;
 

git-branchless-test/tests/test_test.rs

@@ -1,4 +1,4 @@
-use git_branchless_testing::{make_git, GitRunOptions, GitWrapper};
+use lib::testing::{make_git, GitRunOptions, GitWrapper};
 use maplit::hashmap;
 
 fn write_test_script(git: &GitWrapper) -> eyre::Result<()> {