Code

History

Commits on ig/commit-debug to lib/src/tree.rs35+
  1. cleanup: replace clippy allow() exemptions by expect()Martin von Zweigbergk committed 1 year ago8aa9d1d
  2. tree: move try_resolve_file_conflict() to tree_merge()Martin von Zweigbergk committed 1 year agoc12ee12
  3. files, tree: make same-change conflict resolution configurableYuya Nishihara committed 1 year agoaf4fe21
  4. files: rename FileMergeOptions to MergeOptions, move to merged_treeYuya Nishihara committed 1 year ago0376bcf
  5. files: introduce stub of FileMergeOptionsYuya Nishihara committed 1 year agoe9e9c6f
  6. backend: remove unused TreeValue::Conflict and read/write methodsMartin von Zweigbergk committed 1 year agoda6c4b6
  7. cli lib: make use of `Self` consistentadamnemecek committed 1 year ago8a26df2
  8. cleanup: switch to async closures in trivial casesMartin von Zweigbergk committed 1 year agof27c55a
  9. address new mismatched_lifetime_syntaxes Clippy lintMartin von Zweigbergk committed 1 year agoc43ca3c
  10. backend: add CopyId to TreeValue::FileMartin von Zweigbergk committed 1 year agoa363e6b
  11. backend: make read_file() return a AsyncReadMartin von Zweigbergk committed 1 year agob970939
  12. store: drop "_async" suffix from read_file()/read_symlink()Martin von Zweigbergk committed 1 year ago23de072
  13. merge: add and use a function for mapping async functions concurrentlyMartin von Zweigbergk committed 1 year ago3c84a23
  14. tree: delete `entries()` method, update `MergedTree` testMartin von Zweigbergk committed 1 year ago094ab0b
  15. tree: delete unused `entry()` methodMartin von Zweigbergk committed 1 year ago0f92978
  16. merge: use .try_map() internally to transform Merge<TreeValue>Yuya Nishihara committed 1 year agoecee441
  17. files: add functions that return merge result as Merge<_>/Option<_>Yuya Nishihara committed 1 year ago38ecdcf
  18. files: rename merge() to merge_hunks()Yuya Nishihara committed 1 year ago624cb66
  19. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  20. tree: delete unused code for merging legacy treesMartin von Zweigbergk committed 1 year ago162e455
  21. merge: make `trivial_merge()` take a single slice of interleaved termsMartin von Zweigbergk committed 1 year ago7149429
  22. store: make `get_tree()` functions take owned repo pathMartin von Zweigbergk committed 1 year ago409be2e
  23. tree: when merging files, read all sides concurrentlyMartin von Zweigbergk committed 2 years ago5e620bb
  24. store: make `write_file()` asyncMartin von Zweigbergk committed 2 years ago4a8d250
  25. store: make `write_tree()` asyncMartin von Zweigbergk committed 2 years agoecb2847
  26. conflicts: replace ContentHunk with BStringYuya Nishihara committed 2 years ago1ba581b
  27. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  28. merged_tree: replace MergedTreeVal<'_> by Merge<Option<&TreeValue>>Yuya Nishihara committed 2 years agof7377fb
  29. merged_tree: micro-optimize Merge<Tree> entries iterator to return &TreeValueYuya Nishihara committed 2 years ago88018e8
  30. tree: fill in valid id to null tree, rename function to empty()Yuya Nishihara committed 2 years agoed1c07e
  31. files: relax requirement of merge() inputsYuya Nishihara committed 2 years ago1a38748
  32. tree: take sub_tree_recursive() argument as &RepoPathYuya Nishihara committed 2 years agof65ba88
  33. tree: make `sub_tree_recursive()` publicMartin von Zweigbergk committed 2 years agocd5e82d
  34. tree: propagate errors from `sub_tree()`/`path_value()`Martin von Zweigbergk committed 2 years ago1970dde
  35. tree: flatten TreeMergeError into BackendErrorYuya Nishihara committed 2 years ago73b6090