ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/cli/tests
Martin von Zweigbergk c55e08023e workspace: don't lose sparsed-away paths when recovering workspace
When an operation is missing and we recover the workspace, we create a
new working-copy commit on top of the desired working-copy commit (per
the available head operation). We then reset the working copy to an
empty tree because it shouldn't really matter much which commit we
reset to. However, when the workspace is sparse, it does matter, as
the test case from the previous patch shows. This patch fixes it by
replacing the `reset_to_empty()` method by a new `recover(&Commit)`,
which effectively resets to the empty tree and then resets to the
commit. That way, any subsequent snapshotting will result keep the
paths from that tree for paths outside the sparse patterns.
2024-03-16 07:30:36 -07:00
..
common cargo: upgrade chrono from 0.4.34 to 0.4.35 2024-03-06 09:20:23 -08:00
cli-reference@.md.snap docs: add FAQ for why to use new-then-amend over edit 2024-03-14 11:32:53 -07:00
runner.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_abandon_command.rs rewrite: default to not simplifying ancestor merges 2024-02-19 14:20:18 -08:00
test_alias.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_branch_command.rs lib: improve error message for invalid string pattern, suggesting to use one of the known one 2024-03-16 14:22:16 +01:00
test_builtin_aliases.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_cat_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_checkout.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_chmod_command.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_commit_command.rs cli: add --tool=<name> option to diff/merge editing commands 2024-03-04 01:33:43 +09:00
test_commit_template.rs commit_templater: add self.immutable() method 2024-03-14 22:59:43 +09:00
test_concurrent_operations.rs op_store: add metadata flag for ops representing working-copy snapshot 2024-02-19 22:44:38 -08:00
test_config_command.rs cli: colorize output of "config list" 2024-03-06 11:38:57 +09:00
test_debug_command.rs debug-tree: allow looking up tree by path and id, not just revision 2024-03-14 23:28:59 -07:00
test_describe_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_diff_command.rs Add --context flag for diffs. 2024-03-05 07:48:23 +01:00
test_diffedit_command.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_duplicate_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_edit_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_generate_md_cli_help.rs docs, CLI reference: use include-markdown instead of a symlink 2024-02-12 10:28:09 -08:00
test_git_clone.rs cli: list new remote branches during git fetch 2024-02-18 17:36:01 +01:00
test_git_colocated.rs tests: avoid deprecated jj co 2024-03-06 10:19:46 -08:00
test_git_fetch.rs cli: don't bury GitImportError sources 2024-03-16 12:51:18 +09:00
test_git_import_export.rs cli: list new remote branches during git fetch 2024-02-18 17:36:01 +01:00
test_git_init.rs tests: move strip_last_line() to common module 2024-03-01 08:51:06 +09:00
test_git_push.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_git_remotes.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_git_submodule.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_gitignores.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_global_opts.rs repo_path: show more detailed error if filesystem path failed to parse 2024-03-09 11:01:43 +09:00
test_immutable_commits.rs cli: check invalid declaration of immutable_heads() alias earlier 2024-03-14 22:59:43 +09:00
test_init_command.rs tests: move strip_last_line() to common module 2024-03-01 08:51:06 +09:00
test_interdiff_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_log_command.rs log: enable synthetic elided nodes by default 2024-03-11 10:08:28 -07:00
test_move_command.rs description_utils: teach combine_messages() to handle more than two sources 2024-03-13 05:21:05 -07:00
test_new_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_next_prev_commands.rs tests: avoid deprecated jj co 2024-03-06 10:19:46 -08:00
test_obslog_command.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_operations.rs templates: add missing "\n" to builtin "root" output 2024-03-13 23:29:27 +09:00
test_rebase_command.rs cli: make rebase --skip-empty keep already empty commits 2024-02-25 16:39:05 -08:00
test_repo_change_report.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_resolve_command.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_restore_command.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_revset_output.rs lib: improve error message for invalid string pattern, suggesting to use one of the known one 2024-03-16 14:22:16 +01:00
test_root.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_shell_completion.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_show_command.rs cli: enrich the error about required template value with a hint 2024-03-06 08:12:40 +05:00
test_sparse_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_split_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_squash_command.rs squash: accept multiple --from revisions 2024-03-13 05:21:05 -07:00
test_status_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_tag_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_templater.rs templater: migrate global functions to table-based lookup 2024-03-16 10:28:19 +09:00
test_tree_level_conflicts.rs git_backend: write trees involved in conflict in git commit header 2024-03-10 20:51:05 -07:00
test_undo.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_unsquash_command.rs description_utils: teach combine_messages() to handle more than two sources 2024-03-13 05:21:05 -07:00
test_untrack_command.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_util_command.rs op_store: add metadata flag for ops representing working-copy snapshot 2024-02-19 22:44:38 -08:00
test_working_copy.rs compile integration tests as a single binary 2024-02-06 18:19:41 -08:00
test_workspaces.rs workspace: don't lose sparsed-away paths when recovering workspace 2024-03-16 07:30:36 -07:00