feat(move): add --dry-run to support testing in-memory rebases

claytonrcarter · claytonrcarter · commit 10645cedaa78 · 2025-09-11T22:15:02.000-04:00
This is useful to finding the exact commit that created a conflict for an out
of date stack:

```
TEST_COMMAND='git move -s "current($OLD_COMMIT)" -d $BRANCHLESS_TEST_COMMIT --in-memory --dry-run'

git test run \
    $MERGE_BASE..main \
    --exec "$TEST_COMMAND"
    --jobs 8 \
    --strategy worktree
    --search binary
```

This was able to search through 372 commits in only 40 iterations, finding the
exact commit where the conflict was created.
diff --git a/git-branchless-lib/src/core/rewrite/execute.rs b/git-branchless-lib/src/core/rewrite/execute.rs
@@ -498,6 +498,7 @@ mod in_memory {
             preserve_timestamps,
             force_in_memory: _,
             force_on_disk: _,
+            dry_run: _,
             resolve_merge_conflicts: _, // May be needed once we can resolve merge conflicts in memory.
             check_out_commit_options: _, // Caller is responsible for checking out to new HEAD.
         } = options;
@@ -909,6 +910,7 @@ mod in_memory {
             preserve_timestamps: _,
             force_in_memory: _,
             force_on_disk: _,
+            dry_run: _,
             resolve_merge_conflicts: _,
             check_out_commit_options,
         } = options;
@@ -994,6 +996,7 @@ mod on_disk {
             preserve_timestamps,
             force_in_memory: _,
             force_on_disk: _,
+            dry_run: _,
             resolve_merge_conflicts: _,
             check_out_commit_options: _, // Checkout happens after rebase has concluded.
         } = options;
@@ -1170,6 +1173,7 @@ mod on_disk {
             preserve_timestamps: _,
             force_in_memory: _,
             force_on_disk: _,
+            dry_run: _,
             resolve_merge_conflicts: _,
             check_out_commit_options: _, // Checkout happens after rebase has concluded.
         } = options;
