mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-23 15:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
jj/cli/tests
History
Martin von Zweigbergk 732e448458 diff_util: use MergedTree throughout 
This switches the whole `diff_util` module to working with
`MergedTree`, `Merge<Option<TreeValue>>` etc., so it can support
tree-level conflicts.

Since we want to avoid using `ConflictId`s, I switched the hash we use
for conflicts in `--git` style diffs to use an all-'0' id instead of
using the conflict id.
2023-08-27 07:50:28 -07:00
..
common cli tests: Move current_operation_id to test_utils 2023-08-22 17:39:56 -07:00
test_abandon_command.rs cli templates: include branches in short commit description 2023-08-10 20:58:40 -07:00
test_alias.rs cli: hide irrelevant information about root commit in default log templates 2023-08-15 18:54:59 +03:00
test_branch_command.rs index: import commits in chronological order 2023-08-15 15:03:45 +09:00
test_cat_command.rs
test_checkout.rs
test_chmod_command.rs cli: say that jj chmod errors out if there are any non-file sides 2023-08-14 18:15:34 -07:00
test_commit_command.rs cli: add support for setting default description 2023-08-13 23:59:15 +05:30
test_commit_template.rs templates: reword signature placeholders to match description 2023-08-27 09:38:36 +09:00
test_concurrent_operations.rs
test_config_command.rs cleanup: fix warnings from nightly clippy 2023-08-14 22:11:56 -07:00
test_debug_command.rs
test_describe_command.rs cli: add support for setting default description 2023-08-13 23:59:15 +05:30
test_diff_command.rs Add jj diffs --stat option 2023-08-19 23:49:16 -07:00
test_diffedit_command.rs merge_tools: Allow 3-pane diff editing 2023-08-21 20:19:15 -07:00
test_duplicate_command.rs cleanup: fix warnings from nightly clippy 2023-08-14 22:11:56 -07:00
test_edit_command.rs
test_git_clone.rs cleanup: fix warnings from nightly clippy 2023-08-14 22:11:56 -07:00
test_git_colocated.rs cleanup: fix warnings from nightly clippy 2023-08-14 22:11:56 -07:00
test_git_fetch.rs git: add --all-remotes to git fetch 2023-08-24 12:52:41 +02:00
test_git_import_export.rs cli tests: Move current_operation_id to test_utils 2023-08-22 17:39:56 -07:00
test_git_push.rs cli: make jj git push default to -r 'remote_branches()..@' 2023-08-23 15:00:03 -07:00
test_git_remotes.rs git: extract add_remote() function, and map git2::Error there 2023-08-23 10:02:52 +09:00
test_git_submodule.rs
test_gitignores.rs
test_global_opts.rs Enable wrapping help in clap 2023-08-22 22:24:03 -07:00
test_init_command.rs cli: hide irrelevant information about root commit in default log templates 2023-08-15 18:54:59 +03:00
test_interdiff_command.rs diff_util: use MergedTree throughout 2023-08-27 07:50:28 -07:00
test_log_command.rs templater: make .short(negative_len) return 0-length string 2023-08-25 22:59:20 +09:00
test_move_command.rs cli templates: include branches in short commit description 2023-08-10 20:58:40 -07:00
test_new_command.rs cli templates: include branches in short commit description 2023-08-10 20:58:40 -07:00
test_obslog_command.rs diff_util: use MergedTree throughout 2023-08-27 07:50:28 -07:00
test_operations.rs templater: make .short(negative_len) return 0-length string 2023-08-25 22:59:20 +09:00
test_rebase_command.rs cli templates: include branches in short commit description 2023-08-10 20:58:40 -07:00
test_resolve_command.rs cli templates: include branches in short commit description 2023-08-10 20:58:40 -07:00
test_restore_command.rs cli templates: include branches in short commit description 2023-08-10 20:58:40 -07:00
test_revset_output.rs revset: add literal:"string" pattern syntax 2023-08-17 07:42:12 +09:00
test_show_command.rs
test_sparse_command.rs
test_split_command.rs cli: when splitting change without description, skip it on second part 2023-08-15 10:12:12 -07:00
test_squash_command.rs cli templates: include branches in short commit description 2023-08-10 20:58:40 -07:00
test_status_command.rs Fix .gitignore handling of ignored directories 2023-08-22 22:08:32 -07:00
test_templater.rs templater: move empty signature placeholder to user template 2023-08-27 09:38:36 +09:00
test_undo.rs cli tests: Move current_operation_id to test_utils 2023-08-22 17:39:56 -07:00
test_unsquash_command.rs cli templates: include branches in short commit description 2023-08-10 20:58:40 -07:00
test_untrack_command.rs
test_util_command.rs
test_workspaces.rs revset: resolve "@" symbol's workspace id earlier (while parsing) 2023-08-20 17:57:18 -07:00