Martin von Zweigbergk 19fd8a917a conflicts: remove ConflictId from update_conflict_from_content() ...

For tree-level conflicts (#1624), I plan to remove `ConflictId`
completely. This commit removes `ConflictId` from
`update_conflict_from_content()` by instead making it take a
`Conflict<Option<TreeValue>>` and return a possibly different such
value.

I made the call site in `working_copy` avoid writing the conflict to
the store if it's unchanged, but I didn't make the same optimization
in `merge_tools` becuase it's much more likely to have changed there.

2023-06-13 08:49:46 +02:00

..

test_bad_locking.rs

repo: replace load_at_head() by helper in tests

2023-02-27 09:44:28 -08:00

test_commit_builder.rs

git_backend: return timestamps for what was actually written

2023-05-12 15:20:44 -07:00

test_commit_concurrent.rs

dag_walk: rename bfs() to dfs() because it's depth-first

2023-06-04 11:47:49 +09:00

test_conflicts.rs

conflicts: remove ConflictId from update_conflict_from_content()

2023-06-13 08:49:46 +02:00

test_default_revset_graph_iterator.rs

index: pass only CompositeIndex to default_revset_engine::evaluate()

2023-05-29 08:15:40 +09:00

test_diff_summary.rs

matchers: simplify FilesMatcher::new() to take slice of paths

2022-12-30 14:15:27 +09:00

test_git.rs

git_backend: on read_commit(), bulk-update extra metadata table of ancestors

2023-05-21 08:29:00 +09:00

test_id_prefix.rs

id_prefix: remove repo field from IdPrefixContext

2023-05-11 23:41:24 -07:00

test_index.rs

index: implement Index for CompositeIndex

2023-05-29 08:15:40 +09:00

test_init.rs

backend: replace git_repo() by as_any()

2023-05-12 08:05:09 -07:00

test_load_repo.rs

repo: propagate error when failing to look up backend type

2023-02-27 09:44:28 -08:00

test_merge_trees.rs

store: do conversion to/from backend::Conflict

2023-06-04 06:48:34 -07:00

test_mut_repo.rs

tests: avoid some unnecessary calls to index().stats()

2023-03-12 22:08:31 -07:00

test_operations.rs

repo: implement Repo on ReadonlyRepo instead of its Arc

2023-03-21 21:43:44 -07:00

test_refs.rs

repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo

2023-02-15 19:15:17 -08:00

test_revset.rs

revsets: stop jj parsing br as a git_ref refs/heads/br

2023-06-12 14:31:44 -07:00

test_rewrite.rs

repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo

2023-02-15 19:15:17 -08:00

test_view.rs

repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo

2023-02-15 19:15:17 -08:00

test_working_copy_concurrent.rs

cleanup: leverage scoped thread in tests

2023-05-21 21:02:58 +09:00

test_working_copy_sparse.rs

working_copy: introduce snapshot progress callback

2023-05-06 11:07:46 -07:00

test_working_copy.rs

store: do conversion to/from backend::Conflict

2023-06-04 06:48:34 -07:00

test_workspace.rs

repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo

2023-02-15 19:15:17 -08:00