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.

Author: arxanas

Cargo.lock

@@ -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"

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/Cargo.toml

@@ -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-hook/tests/test_hook.rs

@@ -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/Cargo.toml

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

git-branchless-lib/src/lib.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-testing/src/lib.rs git-branchless-lib/src/testing.rsgit-branchless-testing/src/lib.rs renamed to git-branchless-lib/src/testing.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_eventlog.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_run.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<()> {