Revert "Add ext_common_ancestor feature to Cargo.toml"

This reverts commit a3fd36d.
drewdeponte · Nov 20, 2023 · 6f44241 · 6f44241
1 parent a3fd36d
commit 6f44241
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 64 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,4 +41,3 @@ clap_mangen = "0.2.14"
 
 [features]
 backup_cmd = []
-ext_common_ancestor = []
diff --git a/src/ps/private/git.rs b/src/ps/private/git.rs
@@ -39,7 +39,6 @@ mod create_commit;
 mod create_cwd_repo;
 mod create_signed_commit;
 mod create_unsigned_commit;
-mod ext_common_ancestor;
 mod ext_delete_remote_branch;
 mod ext_fetch;
 mod ext_push;
@@ -69,7 +68,6 @@ pub use create_commit::*;
 pub use create_cwd_repo::*;
 pub use create_signed_commit::*;
 pub use create_unsigned_commit::*;
-pub use ext_common_ancestor::*;
 pub use ext_delete_remote_branch::*;
 pub use ext_fetch::*;
 pub use ext_push::*;

diff --git a/src/ps/private/git/ext_common_ancestor.rs b/src/ps/private/git/ext_common_ancestor.rs
diff --git a/src/ps/private/state_computation.rs b/src/ps/private/state_computation.rs
@@ -245,7 +245,7 @@ pub fn get_list_branch_info(
 #[derive(Debug)]
 pub enum GetPatchInfoCollectionError {
     GetBranchHeadOid,
-    GetCommonAncestor(Box<dyn std::error::Error>),
+    GetCommonAncestor(git::CommonAncestorError),
     GetCommits(git::GitError),
     GetRevisionOid(git2::Error),
     FindCommit(git2::Error),
@@ -269,7 +269,7 @@ impl std::error::Error for GetPatchInfoCollectionError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match self {
             Self::GetBranchHeadOid => None,
-            Self::GetCommonAncestor(e) => Some(e.as_ref()),
+            Self::GetCommonAncestor(e) => Some(e),
             Self::GetCommits(e) => Some(e),
             Self::GetRevisionOid(e) => Some(e),
             Self::FindCommit(e) => Some(e),
@@ -296,13 +296,8 @@ pub fn get_patch_info_collection(
         .get()
         .target()
         .ok_or(GetPatchInfoCollectionError::GetBranchHeadOid)?;
-
-    #[cfg(not(feature = "ext_common_ancestor"))]
     let common_ancestor_oid = git::common_ancestor(repo, branch_head_oid, base_oid)
-        .map_err(|e| GetPatchInfoCollectionError::GetCommonAncestor(e.into()))?;
-    #[cfg(feature = "ext_common_ancestor")]
-    let common_ancestor_oid = git::ext_common_ancestor(branch_head_oid, base_oid)
-        .map_err(|e| GetPatchInfoCollectionError::GetCommonAncestor(e.into()))?;
+        .map_err(GetPatchInfoCollectionError::GetCommonAncestor)?;
 
     let revwalk = git::get_revs(
         repo,