Code

History

Commits on ig/vimdiffwarn to lib/src/tree.rs35+
  1. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  2. tree: delete unused code for merging legacy treesMartin von Zweigbergk committed 1 year ago162e455
  3. merge: make `trivial_merge()` take a single slice of interleaved termsMartin von Zweigbergk committed 1 year ago7149429
  4. store: make `get_tree()` functions take owned repo pathMartin von Zweigbergk committed 1 year ago409be2e
  5. tree: when merging files, read all sides concurrentlyMartin von Zweigbergk committed 2 years ago5e620bb
  6. store: make `write_file()` asyncMartin von Zweigbergk committed 2 years ago4a8d250
  7. store: make `write_tree()` asyncMartin von Zweigbergk committed 2 years agoecb2847
  8. conflicts: replace ContentHunk with BStringYuya Nishihara committed 2 years ago1ba581b
  9. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  10. merged_tree: replace MergedTreeVal<'_> by Merge<Option<&TreeValue>>Yuya Nishihara committed 2 years agof7377fb
  11. merged_tree: micro-optimize Merge<Tree> entries iterator to return &TreeValueYuya Nishihara committed 2 years ago88018e8
  12. tree: fill in valid id to null tree, rename function to empty()Yuya Nishihara committed 2 years agoed1c07e
  13. files: relax requirement of merge() inputsYuya Nishihara committed 2 years ago1a38748
  14. tree: take sub_tree_recursive() argument as &RepoPathYuya Nishihara committed 2 years agof65ba88
  15. tree: make `sub_tree_recursive()` publicMartin von Zweigbergk committed 2 years agocd5e82d
  16. tree: propagate errors from `sub_tree()`/`path_value()`Martin von Zweigbergk committed 2 years ago1970dde
  17. tree: flatten TreeMergeError into BackendErrorYuya Nishihara committed 2 years ago73b6090
  18. tree: consolidate read error variantsYuya Nishihara committed 2 years ago916014d
  19. tree: remove useless "Backend error" message from TreeMergeErrorYuya Nishihara committed 2 years ago1e83faf
  20. cleanup: remove remaining ": {source}" from error message templatesYuya Nishihara committed 2 years ago77ceadb
  21. object_id: extract ObjectId trait and macros to separate moduleYuya Nishihara committed 2 years agofa5e407
  22. merged_tree: remove canceling terms prior to resolving file-level conflictYuya Nishihara committed 2 years ago35f718f
  23. repo_path: split RepoPath into owned and borrowed typesYuya Nishihara committed 2 years ago28ab959
  24. repo_path: add stub RepoPathBuf type, update callersYuya Nishihara committed 2 years ago0a1bc2b
  25. repo_path: make RepoPath::components() return iteratorYuya Nishihara committed 2 years ago974a687
  26. repo_path: add stub type to introduce borrowed RepoPathComponent typeYuya Nishihara committed 2 years agof2096da
  27. repo_path: remove RepoPathJoin trait, just implement join() on the typeYuya Nishihara committed 2 years ago6344cd5
  28. tree: make TreeEntriesDirItem not self-referentialMartin von Zweigbergk committed 2 years ago9be24db
  29. tree: remove unsafe with `ouroboros` for self-referential iteratorsWaleed Khan committed 3 years agoa60733f
  30. merge: add Merge constructor that accepts interleaved valuesYuya Nishihara committed 3 years agodd26b7b
  31. files: use borrowed Merge iterator in merge()Yuya Nishihara committed 3 years ago895bbce
  32. merge: introduce a type alias for `Merge<Option<TreeValue>>`Martin von Zweigbergk committed 3 years ago309f120
  33. tree: simplify conflict before resolving at hunk levelMartin von Zweigbergk committed 3 years ago7fda80f
  34. files: take `Merge` argument to `merge()`Martin von Zweigbergk committed 3 years agoaf80e4e
  35. tree: leverage `Merge::try_map()` when reading file contents to mergeMartin von Zweigbergk committed 3 years ago9946e52