Yuya Nishihara a1d88980a9 revset: compare conflict file contents without materializing as conflicts ...

The logic is similar to the color-words diff's. We first resolve trivial
conflicts, then compare each hunk of Merge<&BStr> type. We also apply the same
optimization as the resolved case to minimize lines to be merged and diffed.

2025-04-14 01:07:24 +00:00

..

runner.rs

jj fix: Refactor jj fix CLI, move some logic to lib to make it usable in other tools (e.g. in servers).

2025-03-16 17:59:22 +00:00

test_annotate.rs

annotate: report root commit id if no origin found within range

2025-03-17 10:57:33 +00:00

test_bad_locking.rs

lib: rename the LocalBackend to SimpleBackend

2025-03-17 17:17:11 +00:00

test_commit_builder.rs

lib: rename the LocalBackend to SimpleBackend

2025-03-17 17:17:11 +00:00

test_commit_concurrent.rs

lib: rename the LocalBackend to SimpleBackend

2025-03-17 17:17:11 +00:00

test_conflicts.rs

merge: remove redundant .clone() from .simplify()

2025-04-13 05:18:16 +00:00

test_default_revset_graph_iterator.rs

cleanup: enable unused_trait_names clippy lint and run clippy --fix

2025-03-16 00:35:56 +00:00

test_fix.rs

fix: make FileFixer::fix_files() take &mut self

2025-04-07 15:43:47 +00:00

test_git_backend.rs

git_backend: don't allow single tree in jj:trees header

2025-03-25 12:42:39 +00:00

test_git.rs

view: rename RemoteRefState::Tracking to Tracked

2025-03-31 01:41:31 +00:00

test_gpg.rs

signing: add gpgsm backend

2025-03-20 17:01:39 +00:00

test_id_prefix.rs

cleanup: enable unused_trait_names clippy lint and run clippy --fix

2025-03-16 00:35:56 +00:00

test_index.rs

view: port bookmark/tag name types to RefName/RemoteName

2025-03-26 11:07:06 +00:00

test_init.rs

view: rename workspace "id" to "name"

2025-03-31 03:39:29 +00:00

test_load_repo.rs

repo: remove &UserSettings argument from new/rewrite_commit(), use self.settings

2024-12-31 10:51:57 +09:00

test_local_working_copy_concurrent.rs

cleanup: enable unused_trait_names clippy lint and run clippy --fix

2025-03-16 00:35:56 +00:00

test_local_working_copy_sparse.rs

cleanup: enable unused_trait_names clippy lint and run clippy --fix

2025-03-16 00:35:56 +00:00

test_local_working_copy.rs

view: rename workspace "id" to "name"

2025-03-31 03:39:29 +00:00

test_merge_trees.rs

cleanup: enable unused_trait_names clippy lint and run clippy --fix

2025-03-16 00:35:56 +00:00

test_merged_tree.rs

files: add functions that return merge result as Merge<_>/Option<_>

2025-04-08 01:35:55 +00:00

test_mut_repo.rs

view: rename workspace "id" to "name"

2025-03-31 03:39:29 +00:00

test_operations.rs

transaction: propagate error from tx.write()

2025-04-12 06:56:13 +00:00

test_refs.rs

cleanup: enable unused_trait_names clippy lint and run clippy --fix

2025-03-16 00:35:56 +00:00

test_revset.rs

revset: compare conflict file contents without materializing as conflicts

2025-04-14 01:07:24 +00:00

test_rewrite_duplicate.rs

cli: duplicate: add setting for templating the new commit descriptions

2025-04-13 21:49:47 +00:00

test_rewrite_transform.rs

repo: MutableRepo::transform_descendants_with_options: add new_parents_map

2025-04-05 16:03:03 +00:00

test_rewrite.rs

view: rename workspace "id" to "name"

2025-03-31 03:39:29 +00:00

test_signing.rs

lib: rename the LocalBackend to SimpleBackend

2025-03-17 17:17:11 +00:00

test_ssh_signing.rs

tests: do not mark SSH private key as executable

2025-03-18 01:24:47 +00:00

test_view.rs

view: rename workspace "id" to "name"

2025-03-31 03:39:29 +00:00

test_workspace.rs

view: rename workspace "id" to "name"

2025-03-31 03:39:29 +00:00