Code

History

Commits on ig/commit-debug to lib/src/merged_tree.rs35+
  1. merged_tree: rename `take()` to `into_merge()`Scott Taylor committed 1 year agocbfceb6
  2. backend: remove `MergedTreeId::Legacy` variantScott Taylor committed 1 year ago1418324
  3. merge: add a generic `Diff<T>` type, use in `TreeDiffEntry`Martin von Zweigbergk committed 1 year ago4f456ec
  4. cargo: bump MSRV to 1.88Austin Seipp committed 1 year ago419bd51
  5. merged_tree: move MergeOptions to tree_mergeMartin von Zweigbergk committed 1 year ago92bc6e4
  6. merged_tree: extract `merge_tree()` to new moduleMartin von Zweigbergk committed 1 year ago5d93019
  7. files, tree: make same-change conflict resolution configurableYuya Nishihara committed 1 year agoaf4fe21
  8. files: rename FileMergeOptions to MergeOptions, move to merged_treeYuya Nishihara committed 1 year ago0376bcf
  9. backend: remove unused TreeValue::Conflict and read/write methodsMartin von Zweigbergk committed 1 year agoda6c4b6
  10. merged_tree: respect Backend::concurrency() in merge_trees()Martin von Zweigbergk committed 1 year ago6a7c0fb
  11. merged_tree: rewrite merge_trees() to be non-recursive and concurrentMartin von Zweigbergk committed 1 year agob14fad0
  12. merged_tree: separate out trivially resolved entries when resolvingMartin von Zweigbergk committed 1 year agoca839f9
  13. merged_tree: move construction of backend trees onto new typeMartin von Zweigbergk committed 1 year ago2e249ba
  14. merged_tree: build conflicted resolved trees from sorted conflictsMartin von Zweigbergk committed 1 year ago97ee86d
  15. merged_tree: write trees concurrently for single dirMartin von Zweigbergk committed 1 year ago4df2b5c
  16. merged_tree: move writing of trees to end of `merge_trees()`Martin von Zweigbergk committed 1 year agocc33511
  17. merged_tree: rename `new_tree_id` which is a full tree (not an ID)Martin von Zweigbergk committed 1 year agof96ac35
  18. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  19. cli lib: make use of `Self` consistentadamnemecek committed 1 year ago8a26df2
  20. merged_tree: make resolve() and merge() asyncMartin von Zweigbergk committed 1 year ago8022a49
  21. merged_tree: fix clippy "needless_lifetimes" lintJosh Steadmon committed 1 year agof584e4d
  22. merged_tree: make `merge()` take all args by valueMartin von Zweigbergk committed 1 year ago191369f
  23. merged_tree: make `resolve()` take `self` by valueMartin von Zweigbergk committed 1 year agof7e4264
  24. cleanup: switch to async closures in trivial casesMartin von Zweigbergk committed 1 year agof27c55a
  25. store: inline tree_builder() function to callersMartin von Zweigbergk committed 1 year ago721daef
  26. merged_tree: finish polling tree before emitting pathMartin von Zweigbergk committed 1 year ago25723d6
  27. merged_tree: poll trees in the order we're going to emit themMartin von Zweigbergk committed 1 year ago1a89ac8
  28. merged_tree: avoid destructuring only to construct the same valuesMartin von Zweigbergk committed 1 year agoed6fa71
  29. merged_tree: remove an unnecessary async blockMartin von Zweigbergk committed 1 year ago1fa3010
  30. backend: store tree entries in sorted Vec instead of BTreeMapYuya Nishihara committed 1 year ago38fb765
  31. backend: make backend::Tree immutable, collect entries by callerYuya Nishihara committed 1 year agoe56a989
  32. merged_tree: clone non-conflicting tree data first when merging treesYuya Nishihara committed 1 year ago6324601
  33. merged_tree: make `diff_stream()` sort `foo` before `foo/bar`Martin von Zweigbergk committed 1 year ago3211e9c
  34. merged_tree: move directory->file handling in diff to stream adapterMartin von Zweigbergk committed 1 year ago1b1edc7
  35. merge: add a method for checking for present non-tree valueMartin von Zweigbergk committed 1 year ago470a6e6