mirror of
https://github.com/martinvonz/jj.git
synced 2024-11-13 14:15:02 +03:00
051c01491c
This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers). |
||
|---|---|---|
| .. | ||
| common | ||
| smoke_test.rs | ||
| test_alias.rs | ||
| test_branch_command.rs | ||
| test_concurrent_operations.rs | ||
| test_describe_command.rs | ||
| test_diff_command.rs | ||
| test_edit_command.rs | ||
| test_git_colocated.rs | ||
| test_git_push.rs | ||
| test_git_remotes.rs | ||
| test_gitignores.rs | ||
| test_global_opts.rs | ||
| test_init_command.rs | ||
| test_log_command.rs | ||
| test_move_command.rs | ||
| test_new.rs | ||
| test_obslog_command.rs | ||
| test_operations.rs | ||
| test_print_command.rs | ||
| test_rebase_command.rs | ||
| test_restore_command.rs | ||
| test_sparse_command.rs | ||
| test_split_command.rs | ||
| test_squash_command.rs | ||
| test_undo.rs | ||
| test_unsquash_command.rs | ||
| test_untrack_command.rs | ||
| test_workspaces.rs | ||