mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-11 06:42:47 +00:00
d886d8c203
We already have the new `Conflict::from_backend_conflict()` for converting from a `backend::Conflict`, but we model conflicts in a similar way in at least `RefTarget`. I'd like to be able to use `conflicts::Conflict` there too. To prepare for that, let's extract generic methods from `Conflict::from_backend_conflict()` and `Conflict::to_backend_conflict()`. I'm not sure I'll get around to making `RefTarget` use `Conflict` but this commit seems like nice cleanup either way. It makes the tests simpler if nothing else. |
||
|---|---|---|
| .. | ||
| lock | ||
| protos | ||
| backend.rs | ||
| commit.rs | ||
| commit_builder.rs | ||
| conflicts.rs | ||
| content_hash.rs | ||
| dag_walk.rs | ||
| default_index_store.rs | ||
| default_revset_engine.rs | ||
| default_revset_graph_iterator.rs | ||
| diff.rs | ||
| file_util.rs | ||
| files.rs | ||
| git.rs | ||
| git_backend.rs | ||
| gitignore.rs | ||
| hex_util.rs | ||
| id_prefix.rs | ||
| index.rs | ||
| lib.rs | ||
| local_backend.rs | ||
| lock.rs | ||
| matchers.rs | ||
| merge.rs | ||
| nightly_shims.rs | ||
| op_heads_store.rs | ||
| op_store.rs | ||
| operation.rs | ||
| refs.rs | ||
| repo.rs | ||
| repo_path.rs | ||
| revset.pest | ||
| revset.rs | ||
| rewrite.rs | ||
| settings.rs | ||
| simple_op_heads_store.rs | ||
| simple_op_store.rs | ||
| stacked_table.rs | ||
| store.rs | ||
| transaction.rs | ||
| tree.rs | ||
| tree_builder.rs | ||
| view.rs | ||
| working_copy.rs | ||
| workspace.rs | ||