ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity
jj/tests
History
Yuya Nishihara 0b9d23c3ad cli: add option to generate textual diff by external command 
This is basic implementation. There's no config knob to enable the external
diff command by default. It reuses the merge-tools table because that's how
external diff/merge commands are currently configured. We might want to
reorganize them in #1285.

If you run "jj diff --tool meld", GUI diff will open and jj will wait for
meld to quit. This also applies to "jj log -p". The "diff --tool gui" behavior
is somewhat useful, but "log -p --tool gui" wouldn't. We might want some flag
to mark the tool output can't be streamed.

Another thing to consider is tools that can't generate directory diffs. Git
executes ext-diff tool per file, but we don't. Difftastic can compare
directories, and doing that should be more efficient since diffs can be
computed in parallel (at the expense of unsorted output.)

Closes #1886
2023-08-03 13:53:37 +09:00
..
common cli: add option to generate textual diff by external command 2023-08-03 13:53:37 +09:00
test_abandon_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_alias.rs cli templates: change default short id length from 12 to 8 2023-08-02 12:14:04 -07:00
test_branch_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_cat_command.rs cli: rename print to cat 2023-01-18 10:10:02 -08:00
test_checkout.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_chmod_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_commit_command.rs Switch graph node to use ◉ for commit instead of ● 2023-04-02 23:15:37 -07:00
test_commit_template.rs cli templates: change default short id length from 12 to 8 2023-08-02 12:14:04 -07:00
test_concurrent_operations.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_config_command.rs tests: add helper method to capture both stdout/stderr outputs 2023-07-03 22:03:05 +09:00
test_debug_command.rs simple_op_store: serialize RefTarget in new format (breaks downgrades) 2023-07-27 15:32:48 +09:00
test_describe_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_diff_command.rs cli: add option to generate textual diff by external command 2023-08-03 13:53:37 +09:00
test_diffedit_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_duplicate_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_edit_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_git_clone.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_git_colocated.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_git_fetch.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_git_import_export.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_git_push.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_git_remotes.rs copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
test_git_submodule.rs git: add a hidden submodule subcommand 2023-06-27 10:07:00 -07:00
test_gitignores.rs copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
test_global_opts.rs cli status: rearrange sections 2023-08-02 12:14:04 -07:00
test_init_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_interdiff_command.rs copyright: change from "Google LLC" to "The Jujutsu Authors" 2022-11-28 06:05:45 -10:00
test_log_command.rs cli templates: change default short id length from 12 to 8 2023-08-02 12:14:04 -07:00
test_move_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_new_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_obslog_command.rs cli templates: change default short id length from 12 to 8 2023-08-02 12:14:04 -07:00
test_operations.rs simple_op_store: serialize RefTarget in new format (breaks downgrades) 2023-07-27 15:32:48 +09:00
test_rebase_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_resolve_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_restore_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_revset_output.rs cli templates: change default short id length from 12 to 8 2023-08-02 12:14:04 -07:00
test_show_command.rs cli: in "show" template, indent description like Git does 2023-03-04 12:10:53 +09:00
test_sparse_command.rs add --edit option to jj sparse set 2023-06-27 22:56:46 +09:00
test_split_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_squash_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_status_command.rs cli status: rearrange sections 2023-08-02 12:14:04 -07:00
test_templater.rs revset_graph: place new heads as close to fork point as possible 2023-07-25 01:45:37 +09:00
test_undo.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_unsquash_command.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00
test_untrack_command.rs cli: make jj sparse --list a subcommand 2023-05-22 09:49:38 -07:00
test_util_command.rs cli: rename jj support to jj util 2023-04-12 21:34:47 -07:00
test_workspaces.rs cli templates: include change id and more in short commit description 2023-08-02 12:14:04 -07:00