@@ -1210,6 +1214,10 @@ pub struct ExecuteRebasePlanOptions {
     /// Force an on-disk rebase (as opposed to an in-memory rebase).
     pub force_on_disk: bool,
 
+    /// When attempting an in-memory rebase, only report success or failure,
+    /// discarding the resulting changes.
+    pub dry_run: bool,
+
     /// Whether or not an attempt should be made to resolve merge conflicts,
     /// rather than failing-fast.
     pub resolve_merge_conflicts: bool,
@@ -1228,7 +1236,10 @@ pub enum ExecuteRebasePlanResult {
         rewritten_oids: Option<HashMap<NonZeroOid, MaybeZeroOid>>,
     },
 
-    /// The rebase operation encounter a failure to merge, and it was not
+    /// The rebase operation is viable, but was not executed to completion.
+    WouldSucceed,
+
+    /// The rebase operation encountered a failure to merge, and it was not
     /// requested to try to resolve it.
     DeclinedToMerge {
         /// Information about the merge failure that occurred.
@@ -1259,6 +1270,7 @@ pub fn execute_rebase_plan(
         preserve_timestamps: _,
         force_in_memory,
         force_on_disk,
+        dry_run,
         resolve_merge_conflicts,
         check_out_commit_options: _,
     } = options;
@@ -1277,6 +1289,14 @@ pub fn execute_rebase_plan(
                 rewritten_oids,
                 new_head_oid,
             } => {
+                if *dry_run {
+                    writeln!(
+                        effects.get_output_stream(),
+                        "In-memory rebase would succeed."
+                    )?;
+                    return Ok(ExecuteRebasePlanResult::WouldSucceed);
+                }
+
                 // Ignore the return code, as it probably indicates that the
                 // checkout failed (which might happen if the user has changes
                 // which don't merge cleanly). The user can resolve that
diff --git a/git-branchless-lib/tests/test_rewrite_plan.rs b/git-branchless-lib/tests/test_rewrite_plan.rs
@@ -759,6 +759,7 @@ fn create_and_execute_plan(
         preserve_timestamps: false,
         force_in_memory: false,
         force_on_disk: false,
+        dry_run: false,
         resolve_merge_conflicts: true,
         check_out_commit_options: CheckOutCommitOptions {
             additional_args: Default::default(),
diff --git a/git-branchless-move/src/lib.rs b/git-branchless-move/src/lib.rs
@@ -74,6 +74,7 @@ pub fn r#move(
     move_options: &MoveOptions,
     fixup: bool,
     insert: bool,
+    dry_run: bool,
 ) -> EyreExitOr<()> {
     let sources_provided = !sources.is_empty();
     let bases_provided = !bases.is_empty();
@@ -484,6 +485,7 @@ pub fn r#move(
                 preserve_timestamps: get_restack_preserve_timestamps(&repo)?,
                 force_in_memory,
                 force_on_disk,
+                dry_run,
                 resolve_merge_conflicts,
                 check_out_commit_options: Default::default(),
             };
@@ -505,6 +507,15 @@ pub fn r#move(
     match result {
         ExecuteRebasePlanResult::Succeeded { rewritten_oids: _ } => Ok(Ok(())),
 
+        ExecuteRebasePlanResult::WouldSucceed => {
+            if dry_run {
+                writeln!(effects.get_output_stream(), "(This was a dry-run; no commits were moved. Re-run without --dry-run to actually move commits.)")?;
+            } else {
+                unreachable!("WouldSucceed should only apply to dry runs")
+            }
+            Ok(Ok(()))
+        }
+
         ExecuteRebasePlanResult::DeclinedToMerge { failed_merge_info } => {
             failed_merge_info.describe(effects, &repo, MergeConflictRemediation::Retry)?;
             Ok(Err(ExitCode(1)))
diff --git a/git-branchless-opts/src/lib.rs b/git-branchless-opts/src/lib.rs
@@ -550,6 +550,10 @@ pub enum Command {
         /// Only supported if the moved subtree has a single head.
         #[clap(action, short = 'I', long = "insert")]
         insert: bool,
+
+        /// Test whether an in-memory rebase would succeed.
+        #[clap(action, long = "dry-run", conflicts_with = "force_on_disk")]
+        dry_run: bool,
     },
 
     /// Move to a later commit in the current stack.
diff --git a/git-branchless-record/src/lib.rs b/git-branchless-record/src/lib.rs
@@ -554,6 +554,7 @@ To proceed anyways, run: git move -f -s 'siblings(.)",
         preserve_timestamps: get_restack_preserve_timestamps(&repo)?,
         force_in_memory: true,
         force_on_disk: false,
+        dry_run: false,
         resolve_merge_conflicts: false,
         check_out_commit_options: Default::default(),
     };
@@ -566,7 +567,8 @@ To proceed anyways, run: git move -f -s 'siblings(.)",
         &execute_options,
     )?;
     match result {
-        ExecuteRebasePlanResult::Succeeded { rewritten_oids: _ } => Ok(Ok(())),
+        ExecuteRebasePlanResult::Succeeded { rewritten_oids: _ }
+        | ExecuteRebasePlanResult::WouldSucceed => Ok(Ok(())),
         ExecuteRebasePlanResult::DeclinedToMerge { failed_merge_info } => {
             failed_merge_info.describe(effects, &repo, MergeConflictRemediation::Insert)?;
             Ok(Ok(()))
diff --git a/git-branchless-reword/src/lib.rs b/git-branchless-reword/src/lib.rs
@@ -289,6 +289,7 @@ pub fn reword(
         preserve_timestamps: get_restack_preserve_timestamps(&repo)?,
         force_in_memory: true,
         force_on_disk: false,
+        dry_run: false,
         resolve_merge_conflicts: false,
         check_out_commit_options: CheckOutCommitOptions {
             additional_args: Default::default(),
@@ -315,7 +316,8 @@ pub fn reword(
         }
         ExecuteRebasePlanResult::Succeeded {
             rewritten_oids: None,
-        } => Ok(Ok(())),
+        }
+        | ExecuteRebasePlanResult::WouldSucceed => Ok(Ok(())),
         ExecuteRebasePlanResult::DeclinedToMerge {
             failed_merge_info: _,
         } => {
diff --git a/git-branchless-submit/src/phabricator.rs b/git-branchless-submit/src/phabricator.rs
@@ -354,6 +354,7 @@ impl Forge for PhabricatorForge<'_> {
             preserve_timestamps: true,
             force_in_memory: true,
             force_on_disk: false,
+            dry_run: false,
             resolve_merge_conflicts: false,
             check_out_commit_options: CheckOutCommitOptions {
                 render_smartlog: false,
@@ -485,7 +486,8 @@ Differential Revision: https://phabricator.example.com/D000$(git rev-list --coun
             } => rewritten_oids,
             ExecuteRebasePlanResult::Succeeded {
                 rewritten_oids: None,
-            } => {
+            }
+            | ExecuteRebasePlanResult::WouldSucceed => {
                 warn!("No rewritten commit OIDs were produced by rebase plan execution");
                 Default::default()
             }
@@ -602,6 +604,7 @@ Differential Revision: https://phabricator.example.com/D000$(git rev-list --coun
             preserve_timestamps: true,
             force_in_memory: true,
             force_on_disk: false,
+            dry_run: false,
             resolve_merge_conflicts: false,
             check_out_commit_options: CheckOutCommitOptions {
                 render_smartlog: false,
diff --git a/git-branchless-test/src/lib.rs b/git-branchless-test/src/lib.rs
@@ -411,6 +411,7 @@ BUG: Expected resolved_interactive ({resolved_interactive:?}) to match interacti
                 preserve_timestamps: get_restack_preserve_timestamps(repo)?,
                 force_in_memory,
                 force_on_disk: *force_on_disk,
+                dry_run: false,
                 resolve_merge_conflicts: *resolve_merge_conflicts,
                 check_out_commit_options: CheckOutCommitOptions {
                     render_smartlog: false,
@@ -726,14 +727,16 @@ fn set_abort_trap(
             preserve_timestamps: true,
             force_in_memory: false,
             force_on_disk: true,
+            dry_run: false,
             resolve_merge_conflicts: false,
             check_out_commit_options: CheckOutCommitOptions {
                 render_smartlog: false,
                 ..Default::default()
             },
         },
     )? {
-        ExecuteRebasePlanResult::Succeeded { rewritten_oids: _ } => {
+        ExecuteRebasePlanResult::Succeeded { rewritten_oids: _ }
+        | ExecuteRebasePlanResult::WouldSucceed => {
             // Do nothing.
         }
         ExecuteRebasePlanResult::DeclinedToMerge { failed_merge_info } => {
@@ -2091,6 +2094,7 @@ fn apply_fixes(
             execute_options,
         )? {
             ExecuteRebasePlanResult::Succeeded { rewritten_oids } => rewritten_oids,
+            ExecuteRebasePlanResult::WouldSucceed => return Ok(Ok(())),
             ExecuteRebasePlanResult::DeclinedToMerge { failed_merge_info } => {
                 writeln!(effects.get_output_stream(), "BUG: encountered merge conflicts during git test fix, but we should not be applying any patches: {failed_merge_info:?}")?;
                 return Ok(Err(ExitCode(1)));
diff --git a/git-branchless/src/commands/amend.rs b/git-branchless/src/commands/amend.rs
@@ -294,6 +294,7 @@ pub fn amend(
             event_tx_id,
             force_in_memory: move_options.force_in_memory,
             force_on_disk: move_options.force_on_disk,
+            dry_run: false,
             preserve_timestamps: get_restack_preserve_timestamps(&repo)?,
             resolve_merge_conflicts: move_options.resolve_merge_conflicts,
             check_out_commit_options: CheckOutCommitOptions {
@@ -313,7 +314,8 @@ pub fn amend(
         )? {
             ExecuteRebasePlanResult::Succeeded {
                 rewritten_oids: None,
-            } => {}
+            }
+            | ExecuteRebasePlanResult::WouldSucceed => {}
 
             ExecuteRebasePlanResult::Succeeded {
                 rewritten_oids: Some(rewritten_oids),
diff --git a/git-branchless/src/commands/mod.rs b/git-branchless/src/commands/mod.rs
@@ -96,6 +96,7 @@ fn command_main(ctx: CommandContext, opts: Opts) -> EyreExitOr<()> {
             move_options,
             fixup,
             insert,
+            dry_run,
         } => git_branchless_move::r#move(
             &effects,
             &git_run_info,
@@ -107,6 +108,7 @@ fn command_main(ctx: CommandContext, opts: Opts) -> EyreExitOr<()> {
             &move_options,
             fixup,
             insert,
+            dry_run,
         )?,
 
         Command::Next {
diff --git a/git-branchless/src/commands/restack.rs b/git-branchless/src/commands/restack.rs
@@ -183,6 +183,8 @@ fn restack_commits(
             Ok(Ok(()))
         }
 
+        ExecuteRebasePlanResult::WouldSucceed => Ok(Ok(())),
+
         ExecuteRebasePlanResult::DeclinedToMerge { failed_merge_info } => {
             failed_merge_info.describe(effects, &repo, merge_conflict_remediation)?;
             Ok(Err(ExitCode(1)))
@@ -325,6 +327,7 @@ pub fn restack(
         preserve_timestamps: get_restack_preserve_timestamps(&repo)?,
         force_in_memory,
         force_on_disk,
+        dry_run: false,
         resolve_merge_conflicts,
         check_out_commit_options: CheckOutCommitOptions {
             additional_args: Default::default(),
diff --git a/git-branchless/src/commands/split.rs b/git-branchless/src/commands/split.rs
@@ -555,6 +555,7 @@ pub fn split(
                 preserve_timestamps: get_restack_preserve_timestamps(&repo)?,
                 force_in_memory,
                 force_on_disk,
+                dry_run: false,
                 resolve_merge_conflicts,
                 check_out_commit_options: CheckOutCommitOptions {
                     additional_args: Default::default(),
@@ -579,7 +580,9 @@ pub fn split(
     };
 
     match result {
-        None | Some(ExecuteRebasePlanResult::Succeeded { rewritten_oids: _ }) => {
+        None
+        | Some(ExecuteRebasePlanResult::Succeeded { rewritten_oids: _ })
+        | Some(ExecuteRebasePlanResult::WouldSucceed) => {
             try_exit_code!(git_run_info
                 .run_direct_no_wrapping(Some(event_tx_id), &["branchless", "smartlog"])?);
             Ok(Ok(()))
diff --git a/git-branchless/src/commands/sync.rs b/git-branchless/src/commands/sync.rs
@@ -91,6 +91,7 @@ pub fn sync(
         preserve_timestamps: get_restack_preserve_timestamps(&repo)?,
         force_in_memory,
         force_on_disk,
+        dry_run: false,
         resolve_merge_conflicts,
         check_out_commit_options: CheckOutCommitOptions {
             additional_args: Default::default(),
@@ -428,6 +429,9 @@ fn execute_plans(
                 ExecuteRebasePlanResult::Succeeded { rewritten_oids: _ } => {
                     success_commits.push(root_commit);
                 }
+                ExecuteRebasePlanResult::WouldSucceed => {
+                    // Do nothing.
+                }
                 ExecuteRebasePlanResult::DeclinedToMerge { failed_merge_info } => {
                     failed_merge_commits.push((root_commit, failed_merge_info));
                 }
diff --git a/git-branchless/tests/test_move.rs b/git-branchless/tests/test_move.rs
