Remove a legacy way of updating the stack branch head

This was used only in tests anyways

Author: krlvi

crates/gitbutler-stack/src/stack.rs

@@ -512,54 +512,8 @@ impl Stack {
         }
 
         let state = branch_state(ctx);
-        let patches = self.stack_patches(&ctx.to_stack_context()?, true)?;
         let mut updated_heads = self.heads.clone();
 
-        // Handle target updates
-        if let Some(target_update) = &update.target_update {
-            let mut new_head = updated_heads
-                .clone()
-                .into_iter()
-                .find(|h| *h.name() == branch_name)
-                .ok_or_else(|| anyhow!("Series with name {} not found", branch_name))?;
-            let gix_repo = ctx.gix_repository()?;
-            new_head.set_head(target_update.target.clone(), &gix_repo)?;
-            validate_target(
-                new_head.head_oid(&gix_repo)?,
-                ctx.repo(),
-                self.head(&gix_repo)?,
-                &state,
-            )?;
-            let preceding_head = if let Some(preceding_head_name) = update
-                .target_update
-                .clone()
-                .and_then(|update| update.preceding_head_name)
-            {
-                let (_, preceding_head) = get_head(&self.heads, &preceding_head_name)
-                    .context("The specified preceding_head could not be found")?;
-                Some(preceding_head)
-            } else {
-                None
-            };
-
-            // drop the old head and add the new one
-            let (idx, _) = get_head(&updated_heads, &branch_name)?;
-            updated_heads.remove(idx);
-            let last_updated_head: Option<CommitOrChangeId> = updated_heads
-                .last()
-                .and_then(|h| h.head_oid(&gix_repo).ok().map(|h| h.into()));
-            if patches.last() != last_updated_head.as_ref() {
-                bail!("This update would cause orphaned patches, which is disallowed");
-            }
-            updated_heads = add_head(
-                updated_heads,
-                new_head.clone(),
-                preceding_head,
-                patches.clone(),
-                &gix_repo,
-            )?;
-        }
-
         // Handle name updates
         if let Some(name) = update.name.clone() {
             let head = updated_heads
@@ -863,7 +817,6 @@ impl Stack {
 /// Request to update a PatchReference.
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, Default)]
 pub struct PatchReferenceUpdate {
-    pub target_update: Option<TargetUpdate>,
     pub name: Option<String>,
     /// If present, this sets the value of the description field.
     /// It is possible to set this to Some(None) which will remove an existing description.

crates/gitbutler-stack/tests/mod.rs

@@ -7,8 +7,8 @@ use gitbutler_command_context::CommandContext;
 use gitbutler_repo::logging::{LogUntil, RepositoryExt as _};
 use gitbutler_repo_actions::RepoActionsExt;
 use gitbutler_stack::stack_context::CommandContextExt;
+use gitbutler_stack::PatchReferenceUpdate;
 use gitbutler_stack::{CommitOrChangeId, StackBranch, VirtualBranchesHandle};
-use gitbutler_stack::{PatchReferenceUpdate, TargetUpdate};
 use itertools::Itertools;
 use tempfile::TempDir;
 
@@ -381,7 +381,6 @@ fn update_branch_name_fails_validation() -> Result<()> {
     let mut test_ctx = test_ctx(&ctx)?;
     let update = PatchReferenceUpdate {
         name: Some("invalid name".into()),
-        target_update: None,
         description: None,
     };
     let result = test_ctx
@@ -397,7 +396,6 @@ fn update_branch_name_success() -> Result<()> {
     let mut test_ctx = test_ctx(&ctx)?;
     let update = PatchReferenceUpdate {
         name: Some("new-name".into()),
-        target_update: None,
         description: None,
     };
     let result = test_ctx
@@ -424,7 +422,6 @@ fn update_branch_name_resets_pr_number() -> Result<()> {
     assert_eq!(test_ctx.stack.heads[0].pr_number, Some(pr_number));
     let update = PatchReferenceUpdate {
         name: Some("new-name".into()),
-        target_update: None,
         description: None,
     };
     test_ctx
@@ -444,7 +441,6 @@ fn update_series_set_description() -> Result<()> {
     let mut test_ctx = test_ctx(&ctx)?;
     let update = PatchReferenceUpdate {
         name: None,
-        target_update: None,
         description: Some(Some("my description".into())),
     };
     let result = test_ctx
@@ -463,96 +459,6 @@ fn update_series_set_description() -> Result<()> {
     Ok(())
 }
 
-#[test]
-fn update_series_target_fails_commit_not_in_stack() -> Result<()> {
-    let (ctx, _temp_dir) = command_ctx("multiple-commits")?;
-    let mut test_ctx = test_ctx(&ctx)?;
-    let other_commit_id = test_ctx.other_commits.last().unwrap().id().to_string();
-    let update = PatchReferenceUpdate {
-        name: None,
-        target_update: Some(TargetUpdate {
-            target: CommitOrChangeId::CommitId(other_commit_id.clone()),
-            preceding_head_name: None,
-        }),
-        description: None,
-    };
-    let result = test_ctx
-        .stack
-        .update_branch(&ctx, "a-branch-2".into(), &update);
-    assert_eq!(
-        result.err().unwrap().to_string(),
-        format!(
-            "The commit {} is not between the stack head and the stack base",
-            other_commit_id
-        )
-    );
-    Ok(())
-}
-
-#[test]
-fn update_series_target_orphan_commit_fails() -> Result<()> {
-    let (ctx, _temp_dir) = command_ctx("multiple-commits")?;
-    let mut test_ctx = test_ctx(&ctx)?;
-    let initial_state = test_ctx.stack.heads.clone();
-    let first_commit_id = test_ctx.commits.first().unwrap().id().to_string();
-    let update = PatchReferenceUpdate {
-        name: Some("new-lol".into()),
-        target_update: Some(TargetUpdate {
-            target: CommitOrChangeId::CommitId(first_commit_id.clone()),
-            preceding_head_name: None,
-        }),
-        description: None,
-    };
-    let result = test_ctx
-        .stack
-        .update_branch(&ctx, "a-branch-2".into(), &update);
-
-    assert_eq!(
-        result.err().unwrap().to_string(),
-        "This update would cause orphaned patches, which is disallowed"
-    );
-    assert_eq!(initial_state, test_ctx.stack.heads); // no change due to failure
-    Ok(())
-}
-
-#[test]
-fn update_series_target_success() -> Result<()> {
-    let (ctx, _temp_dir) = command_ctx("multiple-commits")?;
-    let mut test_ctx = test_ctx(&ctx)?;
-    let commit_0_change_id = CommitOrChangeId::CommitId(test_ctx.commits[0].id().to_string());
-    let repo = &ctx.gix_repository()?;
-    let series_1 = StackBranch::new(commit_0_change_id.clone(), "series_1".into(), None, repo)?;
-    let result = test_ctx.stack.add_series(&ctx, series_1, None);
-    assert!(result.is_ok());
-    assert_eq!(
-        commit_0_change_id,
-        test_ctx.stack.heads[0].head_oid(repo)?.into()
-    );
-    let commit_1_change_id = CommitOrChangeId::CommitId(test_ctx.commits[1].id().to_string());
-    let update = PatchReferenceUpdate {
-        name: None,
-        target_update: Some(TargetUpdate {
-            target: commit_1_change_id.clone(),
-            preceding_head_name: None,
-        }),
-        description: None,
-    };
-    let result = test_ctx
-        .stack
-        .update_branch(&ctx, "series_1".into(), &update);
-    assert!(result.is_ok());
-    assert_eq!(
-        commit_1_change_id,
-        test_ctx.stack.heads[0].head_oid(repo)?.into()
-    );
-    // Assert persisted
-    assert_eq!(
-        test_ctx.stack,
-        test_ctx.handle.get_stack(test_ctx.stack.id)?
-    );
-    Ok(())
-}
-
 #[test]
 fn push_series_success() -> Result<()> {
     let (ctx, _temp_dir) = command_ctx("multiple-commits")?;