-
Notifications
You must be signed in to change notification settings - Fork 346
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commands: move duplicate code to duplicate.rs
- Loading branch information
1 parent
e4a1af1
commit 061dc81
Showing
2 changed files
with
109 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| // Copyright 2020 The Jujutsu Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use std::io::Write; | ||
|
|
||
| use indexmap::{IndexMap, IndexSet}; | ||
| use jj_lib::commit::Commit; | ||
| use jj_lib::repo::Repo; | ||
| use tracing::instrument; | ||
|
|
||
| use crate::cli_util::{ | ||
| resolve_multiple_nonempty_revsets, short_commit_hash, user_error, CommandError, CommandHelper, | ||
| RevisionArg, | ||
| }; | ||
| use crate::ui::Ui; | ||
|
|
||
| /// Create a new change with the same content as an existing one | ||
| #[derive(clap::Args, Clone, Debug)] | ||
| pub(crate) struct DuplicateArgs { | ||
| /// The revision(s) to duplicate | ||
| #[arg(default_value = "@")] | ||
| revisions: Vec<RevisionArg>, | ||
| /// Ignored (but lets you pass `-r` for consistency with other commands) | ||
| #[arg(short = 'r', hide = true)] | ||
| unused_revision: bool, | ||
| } | ||
|
|
||
| #[instrument(skip_all)] | ||
| pub(crate) fn cmd_duplicate( | ||
| ui: &mut Ui, | ||
| command: &CommandHelper, | ||
| args: &DuplicateArgs, | ||
| ) -> Result<(), CommandError> { | ||
| let mut workspace_command = command.workspace_helper(ui)?; | ||
| let to_duplicate: IndexSet<Commit> = | ||
| resolve_multiple_nonempty_revsets(&args.revisions, &workspace_command, ui)?; | ||
| if to_duplicate | ||
| .iter() | ||
| .any(|commit| commit.id() == workspace_command.repo().store().root_commit_id()) | ||
| { | ||
| return Err(user_error("Cannot duplicate the root commit")); | ||
| } | ||
| let mut duplicated_old_to_new: IndexMap<Commit, Commit> = IndexMap::new(); | ||
|
|
||
| let mut tx = workspace_command | ||
| .start_transaction(&format!("duplicating {} commit(s)", to_duplicate.len())); | ||
| let base_repo = tx.base_repo().clone(); | ||
| let store = base_repo.store(); | ||
| let mut_repo = tx.mut_repo(); | ||
|
|
||
| for original_commit_id in base_repo | ||
| .index() | ||
| .topo_order(&mut to_duplicate.iter().map(|c| c.id())) | ||
| .into_iter() | ||
| { | ||
| // Topological order ensures that any parents of `original_commit` are | ||
| // either not in `to_duplicate` or were already duplicated. | ||
| let original_commit = store.get_commit(&original_commit_id).unwrap(); | ||
| let new_parents = original_commit | ||
| .parents() | ||
| .iter() | ||
| .map(|parent| { | ||
| if let Some(duplicated_parent) = duplicated_old_to_new.get(parent) { | ||
| duplicated_parent | ||
| } else { | ||
| parent | ||
| } | ||
| .id() | ||
| .clone() | ||
| }) | ||
| .collect(); | ||
| let new_commit = mut_repo | ||
| .rewrite_commit(command.settings(), &original_commit) | ||
| .generate_new_change_id() | ||
| .set_parents(new_parents) | ||
| .write()?; | ||
| duplicated_old_to_new.insert(original_commit, new_commit); | ||
| } | ||
|
|
||
| for (old, new) in duplicated_old_to_new.iter() { | ||
| write!( | ||
| ui.stderr(), | ||
| "Duplicated {} as ", | ||
| short_commit_hash(old.id()) | ||
| )?; | ||
| tx.write_commit_summary(ui.stderr_formatter().as_mut(), new)?; | ||
| writeln!(ui.stderr())?; | ||
| } | ||
| tx.finish(ui)?; | ||
| Ok(()) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters