Code

History

Commits on ig/commit-debug to lib/src/files.rs35+
  1. cleanup: remove redundant + use<'_> after migrating to 2024 editionYuya Nishihara committed 1 year ago5f40f62
  2. cli_util: rename `Diff` to `ContentDiff`Martin von Zweigbergk committed 1 year ago452a1a4
  3. merge: remove Default from MergeOptionsYuya Nishihara committed 1 year ago8cd43d1
  4. cleanup: replace clippy allow() exemptions by expect()Martin von Zweigbergk committed 1 year ago8aa9d1d
  5. merged_tree: move MergeOptions to tree_mergeMartin von Zweigbergk committed 1 year ago92bc6e4
  6. files, tree: make same-change conflict resolution configurableYuya Nishihara committed 1 year agoaf4fe21
  7. files: rename FileMergeOptions to MergeOptions, move to merged_treeYuya Nishihara committed 1 year ago0376bcf
  8. files: add option to resolve conflicts word by wordYuya Nishihara committed 2 years ago9589bec
  9. files: introduce Cow-like wrapper for merge hunksYuya Nishihara committed 2 years agoeb75fc5
  10. files: introduce stub of FileMergeOptionsYuya Nishihara committed 1 year agoe9e9c6f
  11. cli lib: make use of `Self` consistentadamnemecek committed 1 year ago8a26df2
  12. files: make DiffLineIterator omit blank right line following matching+leftYuya Nishihara committed 1 year ago79fb219
  13. files: add iterator adaptor that splits hunks into left/right mergesYuya Nishihara committed 2 years ago51d4f49
  14. files: add functions that return merge result as Merge<_>/Option<_>Yuya Nishihara committed 1 year ago38ecdcf
  15. files: rename merge() to merge_hunks()Yuya Nishihara committed 1 year ago624cb66
  16. files: extract iterator from merge_hunks()Yuya Nishihara committed 1 year ago8b32eaf
  17. files: document merge() function and result type, rename parameterYuya Nishihara committed 1 year ago7a7e62c
  18. tests: remove files::merge() wrapper, construct Merge in alternate formYuya Nishihara committed 1 year ago1032896
  19. tests: use indoc! {""} to format multi-line merge inputsYuya Nishihara committed 1 year ago8b949f7
  20. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  21. files: use Merge constructor to interleave conflicting diff partsYuya Nishihara committed 1 year ago3fbf124
  22. merge: make `trivial_merge()` take a single slice of interleaved termsMartin von Zweigbergk committed 1 year ago7149429
  23. style: remove unneeded lifetimes from trait implementationsSamuel Tardieu committed 2 years ago2112584
  24. diff: return matching hunk contents from all inputsYuya Nishihara committed 2 years ago383cca4
  25. conflicts: replace ContentHunk with BStringYuya Nishihara committed 2 years ago1ba581b
  26. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  27. files: allow DiffLineIterator users to specify and retrieve line numbersYuya Nishihara committed 2 years ago59745fb
  28. files: micro-optimzie DiffLine::reset_line() to not clone hunksYuya Nishihara committed 2 years ago085e17e
  29. files: replace precomputed has_left/right_content flags with functionsYuya Nishihara committed 2 years agoa973c7b
  30. diff: clarify that DiffLine hunk doesn't have [left, right] diff pairYuya Nishihara committed 2 years agocca5277
  31. files: ensure that DiffLineIterator hunk has exactly two inputsYuya Nishihara committed 2 years agoac27365
  32. files: make DiffLineIterator accept generic DiffLine iteratorYuya Nishihara committed 2 years ago78c0128
  33. files: replace Vec + index access with iterator in DiffLineIteratorYuya Nishihara committed 2 years agof857922
  34. files: use imported DiffHunk type in DiffLineIteratorYuya Nishihara committed 2 years ago54f5c01
  35. files: relax requirement of merge() inputsYuya Nishihara committed 2 years ago1a38748