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
Scott Taylor 8843eee35c resolve: add --select option to interactively choose a side 
This should be more intuitive than the `:ours` and `:theirs` merge
tools since it can display the exact labels of all of the terms. It also
merges hunks before selecting the term, which should make it more
consistent with what's shown in conflicted files.
2025-12-22 17:30:39 -06:00
..
common tests: set up local TMPDIR which should be cleaned up by test runner 2025-12-21 01:54:31 +00:00
sample-configs cli: enable glob string matching globally 2025-12-15 04:27:32 +00:00
cli-reference@.md.snap resolve: add --select option to interactively choose a side 2025-12-22 17:30:39 -06:00
datatest_config_schema.rs deps: update jsonschema to 0.37.1, adapt to breaking changes 2025-11-25 17:58:09 +00:00
datatest_runner.rs tests: use jsonschema directly instead of taplo(1) 2025-08-08 16:19:30 +00:00
runner.rs cli: add a very basic jj file search (like git grep) 2025-12-18 06:31:37 +00:00
test_abandon_command.rs cli: enable glob string matching globally 2025-12-15 04:27:32 +00:00
test_absorb_command.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +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 cli: enable glob string matching globally 2025-12-15 04:27:32 +00:00
test_alias.rs docs: jj-vcs.github.io -> jj-vcs.dev 2025-11-26 00:36:39 +00:00
test_bisect_command.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_bookmark_command.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_builtin_aliases.rs cli: enable glob string matching globally 2025-12-15 04:27:32 +00:00
test_commit_command.rs config: remove outdated migration rules 2025-12-11 00:49:58 +00:00
test_commit_template.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_completion.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_concurrent_operations.rs tests: update cargo insta snapshots 2025-12-09 18:59:34 +00:00
test_config_command.rs tests: update cargo insta snapshots 2025-12-09 18:59:34 +00:00
test_config_schema.rs deps: update jsonschema to 0.37.1, adapt to breaking changes 2025-11-25 17:58:09 +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 cli: add debug command that dumps stats of stacked table 2025-12-17 10:38:11 +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 config: remove outdated migration rules 2025-12-11 00:49:58 +00:00
test_diff_command.rs cli: remove newline addition between template and content 2025-12-22 02:47:58 +00:00
test_diffedit_command.rs rewrite: add conflict labels when merging commit trees 2025-12-20 04:03:57 +00:00
test_duplicate_command.rs cli: deprecate --destination/-d in favor of --onto/-o 2025-11-08 14:56:37 +00:00
test_edit_command.rs cli: edit: parse -r option properly 2025-12-19 09:39:53 +00:00
test_evolog_command.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_file_annotate_command.rs rewrite: add conflict labels when merging commit trees 2025-12-20 04:03:57 +00:00
test_file_chmod_command.rs rewrite: add conflict labels when merging commit trees 2025-12-20 04:03:57 +00:00
test_file_list_command.rs cli: warn when jj file list fileset doesn't match 2025-11-14 14:51:27 +00:00
test_file_search_command.rs conflicts: show "noeol" state separately for each side of a diff 2025-12-20 17:43:41 +00:00
test_file_show_command.rs rewrite: add conflict labels for rebased commits 2025-12-20 04:03:57 +00:00
test_file_track_untrack_commands.rs tests: update cargo insta snapshots 2025-12-09 18:59:34 +00:00
test_fix_command.rs rewrite: add conflict labels when merging commit trees 2025-12-20 04:03:57 +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_gerrit_upload.rs cli: gerrit: remove excessive newlines and "warning:" prefix, respect --quiet 2025-12-18 00:13:25 +00:00
test_git_clone.rs cli: enable glob string matching globally 2025-12-15 04:27:32 +00:00
test_git_colocated.rs rewrite: add conflict labels for rebased commits 2025-12-20 04:03:57 +00:00
test_git_colocation.rs cli: git: print current Git HEAD by "colocation status" 2025-12-10 14:26:47 +00:00
test_git_fetch.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_git_import_export.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_git_init.rs cli: enable glob string matching globally 2025-12-15 04:27:32 +00:00
test_git_private_commits.rs cli: enable glob string matching globally 2025-12-15 04:27:32 +00:00
test_git_push.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_git_remotes.rs cli,lib: add suport for the push URL in git remote add 2025-12-10 09:15:06 +00:00
test_git_root.rs tests: update cargo insta snapshots 2025-12-09 18:59:34 +00:00
test_gitignores.rs git: write change-id header by default 2025-05-08 23:05:38 +00:00
test_global_opts.rs templates: remove git_head() from default and test templates 2025-12-10 14:26:47 +00:00
test_help_command.rs cli: help: look up subcommand without using error path 2025-09-05 00:26:12 +00:00
test_identical_commits.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_immutable_commits.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_interdiff_command.rs conflicts: update conflict marker format 2025-12-20 04:03:57 +00:00
test_log_command.rs cli: remove newline addition between template and content 2025-12-22 02:47:58 +00:00
test_metaedit_command.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_new_command.rs rewrite: add conflict labels when merging commit trees 2025-12-20 04:03:57 +00:00
test_next_prev_commands.rs rewrite: add conflict labels for rebased commits 2025-12-20 04:03:57 +00:00
test_op_revert_command.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_operations.rs cli: remove newline addition between template and content 2025-12-22 02:47:58 +00:00
test_parallelize_command.rs revset: enable glob string matching by default 2025-12-15 04:27:32 +00:00
test_rebase_command.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_repo_change_report.rs cli_util: use change offset in conflict hint when necessary 2025-12-21 14:44:31 +00:00
test_resolve_command.rs resolve: add --select option to interactively choose a side 2025-12-22 17:30:39 -06:00
test_restore_command.rs rewrite: add conflict labels for rebased commits 2025-12-20 04:03:57 +00:00
test_revert_command.rs tests: update cargo insta snapshots 2025-12-09 18:59:34 +00:00
test_revset_output.rs revset: enable glob string matching by default 2025-12-15 04:27:32 +00:00
test_root.rs lib: rename the LocalBackend to SimpleBackend 2025-03-17 17:17:11 +00:00
test_show_command.rs cli: show: parse -r option properly 2025-12-19 09:39:53 +00:00
test_sign_unsign_commands.rs tests: exercise unsigning triggering rebasing 2025-12-12 02:55:55 +00:00
test_simplify_parents_command.rs tests: get current operation id without running jj 2025-08-26 00:27:29 +00:00
test_sparse_command.rs tests: exercise sparse edit with invalid path 2025-12-12 02:55:55 +00:00
test_split_command.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00
test_squash_command.rs cli: remove newline addition between template and content 2025-12-22 02:47:58 +00:00
test_status_command.rs merged_tree: migrate more callers to MergedTree::conflicts_matching 2025-12-22 14:58:57 +00:00
test_tag_command.rs cli: enable glob string matching globally 2025-12-15 04:27:32 +00:00
test_templater.rs cli_util: use change offset in conflict hint when necessary 2025-12-21 14:44:31 +00:00
test_undo_redo_commands.rs cli undo: warn about undoing push operations 2025-11-02 16:13:00 +00:00
test_util_command.rs tests: exercise util install-man-pages 2025-12-12 02:55:55 +00:00
test_working_copy.rs rewrite: add conflict labels when merging commit trees 2025-12-20 04:03:57 +00:00
test_workspaces.rs templates: add "divergent" label to log for divergent changes 2025-12-20 16:55:51 +00:00