Essien Ita Essien 895d53f395 Rename conflict and file revsets to conflicts and files. ...

See discussion thread in linked issue.

With this PR, all revset functions in [BUILTIN_FUNCTION_MAP](8d166c7642/lib/src/revset.rs (L570))
that return multiple values are either named in plural or the naming is hard to misunderstand (e.g. `reachable`)

Fixes: #4122

2024-09-24 20:02:49 +01:00

..

common

tests: set $COLUMNS when running CLI tests

2024-09-05 08:56:04 -07:00

cli-reference@.md.snap

restore: add --restore-descendants flag

2024-09-24 14:26:54 +02:00

runner.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_abandon_command.rs

abandon: add --restore-descendants flag

2024-09-24 10:52:06 +02:00

test_acls.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_advance_bookmarks.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_alias.rs

bookmark: add "b" alias

2024-09-17 18:24:26 +02:00

test_backout_command.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_bookmark_command.rs

bookmarks: update some leftover uses of the word "branch"

2024-09-11 19:19:31 -07:00

test_builtin_aliases.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_checkout.rs

Enable the new graph nodes by default.

2024-07-16 12:54:24 +02:00

test_commit_command.rs

cli: add --author argument for commit and describe

2024-09-22 12:40:46 +02:00

test_commit_template.rs

revset, templater: make context message of nested errors less specific

2024-09-23 07:07:07 +09:00

test_concurrent_operations.rs

op log: change "resolve concurrent" to "reconcile divergent"

2024-08-30 21:56:11 -07:00

test_config_command.rs

cli: update docs URLs to point to https://martinvonz.github.io/jj/latest/

2024-09-06 09:22:04 +09: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

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_describe_command.rs

cli: get author timestamp of description template in consistent way

2024-09-24 07:17:33 +09:00

test_diff_command.rs

cli: change default inline threshold of color-words diffs

2024-08-28 10:33:33 +09:00

test_diffedit_command.rs

diffedit: add --restore-descendants flag

2024-09-24 09:30:28 +02:00

test_duplicate_command.rs

undo: Report what operation has been undone in jj op undo

2024-09-15 14:11:33 +02:00

test_edit_command.rs

Enable the new graph nodes by default.

2024-07-16 12:54:24 +02:00

test_evolog_command.rs

undo: Report what operation has been undone in jj op undo

2024-09-15 14:11:33 +02:00

test_file_chmod_command.rs

cli: reorder updating and reporting for consistency.

2024-09-22 15:02:21 +01:00

test_file_print_command.rs

cli: rename jj file print (formerly jj cat) to jj file show

2024-06-26 17:11:16 -07:00

test_file_track_untrack_commands.rs

cli: make paths to auto-track configurable, add jj track

2024-09-09 07:49:55 -07:00

test_fix_command.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_generate_md_cli_help.rs

test_generate_cli_reference: fixup to 52c415e, remove mysterious comment

2024-06-15 20:30:40 -07:00

test_git_clone.rs

git: add --remote option to clone command

2024-09-13 18:14:57 +02:00

test_git_colocated.rs

undo: Report what operation has been undone in jj op undo

2024-09-15 14:11:33 +02:00

test_git_fetch.rs

cli: Warn if specified remote branch not found for jj git fetch

2024-09-21 14:09:24 +01:00

test_git_import_export.rs

undo: Report what operation has been undone in jj op undo

2024-09-15 14:11:33 +02:00

test_git_init.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_git_private_commits.rs

git-push: just say "Changes to push to <REMOTE>"

2024-09-15 07:06:56 +09:00

test_git_push.rs

git-push: just say "Changes to push to <REMOTE>"

2024-09-15 07:06:56 +09:00

test_git_remotes.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_git_submodule.rs

tests: avoid deprecated jj init --git/--git-repo

2024-05-17 13:55:20 -07:00

test_gitignores.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_global_opts.rs

diffedit: add --restore-descendants flag

2024-09-24 09:30:28 +02:00

test_immutable_commits.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_init_command.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_interdiff_command.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_log_command.rs

Rename conflict and file revsets to conflicts and files.

2024-09-24 20:02:49 +01:00

test_move_command.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_new_command.rs

bookmarks: update some leftover uses of the word "branch"

2024-09-11 19:19:31 -07:00

test_next_prev_commands.rs

next/prev: Fetch descendants with more correctness.

2024-09-17 16:39:29 +01:00

test_operations.rs

op-diff: Use op_summary template

2024-09-15 14:11:33 +02:00

test_parallelize_command.rs

Enable the new graph nodes by default.

2024-07-16 12:54:24 +02:00

test_rebase_command.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_repo_change_report.rs

cli: reorder updating and reporting for consistency.

2024-09-22 15:02:21 +01:00

test_resolve_command.rs

cli: reorder updating and reporting for consistency.

2024-09-22 15:02:21 +01:00

test_restore_command.rs

restore: add --restore-descendants flag

2024-09-24 14:26:54 +02:00

test_revset_output.rs

Rename conflict and file revsets to conflicts and files.

2024-09-24 20:02:49 +01:00

test_root.rs

formatting only: switch to Item level import ganularity

2024-08-22 14:52:54 -04:00

test_shell_completion.rs

compile integration tests as a single binary

2024-02-06 18:19:41 -08:00

test_show_command.rs

undo: Report what operation has been undone in jj op undo

2024-09-15 14:11:33 +02: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

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_squash_command.rs

cli: reorder updating and reporting for consistency.

2024-09-22 15:02:21 +01:00

test_status_command.rs

conflicts: Highlight change ids in rebase advice

2024-09-13 12:57:56 +02:00

test_tag_command.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_templater.rs

revset, templater: add deprecation warnings

2024-09-23 07:07:07 +09:00

test_undo.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_unsquash_command.rs

everything: Rename branches to bookmarks

2024-09-11 18:54:45 +02:00

test_util_command.rs

cli: update docs URLs to point to https://martinvonz.github.io/jj/latest/

2024-09-06 09:22:04 +09:00

test_working_copy.rs

cli: make paths to auto-track configurable, add jj track

2024-09-09 07:49:55 -07:00

test_workspaces.rs

cli: Support renaming workspaces

2024-09-16 19:35:36 -07:00