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

cli: refactor out rebase_to_destination_parent()

Browse source 
Refactor out the parent-rebasing parts of show_predecessor_patch() to
create rebase_to_destination_parent(). This will be reused for `jj
interdiff`.
This commit is contained in:
Glen Choo 2022-08-30 11:47:38 -07:00
parent d53d9020c9
commit ed415c17b0
1 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/commands.rs
View file

@ -3225,29 +3225,41 @@ fn show_predecessor_patch(
commit: &Commit,
diff_format: DiffFormat,
) -> Result<(), CommandError> {
if let Some(predecessor) = commit.predecessors().first() {
let predecessor_tree = if predecessor.parent_ids() == commit.parent_ids() {
predecessor.tree()
let predecessors = commit.predecessors();
let predecessor = match predecessors.first() {
Some(predecessor) => predecessor,
None => return Ok(()),
};
let predecessor_tree = rebase_to_dest_parent(workspace_command, predecessor, commit)?;
let diff_iterator = predecessor_tree.diff(&commit.tree(), &EverythingMatcher);
show_diff(formatter, workspace_command, diff_iterator, diff_format)
}
fn rebase_to_dest_parent(
workspace_command: &WorkspaceCommandHelper,
source: &Commit,
destination: &Commit,
) -> Result<Tree, CommandError> {
if source.parent_ids() == destination.parent_ids() {
Ok(source.tree())
} else {
// Rebase the predecessor to have the current commit's parent(s) and use that
// tree as base
let new_parent_tree =
merge_commit_trees(workspace_command.repo().as_repo_ref(), &commit.parents());
let old_parent_tree = merge_commit_trees(
let destination_parent_tree = merge_commit_trees(
workspace_command.repo().as_repo_ref(),
&predecessor.parents(),
&destination.parents(),
);
let rebased_tree_id =
merge_trees(&new_parent_tree, &old_parent_tree, &predecessor.tree())?;
workspace_command
let source_parent_tree =
merge_commit_trees(workspace_command.repo().as_repo_ref(), &source.parents());
let rebased_tree_id = merge_trees(
&destination_parent_tree,
&source_parent_tree,
&source.tree(),
)?;
let tree = workspace_command
.repo()
.store()
.get_tree(&RepoPath::root(), &rebased_tree_id)?
};
let diff_iterator = predecessor_tree.diff(&commit.tree(), &EverythingMatcher);
show_diff(formatter, workspace_command, diff_iterator, diff_format)?;
.get_tree(&RepoPath::root(), &rebased_tree_id)?;
Ok(tree)
}
Ok(())
}
fn edit_description(