Code

History

Commits on git-sync to cli/src/diff_util.rs140+
  1. cli: rename ColorWordsOptions to ColorWordsDiffOptionsYuya Nishihara committed 2 years agodf40a09
  2. diff: return matching hunk contents from all inputsYuya Nishihara committed 2 years ago383cca4
  3. style: add semicolon at the end of expressions used as statementsSamuel Tardieu committed 2 years ago3f2ef2e
  4. diff: buffer color-words context linesYuya Nishihara committed 2 years ago0c9bc37
  5. diff: extract function that prints color-words diff linesYuya Nishihara committed 2 years ago9f5ce93
  6. diff: extract line number handling from show_color_words_diff_line()Yuya Nishihara committed 2 years ago79e76c5
  7. diff: extract inter-diff helperYuya Nishihara committed 2 years ago03487af
  8. conflicts: pass around conflict contents without materializationYuya Nishihara committed 2 years ago9c9e564
  9. conflicts: split materialized value to FileConflict and OtherConflictYuya Nishihara committed 2 years ago73a8b13
  10. cleanup: remove redundant ::{self} from use declarationsYuya Nishihara committed 2 years ago87fb169
  11. diff: pass tree diff stream in to inner show_*() functions as beforeYuya Nishihara committed 2 years ago4ffd3a3
  12. copies: determine copy/rename operation by CopiesTreeDiffStreamYuya Nishihara committed 2 years agof5187fa
  13. copies: extract (source, target) path pair to separate typeYuya Nishihara committed 2 years ago08262eb
  14. merged_tree: rename diff entry field from "value" to "values"Yuya Nishihara committed 2 years ago43bf195
  15. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  16. copies: filter rename source entries by CopiesTreeDiffStreamYuya Nishihara committed 2 years ago352a4a0
  17. diff: omit rename source entries from color-words diffsYuya Nishihara committed 2 years ago7684ab5
  18. copies: provide source path mapping by CopyRecordsYuya Nishihara committed 2 years ago2cffcc9
  19. diff: filter out uninteresting copy records by matcherYuya Nishihara committed 2 years ago5e356ff
  20. copies: turn add_records() into non-stream API, block_on_stream() by callerYuya Nishihara committed 2 years agod85e66b
  21. diff: add option to display complex color-words diffs without inliningYuya Nishihara committed 2 years agoa83dadd
  22. diff: pad last newline by show_color_words_diff_line()Yuya Nishihara committed 2 years agobe9b7ed
  23. diff: extract helper that prints color-words line numbersYuya Nishihara committed 2 years agobb686c1
  24. diff: extract helpers that process word-level diffs without interleavingYuya Nishihara committed 2 years ago6b2e191
  25. cli: introduce options struct specific to color-words diffsYuya Nishihara committed 2 years agodecd913
  26. cli: pass &DiffFormatArgs in to default_diff_format()Yuya Nishihara committed 2 years ago5ff4e2d
  27. cli: flatten diff-args-to-formats translationYuya Nishihara committed 2 years agof76db7f
  28. copies: add a separate diff stream item type with copy infoMartin von Zweigbergk committed 2 years ago721aa12
  29. merged_tree: provide separate version of `diff_stream()` with copy infoMartin von Zweigbergk committed 2 years ago7059849
  30. copies: move `CopyRecords` to new `copies` moduleMartin von Zweigbergk committed 2 years agofd9a236
  31. diff: simplify conditions whether to emit color-words context linesYuya Nishihara committed 2 years ago1be955e
  32. diff: split color-words diffing to line-based and refinement stagesYuya Nishihara committed 2 years ago9beb570
  33. files: allow DiffLineIterator users to specify and retrieve line numbersYuya Nishihara committed 2 years ago59745fb
  34. diff: extract Diff::by_word() functionYuya Nishihara committed 2 years ago2be8e59
  35. copy-tracking: implement copy tracking for external toolsMatt Kulukundis committed 2 years ago2f2e5fb