ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity
jj/cli/tests
History
Martin von Zweigbergk 8157d4ff63 merge: materialize conflicts in executable files like regular files 
AFAICT, all callers of `Merge::to_file_merge()` are already well
prepared for working with executable files. It's called from these
places:

* `local_working_copy.rs`: Materialized conflicts are correctly
  updated using `Merge::with_new_file_ids()`.

* `merge_tools/`: Same as above.

* `cmd_cat()`: We already ignore the executable bit when we print
  non-conflicted files, so it makes sense to also ignore it for
  conflicted files.

* `git_diff_part()`: We print all conflicts with mode "100644" (the
  mode for regular files). Maybe it's best to use "100755" for
  conflicts that are unambiguously executable, or maybe it's better to
  use a fake mode like "000000" for all conflicts. Either way, the
  current behavior seems fine.

* `diff_content()`: We use the diff content in various diff
  formats. We could add more detail about the executable bits in some
  of them, but I think the current output is fine. For example,
  instead of our current "Created conflict in my-file", we could say
  "Created conflict in executable file my-file" or "Created conflict
  in ambiguously executable file my-file". That's getting verbose,
  though.

So, I think all we need to do is to make `Merge::to_file_merge()` not
require its inputs to be non-executable.

Closes #1279.
2023-10-24 06:45:45 -07:00
..
common tests: disable parsing of system CA certificates in CLI tests 2023-10-08 02:41:20 +09:00
test_abandon_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_alias.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_branch_command.rs cli: show stats if multiple branches are tracked/untracked 2023-10-24 06:46:17 +09:00
test_builtin_aliases.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_cat_command.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_checkout.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_chmod_command.rs merge: materialize conflicts in executable files like regular files 2023-10-24 06:45:45 -07:00
test_commit_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_commit_template.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_concurrent_operations.rs view: migrate in-memory structure to per-remote branches map 2023-10-14 22:20:00 +09:00
test_config_command.rs cli: allow overwriting non-scalar with jj config set 2023-10-11 07:40:08 -07:00
test_debug_command.rs view: migrate in-memory structure to per-remote branches map 2023-10-14 22:20:00 +09:00
test_describe_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_diff_command.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_diffedit_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_duplicate_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_edit_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_git_clone.rs cli: add "branch list --all" option to include all remote branches 2023-10-19 05:23:38 +09:00
test_git_colocated.rs cli: add "branch list --all" option to include all remote branches 2023-10-19 05:23:38 +09:00
test_git_fetch.rs cli: add "branch list --all" option to include all remote branches 2023-10-19 05:23:38 +09:00
test_git_import_export.rs cli: add "branch list --all" option to include all remote branches 2023-10-19 05:23:38 +09:00
test_git_push.rs cli: add "branch list --all" option to include all remote branches 2023-10-19 05:23:38 +09:00
test_git_remotes.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_git_submodule.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_gitignores.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_global_opts.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_immutable_commits.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_init_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_interdiff_command.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_log_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_move_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_new_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_next_prev_commands.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_obslog_command.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_operations.rs view: migrate in-memory structure to per-remote branches map 2023-10-14 22:20:00 +09:00
test_rebase_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_resolve_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_restore_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_revset_output.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_show_command.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_sparse_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_split_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_squash_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_status_command.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_templater.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_tree_level_conflicts.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_undo.rs refs: merge tracking state of remote branches 2023-10-24 07:13:58 +09:00
test_unsquash_command.rs cli: send status messages to stderr, specify stdout/stderr explicitly 2023-10-11 19:24:01 +09:00
test_untrack_command.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_util_command.rs tests: move tests/ under cli/ so they're run again 2023-08-05 06:18:59 +00:00
test_working_copy.rs tests: replace jj_cmd_success() involving mutation to allow stderr output 2023-10-11 19:24:01 +09:00
test_workspaces.rs test_workspaces: fix merge skew from b7c7b19e + 220292ad 2023-10-14 09:01:42 -05:00