mirrors/jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2025-12-23 06:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
jj/cli/tests
History
Exact
Ilya Grigoriev 684d62e8ae cli: rename --restore-descendants to --preserve-descendant-content AKA --pdc 
Fixes https://github.com/jj-vcs/jj/discussions/5951

There have also been discussions on Discord on and off; people seem to
agree that `--preserve-descendant-content` is clear if verbose. I hope
that a short alias might address that (though I don't intent to make a
habit of having many cryptic short aliases), though we could also decide
to skip it for now and see whether it's really needed.

Some other options considered:

- `keep-descendant-content`. In theory, I like it better, but it'd be
  confusingly similar to `jj squash --keep-emptied` once `jj squash
  --keep-descendant-content` was implemented, and would also conflict
  with its tab completion.
- `--preserve-descendant-contents` with `s` at the end.
- The short version could be `-P`, but that would be confusable with
  `--preserve-content` for `jj rebase`, discussed below. Also, currently
  single-capital-letter flags are usually about lifting some
  restriction, e.g. `-B` for `--allow-backwards`.
- `verbatim-descendants`
- `reparent-descendants`

The last two look a bit cryptic, depending on the person.

Note that `jj rebase` will also need a `--preserve-content` flag for
preserving the content of the commit actually being rebased. I'm not
sure whether that should also be `--pc` or not.
2025-03-23 18:50:43 -07:00
..
common tests: add work_dir.dir(path), make create_dir*() return helper for sub dir 2025-03-18 01:25:08 +00:00
cli-reference@.md.snap cli: rename --restore-descendants to --preserve-descendant-content AKA --pdc 2025-03-23 18:50:43 -07:00
runner.rs lib: rename the LocalBackend to SimpleBackend 2025-03-17 17:17:11 +00:00
test_abandon_command.rs cli: rename --restore-descendants to --preserve-descendant-content AKA --pdc 2025-03-23 18:50:43 -07:00
test_absorb_command.rs cli: truncate list of newly conflicted commits 2025-03-23 01:31:22 +00:00
test_acls.rs tests: port test_acls.rs to TestWorkDir API 2025-03-12 02:18:56 +00:00
test_advance_bookmarks.rs tests: port test_advance_bookmarks.rs to TestWorkDir API 2025-03-12 02:18:56 +00:00
test_alias.rs cli: add revert command 2025-03-17 15:03:29 +00:00
test_backout_command.rs cli: deprecate backout command 2025-03-17 15:03:29 +00:00
test_bookmark_command.rs git: use translated remote symbols in export_refs() 2025-03-23 01:32:29 +00:00
test_builtin_aliases.rs tests: port test_builtin_aliases.rs to TestWorkDir API 2025-03-13 03:45:45 +00:00
test_commit_command.rs tests: port test_commit_command.rs to TestWorkDir API 2025-03-13 03:45:45 +00:00
test_commit_template.rs tests: port test_commit_template.rs to TestWorkDir API 2025-03-13 03:45:45 +00:00
test_completion.rs templates: create builtin_draft_commit_description template 2025-03-22 02:06:10 +00:00
test_concurrent_operations.rs tests: port test_concurrent_operations.rs to TestWorkDir API 2025-03-13 16:13:12 +00:00
test_config_command.rs tests: add work_dir.dir(path), make create_dir*() return helper for sub dir 2025-03-18 01:25:08 +00:00
test_config_schema.rs ci: make sure tests fail in CI if gpg or taplo binaries are not found 2025-03-18 02:18:08 +00:00
test_copy_detection.rs tests: port test_copy_detection.rs to TestWorkDir API 2025-03-13 16:13:12 +00:00
test_debug_command.rs tests: add work_dir.dir(path), make create_dir*() return helper for sub dir 2025-03-18 01:25:08 +00:00
test_debug_init_simple_command.rs lib: rename the LocalBackend to SimpleBackend 2025-03-17 17:17:11 +00:00
test_describe_command.rs tests: port test_describe_command.rs to TestWorkDir API 2025-03-15 02:41:22 +00:00
test_diff_command.rs tests: add work_dir.dir(path), make create_dir*() return helper for sub dir 2025-03-18 01:25:08 +00:00
test_diffedit_command.rs cli: rename --restore-descendants to --preserve-descendant-content AKA --pdc 2025-03-23 18:50:43 -07:00
test_duplicate_command.rs tests: port test_duplicate_command.rs to TestWorkDir API 2025-03-19 01:47:00 +00:00
test_edit_command.rs tests: port test_edit_command.rs to TestWorkDir API 2025-03-19 01:47:00 +00:00
test_evolog_command.rs templates: create builtin_draft_commit_description template 2025-03-22 02:06:10 +00:00
test_file_annotate_command.rs tests: port test_file_annotate_command.rs to TestWorkDir API 2025-03-19 01:47:00 +00:00
test_file_chmod_command.rs cli: truncate list of newly conflicted commits 2025-03-23 01:31:22 +00:00
test_file_show_command.rs tests: port test_file_show_command.rs to TestWorkDir API 2025-03-19 01:47:00 +00:00
test_file_track_untrack_commands.rs tests: port test_file_track_untrack_commands.rs to TestWorkDir API 2025-03-19 14:52:52 +00:00
test_fix_command.rs tests: port test_fix_command.rs to TestWorkDir API 2025-03-19 14:52:52 +00:00
test_generate_md_cli_help.rs tests: resolve directory path to run_jj_in() relative to env_root 2025-02-25 15:40:14 +00:00
test_git_clone.rs tests: port test_git_clone.rs to TestWorkDir API 2025-03-21 01:19:20 +00:00
test_git_colocated.rs git: use translated remote symbols in export_refs() 2025-03-23 01:32:29 +00:00
test_git_fetch.rs tests: port test_git_fetch.rs to TestWorkDir API 2025-03-21 01:19:20 +00:00
test_git_import_export.rs git: use translated remote symbols in export_refs() 2025-03-23 01:32:29 +00:00
test_git_init.rs tests: port test_git_init.rs to TestWorkDir API 2025-03-23 01:31:28 +00:00
test_git_private_commits.rs tests: port test_git_private_commits.rs to TestWorkDir API 2025-03-23 01:31:28 +00:00
test_git_push.rs tests: port test_git_push.rs to TestWorkDir API 2025-03-23 01:31:28 +00:00
test_git_remotes.rs tests: port test_git_remotes.rs to TestWorkDir API 2025-03-23 01:31:28 +00:00
test_gitignores.rs tests: port test_gitignores.rs to TestWorkDir API 2025-03-23 01:31:28 +00:00
test_global_opts.rs cli: rename --restore-descendants to --preserve-descendant-content AKA --pdc 2025-03-23 18:50:43 -07:00
test_help_command.rs cli: add revert command 2025-03-17 15:03:29 +00:00
test_immutable_commits.rs cli: remove unsquash subcommand 2025-03-07 01:46:19 +00:00
test_interdiff_command.rs tests: resolve directory path to run_jj_in() relative to env_root 2025-02-25 15:40:14 +00:00
test_log_command.rs templates: create builtin_draft_commit_description template 2025-03-22 02:06:10 +00:00
test_new_command.rs tests: run insta --force-update-snapshots 2025-03-06 21:35:08 +00:00
test_next_prev_commands.rs cli: print list of next/prev candidates to stderr 2025-03-15 06:29:01 +00:00
test_operations.rs templates: create builtin_draft_commit_description template 2025-03-22 02:06:10 +00:00
test_parallelize_command.rs tests: resolve directory path to run_jj_in() relative to env_root 2025-02-25 15:40:14 +00:00
test_rebase_command.rs tests: move current_operation_id() to TestWorkDir 2025-03-11 01:23:13 +00:00
test_repo_change_report.rs cli: truncate list of newly conflicted commits 2025-03-23 01:31:22 +00:00
test_resolve_command.rs cli: truncate list of newly conflicted commits 2025-03-23 01:31:22 +00:00
test_restore_command.rs cli: rename --restore-descendants to --preserve-descendant-content AKA --pdc 2025-03-23 18:50:43 -07:00
test_revert_command.rs cli: add revert command 2025-03-17 15:03:29 +00:00
test_revset_output.rs cli string patterns: explain case-insensitive string prefixes 2025-03-12 03:09:03 +00:00
test_root.rs lib: rename the LocalBackend to SimpleBackend 2025-03-17 17:17:11 +00:00
test_shell_completion.rs tests: resolve directory path to run_jj_in() relative to env_root 2025-02-25 15:40:14 +00:00
test_show_command.rs templates: create builtin_draft_commit_description template 2025-03-22 02:06:10 +00:00
test_sign_unsign_commands.rs sign: add --key argument to jj sign 2025-02-28 07:52:57 +00:00
test_simplify_parents_command.rs tests: move current_operation_id() to TestWorkDir 2025-03-11 01:23:13 +00:00
test_sparse_command.rs cleanup: enable unused_trait_names clippy lint and run clippy --fix 2025-03-16 00:35:56 +00:00
test_split_command.rs tests: run insta --force-update-snapshots 2025-03-06 21:35:08 +00:00
test_squash_command.rs cli: truncate list of newly conflicted commits 2025-03-23 01:31:22 +00:00
test_status_command.rs tests: pass &TestWorkDir to create_commit*() helper 2025-03-11 01:23:13 +00:00
test_tag_command.rs tests: resolve directory path to run_jj_in() relative to env_root 2025-02-25 15:40:14 +00:00
test_templater.rs templates: create builtin_draft_commit_description template 2025-03-22 02:06:10 +00:00
test_undo.rs tests: move current_operation_id() to TestWorkDir 2025-03-11 01:23:13 +00:00
test_util_command.rs tests: move current_operation_id() to TestWorkDir 2025-03-11 01:23:13 +00:00
test_working_copy.rs tests: run insta --force-update-snapshots 2025-03-06 21:35:08 +00:00
test_workspaces.rs cli: extract common formatting function for updated working-copy stats 2025-03-18 14:35:54 +00:00