ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/cli/tests
Martin von Zweigbergk e6ef217d90 squash: learn --from/--into flags
This was proposed by @Brixy in
https://github.com/martinvonz/jj/discussions/2882 a while ago. There
seems to be pretty strong consensus that it's a good idea.

I've copied the added test cases from `test_move_command.rs`, just
replacing `move` by `squash`, `--to` by `--into`, and deleting the
test of a no-arg invocation (`jj move` fails, `jj squash` does not -
it defaults to squashing into the parent).
2024-03-11 09:25:17 -07:00
..
common cargo: upgrade chrono from 0.4.34 to 0.4.35 2024-03-06 09:20:23 -08:00
cli-reference@.md.snap squash: learn --from/--into flags 2024-03-11 09:25:17 -07:00
runner.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_abandon_command.rs rewrite: default to not simplifying ancestor merges 2024-02-19 14:20:18 -08:00
test_alias.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_branch_command.rs cli branch list: list tracked branches 2024-02-26 01:05:07 +00:00
test_builtin_aliases.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_cat_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_checkout.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_chmod_command.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_commit_command.rs cli: add --tool=<name> option to diff/merge editing commands 2024-03-04 01:33:43 +09:00
test_commit_template.rs templater: add string.len() and list.len() methods 2024-03-01 08:51:20 +09:00
test_concurrent_operations.rs op_store: add metadata flag for ops representing working-copy snapshot 2024-02-19 22:44:38 -08:00
test_config_command.rs cli: colorize output of "config list" 2024-03-06 11:38:57 +09:00
test_debug_command.rs op_store: add metadata flag for ops representing working-copy snapshot 2024-02-19 22:44:38 -08:00
test_describe_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_diff_command.rs Add --context flag for diffs. 2024-03-05 07:48:23 +01:00
test_diffedit_command.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_duplicate_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_edit_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_generate_md_cli_help.rs docs, CLI reference: use include-markdown instead of a symlink 2024-02-12 10:28:09 -08:00
test_git_clone.rs cli: list new remote branches during git fetch 2024-02-18 17:36:01 +01:00
test_git_colocated.rs tests: avoid deprecated jj co 2024-03-06 10:19:46 -08:00
test_git_fetch.rs cli: list new remote branches during git fetch 2024-02-18 17:36:01 +01:00
test_git_import_export.rs cli: list new remote branches during git fetch 2024-02-18 17:36:01 +01:00
test_git_init.rs tests: move strip_last_line() to common module 2024-03-01 08:51:06 +09:00
test_git_push.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_git_remotes.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_git_submodule.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_gitignores.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_global_opts.rs repo_path: show more detailed error if filesystem path failed to parse 2024-03-09 11:01:43 +09:00
test_immutable_commits.rs squash: fail on merge commits before failing on immutable commits 2024-03-10 21:17:08 -07:00
test_init_command.rs tests: move strip_last_line() to common module 2024-03-01 08:51:06 +09:00
test_interdiff_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_log_command.rs Add configuration options for node symbols in the graphs. 2024-03-09 21:16:58 +01:00
test_move_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_new_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_next_prev_commands.rs tests: avoid deprecated jj co 2024-03-06 10:19:46 -08:00
test_obslog_command.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_operations.rs cli: enrich the error about required template value with a hint 2024-03-06 08:12:40 +05:00
test_rebase_command.rs cli: make rebase --skip-empty keep already empty commits 2024-02-25 16:39:05 -08:00
test_repo_change_report.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_resolve_command.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_restore_command.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_revset_output.rs repo_path: show more detailed error if filesystem path failed to parse 2024-03-09 11:01:43 +09:00
test_root.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_shell_completion.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_show_command.rs cli: enrich the error about required template value with a hint 2024-03-06 08:12:40 +05:00
test_sparse_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_split_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_squash_command.rs squash: learn --from/--into flags 2024-03-11 09:25:17 -07:00
test_status_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_tag_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_templater.rs templater: expand similarity hint with aliases 2024-02-28 09:03:04 +09:00
test_tree_level_conflicts.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_undo.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_unsquash_command.rs tests: avoid deprecated jj co 2024-03-06 10:19:46 -08:00
test_untrack_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_util_command.rs op_store: add metadata flag for ops representing working-copy snapshot 2024-02-19 22:44:38 -08:00
test_working_copy.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_workspaces.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00