mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-25 16:09:56 +00:00
64e242ab3a
Parallelize revisions by making them siblings Running `jj parallelize 1::2` will transform the history like this: ```text 3 | 3 2 / \ | -> 1 2 1 \ / | 0 0 ``` Each of the target revisions is rebased onto the parents of the root(s) of the target revset (not to be confused with the repo root). The children of the head(s) of the target revset are rebased onto the target revisions. The target revset is the union of the REVISIONS arguments. The target revset being parallelized must satisfy several conditions, otherwise the command will fail. 1. The heads of the target revset must not have different children. 2. The roots of the target revset must not have different parents. 3. The parents of all target revisions except the roots must also be parallelized. This means that the target revisions must be connected.
70 lines
1.6 KiB
Rust
70 lines
1.6 KiB
Rust
use std::path::PathBuf;
|
|
|
|
mod common;
|
|
|
|
#[test]
|
|
fn test_no_forgotten_test_files() {
|
|
let test_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests");
|
|
testutils::assert_no_forgotten_test_files(&test_dir);
|
|
}
|
|
|
|
mod test_abandon_command;
|
|
mod test_alias;
|
|
mod test_branch_command;
|
|
mod test_builtin_aliases;
|
|
mod test_cat_command;
|
|
mod test_checkout;
|
|
mod test_chmod_command;
|
|
mod test_commit_command;
|
|
mod test_commit_template;
|
|
mod test_concurrent_operations;
|
|
mod test_config_command;
|
|
mod test_debug_command;
|
|
mod test_describe_command;
|
|
mod test_diff_command;
|
|
mod test_diffedit_command;
|
|
mod test_duplicate_command;
|
|
mod test_edit_command;
|
|
mod test_generate_md_cli_help;
|
|
mod test_git_clone;
|
|
mod test_git_colocated;
|
|
mod test_git_fetch;
|
|
mod test_git_import_export;
|
|
mod test_git_init;
|
|
mod test_git_push;
|
|
mod test_git_remotes;
|
|
mod test_git_submodule;
|
|
mod test_gitignores;
|
|
mod test_global_opts;
|
|
mod test_immutable_commits;
|
|
mod test_init_command;
|
|
mod test_interdiff_command;
|
|
mod test_log_command;
|
|
mod test_move_command;
|
|
mod test_new_command;
|
|
mod test_next_prev_commands;
|
|
mod test_obslog_command;
|
|
mod test_operations;
|
|
mod test_parallelize_command;
|
|
mod test_rebase_command;
|
|
mod test_repo_change_report;
|
|
mod test_resolve_command;
|
|
mod test_restore_command;
|
|
mod test_revset_output;
|
|
mod test_root;
|
|
mod test_shell_completion;
|
|
mod test_show_command;
|
|
mod test_sparse_command;
|
|
mod test_split_command;
|
|
mod test_squash_command;
|
|
mod test_status_command;
|
|
mod test_tag_command;
|
|
mod test_templater;
|
|
mod test_tree_level_conflicts;
|
|
mod test_undo;
|
|
mod test_unsquash_command;
|
|
mod test_untrack_command;
|
|
mod test_util_command;
|
|
mod test_working_copy;
|
|
mod test_workspaces;
|