mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-29 23:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

cli: merge trees via MergedTree in rebase_to_dest_parent()

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-08-27 07:08:32 -07:00 committed by Martin von Zweigbergk
parent bd6098e09e
commit 494026a9bf
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
cli/src/commands/mod.rs
View file

@ -47,7 +47,6 @@ use jj_lib::revset_graph::{
}; };
use jj_lib::rewrite::{back_out_commit, merge_commit_trees, rebase_commit, DescendantRebaser}; use jj_lib::rewrite::{back_out_commit, merge_commit_trees, rebase_commit, DescendantRebaser};
use jj_lib::settings::UserSettings; use jj_lib::settings::UserSettings;
use jj_lib::tree::{merge_trees, Tree};
use jj_lib::working_copy::SnapshotOptions; use jj_lib::working_copy::SnapshotOptions;
use jj_lib::workspace::Workspace; use jj_lib::workspace::Workspace;
use jj_lib::{conflicts, file_util, revset}; use jj_lib::{conflicts, file_util, revset};
@ -1837,11 +1836,7 @@ fn show_predecessor_patch(
Some(predecessor) => predecessor, Some(predecessor) => predecessor,
None => return Ok(()), None => return Ok(()),
}; };
let predecessor_tree = MergedTree::legacy(rebase_to_dest_parent( let predecessor_tree = rebase_to_dest_parent(workspace_command, predecessor, commit)?;
workspace_command,
predecessor,
commit,
)?);
let tree = commit.merged_tree()?; let tree = commit.merged_tree()?;
diff_util::show_diff( diff_util::show_diff(
ui, ui,
@ -1864,7 +1859,7 @@ fn cmd_interdiff(
let from = workspace_command.resolve_single_rev(args.from.as_deref().unwrap_or("@"), ui)?; let from = workspace_command.resolve_single_rev(args.from.as_deref().unwrap_or("@"), ui)?;
let to = workspace_command.resolve_single_rev(args.to.as_deref().unwrap_or("@"), ui)?; let to = workspace_command.resolve_single_rev(args.to.as_deref().unwrap_or("@"), ui)?;
let from_tree = MergedTree::legacy(rebase_to_dest_parent(&workspace_command, &from, &to)?); let from_tree = rebase_to_dest_parent(&workspace_command, &from, &to)?;
let to_tree = to.merged_tree()?; let to_tree = to.merged_tree()?;
let matcher = workspace_command.matcher_from_values(&args.paths)?; let matcher = workspace_command.matcher_from_values(&args.paths)?;
let diff_formats = diff_util::diff_formats_for(command.settings(), &args.format)?; let diff_formats = diff_util::diff_formats_for(command.settings(), &args.format)?;
@ -1884,19 +1879,20 @@ fn rebase_to_dest_parent(
workspace_command: &WorkspaceCommandHelper, workspace_command: &WorkspaceCommandHelper,
source: &Commit, source: &Commit,
destination: &Commit, destination: &Commit,
) -> Result<Tree, CommandError> { ) -> Result<MergedTree, CommandError> {
if source.parent_ids() == destination.parent_ids() { if source.parent_ids() == destination.parent_ids() {
Ok(source.tree()) Ok(source.merged_tree()?)
} else { } else {
let destination_parent_tree = let destination_parent_tree = MergedTree::legacy(merge_commit_trees(
merge_commit_trees(workspace_command.repo().as_ref(), &destination.parents())?; workspace_command.repo().as_ref(),
let source_parent_tree = &destination.parents(),
merge_commit_trees(workspace_command.repo().as_ref(), &source.parents())?; )?);
let rebased_tree = merge_trees( let source_parent_tree = MergedTree::legacy(merge_commit_trees(
&destination_parent_tree, workspace_command.repo().as_ref(),
&source_parent_tree, &source.parents(),
&source.tree(), )?);
)?; let source_tree = source.merged_tree()?;
let rebased_tree = destination_parent_tree.merge(&source_parent_tree, &source_tree)?;
Ok(rebased_tree) Ok(rebased_tree)
} }
} }