Remove pointless custom result enum

Change-Id: simplify-unapply

Author: christian-schilling

josh-proxy/src/lib.rs

@@ -133,7 +133,7 @@ pub fn process_repo_update(repo_update: RepoUpdate) -> josh::JoshResult<String>
 
             tracing::debug!("=== processed_old {:?}", old);
 
-            match josh::history::unapply_filter(
+            josh::history::unapply_filter(
                 &transaction,
                 filterobj,
                 original_target,
@@ -142,24 +142,7 @@ pub fn process_repo_update(repo_update: RepoUpdate) -> josh::JoshResult<String>
                 josh_merge,
                 reparent_orphans,
                 &mut change_ids,
-            )? {
-                josh::UnapplyResult::Done(rewritten) => {
-                    tracing::debug!("rewritten");
-                    rewritten
-                }
-                josh::UnapplyResult::BranchDoesNotExist => {
-                    return Err(josh::josh_error("branch does not exist on remote"));
-                }
-                josh::UnapplyResult::RejectMerge(msg) => {
-                    return Err(josh::josh_error(&msg));
-                }
-                josh::UnapplyResult::RejectAmend(msg) => {
-                    return Err(josh::josh_error(&format!(
-                        "rejecting to amend {:?} with conflicting changes",
-                        msg
-                    )));
-                }
-            }
+            )?
         };
 
         let oid_to_push = if josh_merge {

src/bin/josh-filter.rs

@@ -340,17 +340,14 @@ fn run_filter(args: Vec<String>) -> josh::JoshResult<i32> {
             false,
             None,
             &mut None,
-        )? {
-            josh::UnapplyResult::Done(rewritten) => {
+        ) {
+            Ok(rewritten) => {
                 repo.reference(&src, rewritten, true, "unapply_filter")?;
             }
-            josh::UnapplyResult::RejectMerge(msg) => {
+            Err(JoshError(msg)) => {
                 println!("{}", msg);
                 return Ok(1);
             }
-            _ => {
-                return Ok(1);
-            }
         }
     }
 

src/history.rs

@@ -278,7 +278,7 @@ pub fn unapply_filter(
     keep_orphans: bool,
     reparent_orphans: Option<git2::Oid>,
     change_ids: &mut Option<Vec<Change>>,
-) -> JoshResult<UnapplyResult> {
+) -> JoshResult<git2::Oid> {
     let mut bm = std::collections::HashMap::new();
     let mut ret = original_target;
 
@@ -307,7 +307,7 @@ pub fn unapply_filter(
             tracing::info!("Had to go through the whole thing",);
             find_original(transaction, filterobj, original_target, new)?
         };
-        return Ok(UnapplyResult::Done(ret));
+        return Ok(ret);
     }
 
     tracing::info!("before walk");
@@ -461,7 +461,7 @@ pub fn unapply_filter(
                         parent_count,
                         module_commit.summary().unwrap_or_default()
                     );
-                    return Ok(UnapplyResult::RejectMerge(msg));
+                    return Err(josh_error(&msg));
                 }
             }
         };
@@ -481,7 +481,7 @@ pub fn unapply_filter(
     }
 
     tracing::trace!("done {:?}", ret);
-    Ok(UnapplyResult::Done(ret))
+    Ok(ret)
 }
 
 fn select_parent_commits<'a>(

src/lib.rs

@@ -46,14 +46,6 @@ pub mod housekeeping;
 pub mod query;
 pub mod shell;
 
-#[derive(Clone)]
-pub enum UnapplyResult {
-    Done(git2::Oid),
-    RejectMerge(String),
-    RejectAmend(String),
-    BranchDoesNotExist,
-}
-
 pub struct Change {
     pub author: String,
     pub id: Option<String>,