mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-16 00:56:23 +00:00
ce3436b92b
The destination commits are selected based on annotation, which I think is basically the same as "hg absorb" (except for handling of consecutive hunks.) However, we don't compute a full interleaved delta right now, and the hunks are merged in the same way as "jj squash". This means absorbed hunks might produce conflicts if no context lines exist. Still I think this is more intuitive than selecting destination commits based on patch commutativity. I've left inline comments to the tests where behavior is different from "hg absorb", but these aren't exhaustively checked. Closes #170
79 lines
1.9 KiB
Rust
79 lines
1.9 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_absorb_command;
|
|
mod test_acls;
|
|
mod test_advance_bookmarks;
|
|
mod test_alias;
|
|
mod test_backout_command;
|
|
mod test_bookmark_command;
|
|
mod test_builtin_aliases;
|
|
mod test_checkout;
|
|
mod test_commit_command;
|
|
mod test_commit_template;
|
|
mod test_completion;
|
|
mod test_concurrent_operations;
|
|
mod test_config_command;
|
|
mod test_copy_detection;
|
|
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_evolog_command;
|
|
mod test_file_annotate_command;
|
|
mod test_file_chmod_command;
|
|
mod test_file_show_command;
|
|
mod test_file_track_untrack_commands;
|
|
mod test_fix_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_private_commits;
|
|
mod test_git_push;
|
|
mod test_git_remotes;
|
|
mod test_git_submodule;
|
|
mod test_gitignores;
|
|
mod test_global_opts;
|
|
mod test_help_command;
|
|
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_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_simplify_parents_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_undo;
|
|
mod test_unsquash_command;
|
|
mod test_util_command;
|
|
mod test_working_copy;
|
|
mod test_workspaces;
|