Code

History

Commits on ig/vimdiffwarn to lib/src/files.rs35+
  1. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  2. files: use Merge constructor to interleave conflicting diff partsYuya Nishihara committed 1 year ago3fbf124
  3. merge: make `trivial_merge()` take a single slice of interleaved termsMartin von Zweigbergk committed 1 year ago7149429
  4. style: remove unneeded lifetimes from trait implementationsSamuel Tardieu committed 2 years ago2112584
  5. diff: return matching hunk contents from all inputsYuya Nishihara committed 2 years ago383cca4
  6. conflicts: replace ContentHunk with BStringYuya Nishihara committed 2 years ago1ba581b
  7. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  8. files: allow DiffLineIterator users to specify and retrieve line numbersYuya Nishihara committed 2 years ago59745fb
  9. files: micro-optimzie DiffLine::reset_line() to not clone hunksYuya Nishihara committed 2 years ago085e17e
  10. files: replace precomputed has_left/right_content flags with functionsYuya Nishihara committed 2 years agoa973c7b
  11. diff: clarify that DiffLine hunk doesn't have [left, right] diff pairYuya Nishihara committed 2 years agocca5277
  12. files: ensure that DiffLineIterator hunk has exactly two inputsYuya Nishihara committed 2 years agoac27365
  13. files: make DiffLineIterator accept generic DiffLine iteratorYuya Nishihara committed 2 years ago78c0128
  14. files: replace Vec + index access with iterator in DiffLineIteratorYuya Nishihara committed 2 years agof857922
  15. files: use imported DiffHunk type in DiffLineIteratorYuya Nishihara committed 2 years ago54f5c01
  16. files: relax requirement of merge() inputsYuya Nishihara committed 2 years ago1a38748
  17. files: extract pre-processing part from merge()Yuya Nishihara committed 2 years agoe5b49c7
  18. diff: leverage BStr for better debug printingYuya Nishihara committed 2 years ago6f6381d
  19. diff: add generic DiffHunk constructorsYuya Nishihara committed 2 years ago502547d
  20. diff: accept diff inputs by generic iteratorYuya Nishihara committed 2 years ago59daef2
  21. diff: add short for Diff::for_tokenizer(_, find_line_ranges)Yuya Nishihara committed 2 years ago6a1d926
  22. diff: consider uncommon words to match only if they have the same countMartin von Zweigbergk committed 5 years agofefe07b
  23. diff: simply pass tokenizer Fn by valueYuya Nishihara committed 2 years ago5f2f13a
  24. clippy: remove some unused code beta clippy/rustc compain aboutIlya Grigoriev committed 2 years ago4fbe6ae
  25. merge: relax input type of Merge::from_removes_adds()Yuya Nishihara committed 3 years agod1b0c4c
  26. merge: rename Merge::new() to Merge::from_removes_adds()Yuya Nishihara committed 3 years agoe0c3568
  27. files: use borrowed Merge iterator in merge()Yuya Nishihara committed 3 years ago895bbce
  28. files: take `Merge` argument to `merge()`Martin von Zweigbergk committed 3 years agoaf80e4e
  29. conflicts: move `Merge<T>` to `merge` moduleMartin von Zweigbergk committed 3 years agoef5f97f
  30. conflicts: rename `Conflict<T>` to `Merge<T>`Martin von Zweigbergk committed 3 years agoecc0308
  31. docs: warn about missing docs for `jj-lib` crateWaleed Khan committed 3 years ago54dba51
  32. files: replace uses of `MergeHunk` by `Conflict<ContentHunk>`Martin von Zweigbergk committed 3 years ago779b8ba
  33. files: make `MergeHunk::Conflict` be a `Conflict<ContentHunk>`Martin von Zweigbergk committed 3 years agoc625e93
  34. files: add a newtype around `Vec<u8>` for content hunksMartin von Zweigbergk committed 3 years agob1f2e80
  35. conflicts: resolve trivial merge of `A+A-B+C-C` to `A`Martin von Zweigbergk committed 3 years ago3f95daf