Martin von Zweigbergk af2dba1c8f merge: move tests module to end of file ...

I used IntelliJ to move the `Merge` type from the `conflict` module
and didn't notice until now that it put the moved items after the
tests.

2023-08-06 23:05:21 +00:00

..

lock

perf: add several #[instrument]s

2023-07-28 09:28:01 -07:00

protos

simple_op_store: add deserialization support of new Conflict-based RefTarget

2023-07-27 15:32:48 +09:00

backend.rs

conflicts: move Merge<T> to merge module

2023-08-06 22:08:09 +00:00

commit_builder.rs

conflicts: move Merge<T> to merge module

2023-08-06 22:08:09 +00:00

commit.rs

Fix cargo +nightly clippy warnings

2023-07-28 22:19:52 -07:00

conflicts.rs

conflicts: move Merge<T> to merge module

2023-08-06 22:08:09 +00:00

content_hash.rs

style: do not dereference self to perform pattern-matching

2023-01-14 19:28:24 +01:00

dag_walk.rs

cleanup: use let-else now that we're on Rust 1.65+

2023-07-18 09:50:22 +01:00

default_index_store.rs

revsets: allow :: as synonym for :

2023-07-28 22:30:40 -07:00

default_revset_engine.rs

revsets: allow :: as synonym for :

2023-07-28 22:30:40 -07:00

default_revset_graph_iterator.rs

revset_graph: remove unneeded Vec<IndexGraphEdge> cloning

2023-08-04 06:19:22 +09:00

default_submodule_store.rs

docs: warn about missing docs for jj-lib crate

2023-07-10 18:28:59 +03:00

diff.rs

refactor(jj-lib): remove nightly_shims gunk

2023-07-17 18:38:26 -05:00

file_util.rs

docs: warn about missing docs for jj-lib crate

2023-07-10 18:28:59 +03:00

files.rs

conflicts: move Merge<T> to merge module

2023-08-06 22:08:09 +00:00

fsmonitor.rs

perf: add several #[instrument]s

2023-07-28 09:28:01 -07:00

git_backend.rs

conflicts: move Merge<T> to merge module

2023-08-06 22:08:09 +00:00

git.rs

git: on import_refs(), filter out uninteresting refs earlier

2023-08-06 14:47:20 +09:00

gitignore.rs

docs: warn about missing docs for jj-lib crate

2023-07-10 18:28:59 +03:00

hex_util.rs

docs: warn about missing docs for jj-lib crate

2023-07-10 18:28:59 +03:00

id_prefix.rs

docs: warn about missing docs for jj-lib crate

2023-07-10 18:28:59 +03:00

index.rs

docs: warn about missing docs for jj-lib crate

2023-07-10 18:28:59 +03:00

lib.rs

revset: extract graph-related types to separate module

2023-07-25 01:45:37 +09:00

local_backend.rs

conflicts: move Merge<T> to merge module

2023-08-06 22:08:09 +00:00

lock.rs

docs: warn about missing docs for jj-lib crate

2023-07-10 18:28:59 +03:00

matchers.rs

working_copy: traverse filesystem in parallel

2023-08-03 18:20:49 +00:00

merge.rs

merge: move tests module to end of file

2023-08-06 23:05:21 +00:00

merged_tree.rs

conflicts: move Merge<T> to merge module

2023-08-06 22:08:09 +00:00

op_heads_store.rs

operation: propagate OpStoreError

2023-07-25 12:46:59 -05:00

op_store.rs

conflicts: move Merge<T> to merge module

2023-08-06 22:08:09 +00:00

operation.rs

Fix cargo +nightly clippy warnings

2023-07-28 22:19:52 -07:00

refs.rs

conflicts: move Merge<T> to merge module

2023-08-06 22:08:09 +00:00

repo_path.rs

docs: warn about missing docs for jj-lib crate

2023-07-10 18:28:59 +03:00

repo.rs

perf: add several #[instrument]s

2023-07-28 09:28:01 -07:00

revset_graph.rs

revsets: allow :: as synonym for :

2023-07-28 22:30:40 -07:00

revset.pest

revsets: allow :: as synonym for :

2023-07-28 22:30:40 -07:00

revset.rs

revsets: allow :: as synonym for :

2023-07-28 22:30:40 -07:00

rewrite.rs

perf: add #[instrument] to all cmd_* functions

2023-07-28 09:28:01 -07:00

settings.rs

docs: warn about missing docs for jj-lib crate

2023-07-10 18:28:59 +03:00

simple_op_heads_store.rs

op_store: make ViewId and OperationId implement ObjectId

2023-07-26 14:17:21 -07:00

simple_op_store.rs

conflicts: move Merge<T> to merge module

2023-08-06 22:08:09 +00:00

stacked_table.rs

docs: warn about missing docs for jj-lib crate

2023-07-10 18:28:59 +03:00

store.rs

conflicts: move Merge<T> to merge module

2023-08-06 22:08:09 +00:00

submodule_store.rs

docs: warn about missing docs for jj-lib crate

2023-07-10 18:28:59 +03:00

transaction.rs

operation: propagate OpStoreError

2023-07-25 12:46:59 -05:00

tree_builder.rs

tree_builder: leverage BTreeMap::pop_last() now that we're on Rust 1.66+

2023-07-20 06:14:28 -07:00

tree.rs

conflicts: move Merge<T> to merge module

2023-08-06 22:08:09 +00:00

view.rs

view: return RefTarget by reference, clone() by caller

2023-07-19 08:27:42 +09:00

working_copy.rs

working_copy: add debug assertion that tree and file states match

2023-08-06 22:17:18 +00:00

workspace.rs

Update init_with_factories to initialize a workspace with a workspace_id other than "default"

2023-08-04 01:26:26 -07:00