Scott Taylor 7df0f16fe0 resolve: try to resolve all conflicted files in fileset ... If many files are conflicted, it would be nice to be able to resolve all conflicts at once without having to run `jj resolve` multiple times. This is especially nice for merge tools which try to automatically resolve conflicts without user input, but it is also good for regular merge editors like VS Code. This change makes the behavior of `jj resolve` more consistent with other commands which accept filesets since it will use the entire fileset instead of picking an arbitrary file from the fileset. Since we don't support passing directories to merge tools yet, the current implementation just calls the merge tool repeatedly in a loop until every file is resolved, or until an error occurs. If an error occurs after successfully resolving at least one file, the transaction is committed with all of the successful changes before returning the error. This means the user can just close the editor at any point to cancel resolution on all remaining files.		2025-01-08 23:52:21 +00:00
..
common	cli: git clone: convert local Git remote path to slash-separated path	2024-12-23 09:40:52 +09:00
cli-reference@.md.snap	resolve: try to resolve all conflicted files in fileset	2025-01-08 23:52:21 +00:00
runner.rs	cli: delete deprecated jj checkout command	2024-11-21 11:50:03 -06:00
test_abandon_command.rs	cli: abandon, describe: parse -rREV option properly	2024-12-23 22:58:06 +09:00
test_absorb_command.rs	absorb: abandon source commit if it becomes discardable	2024-12-21 09:19:54 +09:00
test_acls.rs	diff: remove duplicated source message from AccessDenied error	2024-10-23 23:51:21 +09:00
test_advance_bookmarks.rs	everything: Rename branches to bookmarks	2024-09-11 18:54:45 +02:00
test_alias.rs	cli: warn if command matches with aliases inserted by --config* arguments	2025-01-08 09:40:31 +09:00
test_backout_command.rs	cli: drop support for jj init --{git, git_repo}	2025-01-03 10:15:01 -06:00
test_bookmark_command.rs	cli: refer to revset argument using REVSET(S) in synopsis	2024-12-18 10:13:44 -08:00
test_builtin_aliases.rs	cli: replace --config-toml=TOML with --config=NAME=VALUE	2024-12-17 20:12:12 +09:00
test_commit_command.rs	cli: fix interactive diff selection to not retain unmatched files	2025-01-04 22:21:37 +09:00
test_commit_template.rs	sign: Add templater methods to show signature info	2025-01-04 13:24:08 +01:00
test_completion.rs	docs/cli: update URLs to from martinvonz user to jj-vcs org	2024-12-17 12:44:44 -08:00
test_concurrent_operations.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00
test_config_command.rs	Back out "config: merge and print inline tables as values"	2025-01-08 05:24:55 +00:00
test_copy_detection.rs	copy-tracking: add a command line driver with a simple test	2024-07-03 20:26:30 -04:00
test_debug_command.rs	revset: reorganize expression resolution/evaluation methods	2024-11-08 10:34:02 +09:00
test_describe_command.rs	cli: drop support for jj init --{git, git_repo}	2025-01-03 10:15:01 -06:00
test_diff_command.rs	diff: add merge-tools.*.diff-expected-exit-codes	2025-01-08 08:03:59 +00:00
test_diffedit_command.rs	tests: leverage set_up_fake_diff_editor() in test_diffedit_3pane()	2024-12-20 19:28:01 +09:00
test_duplicate_command.rs	docs/cli: update URLs to from martinvonz user to jj-vcs org	2024-12-17 12:44:44 -08:00
test_edit_command.rs	cli: refer to revset argument using REVSET(S) in synopsis	2024-12-18 10:13:44 -08:00
test_evolog_command.rs	evolog: Implement --reversed flag	2025-01-02 20:21:59 -05:00
test_file_annotate_command.rs	cli: don't use format_*() in annotate template, truncate author, omit commit id	2024-11-05 14:49:57 +09:00
test_file_chmod_command.rs	docs/cli: update URLs to from martinvonz user to jj-vcs org	2024-12-17 12:44:44 -08:00
test_file_show_command.rs	tests: rename test_file_print_command.rs to_file_show_command.rs	2024-10-04 20:52:59 +09:00
test_file_track_untrack_commands.rs	cli: refer to fileset argument using FILESETS in synopsis	2024-12-18 10:13:44 -08:00
test_fix_command.rs	cli: drop support for jj init --{git, git_repo}	2025-01-03 10:15:01 -06:00
test_generate_md_cli_help.rs
test_git_clone.rs	cli: resolve settings for newly initialized/cloned workspace	2025-01-06 10:39:48 +09:00
test_git_colocated.rs	git: add dummy conflict to index if necessary	2025-01-06 19:17:51 -06:00
test_git_fetch.rs	docs/cli: update URLs to from martinvonz user to jj-vcs org	2024-12-17 12:44:44 -08:00
test_git_import_export.rs	templates: make op_summary more readable	2024-10-13 20:06:03 -07:00
test_git_init.rs	cli: resolve settings for newly initialized/cloned workspace	2025-01-06 10:39:48 +09:00
test_git_private_commits.rs	cli: replace --config-toml=TOML with --config=NAME=VALUE	2024-12-17 20:12:12 +09:00
test_git_push.rs	cli: git clone: convert local Git remote path to slash-separated path	2024-12-23 09:40:52 +09:00
test_git_remotes.rs	everything: Rename branches to bookmarks	2024-09-11 18:54:45 +02:00
test_git_submodule.rs
test_gitignores.rs	everything: Rename branches to bookmarks	2024-09-11 18:54:45 +02:00
test_global_opts.rs	config: load system host/user name by CLI and insert as env-base layer	2025-01-04 17:54:28 +09:00
test_help_command.rs	cli: refer to revset argument using REVSET(S) in synopsis	2024-12-18 10:13:44 -08:00
test_immutable_commits.rs	docs/cli: update URLs to from martinvonz user to jj-vcs org	2024-12-17 12:44:44 -08:00
test_init_command.rs	cli: drop support for jj init --{git, git_repo}	2025-01-03 10:15:01 -06:00
test_interdiff_command.rs	cli: delete deprecated jj checkout command	2024-11-21 11:50:03 -06:00
test_log_command.rs	cli: refer to revset argument using REVSET(S) in synopsis	2024-12-18 10:13:44 -08:00
test_new_command.rs	cli: refer to revset argument using REVSET(S) in synopsis	2024-12-18 10:13:44 -08:00
test_next_prev_commands.rs	cli: drop support for jj init --{git, git_repo}	2025-01-03 10:15:01 -06:00
test_operations.rs	cli: replace --config-toml=TOML with --config=NAME=VALUE	2024-12-17 20:12:12 +09:00
test_parallelize_command.rs	log: emit working-copy branch first if included in the revset	2024-11-20 10:50:16 +09:00
test_rebase_command.rs	cli: refer to revset argument using REVSET(S) in synopsis	2024-12-18 10:13:44 -08:00
test_repo_change_report.rs	docs/cli: update URLs to from martinvonz user to jj-vcs org	2024-12-17 12:44:44 -08:00
test_resolve_command.rs	resolve: try to resolve all conflicted files in fileset	2025-01-08 23:52:21 +00:00
test_restore_command.rs	cli: restore: add --interactive flag	2025-01-05 10:14:29 +09:00
test_revset_output.rs	settings: parse TOML date-time value as well as string timestamp	2024-12-18 09:51:56 +09:00
test_root.rs	tests: add convenient method to initialize TestWorkspace with test settings	2025-01-06 22:37:33 +09:00
test_shell_completion.rs
test_show_command.rs	templater: add Email template type, deprecate Signature.username()	2024-12-15 16:03:34 +08:00
test_simplify_parents_command.rs	cli: simplify-parents: add default revsets.simplify-parents config	2024-11-26 13:19:25 +08:00
test_sparse_command.rs	windows: avoid UNC paths in run_ui_editor	2024-07-04 11:30:20 +10:00
test_split_command.rs	cli: fix interactive diff selection to not retain unmatched files	2025-01-04 22:21:37 +09:00
test_squash_command.rs	cli: refer to fileset argument using FILESETS in synopsis	2024-12-18 10:13:44 -08:00
test_status_command.rs	status: show untracked files	2025-01-05 17:43:59 +01:00
test_tag_command.rs	everything: Rename branches to bookmarks	2024-09-11 18:54:45 +02:00
test_templater.rs	cli: replace --config-toml=TOML with --config=NAME=VALUE	2024-12-17 20:12:12 +09:00
test_undo.rs	cli: git push: do not push new bookmarks by default	2024-11-19 21:11:22 +09:00
test_unsquash_command.rs	cli: replace --config-toml=TOML with --config=NAME=VALUE	2024-12-17 20:12:12 +09:00
test_util_command.rs	docs/cli: update URLs to from martinvonz user to jj-vcs org	2024-12-17 12:44:44 -08:00
test_working_copy.rs	local_working_copy: store materialized conflict marker length	2024-12-21 11:36:30 -06:00
test_workspaces.rs	docs/cli: update URLs to from martinvonz user to jj-vcs org	2024-12-17 12:44:44 -08:00