Code

History

Commits on ig/docs-commitid to cli/src/diff_util.rs35+
  1. cli: add "diff --template" argumentYuya Nishihara committed 1 year ago26ba2a0
  2. async: avoid some async blocks by making whole functions asyncMartin von Zweigbergk committed 1 year ago5ae5f9f
  3. async: bubble up async-ness from Backend::read_fileMartin von Zweigbergk committed 1 year agod2cf2cb
  4. cli: accept --tool=:<format> argument as builtin diff formatYuya Nishihara committed 1 year ago88d79c1
  5. cli: unify diff format/tool config variablesYuya Nishihara committed 1 year ago851d25c
  6. cli: add CommandNameAndArgs::as_str() helperYuya Nishihara committed 1 year agof0386e2
  7. cli: keep short/long diff formats specified by args separatelyYuya Nishihara committed 1 year ago79cb3d2
  8. cli: split builtin diff format resolution into two partsYuya Nishihara committed 1 year agoe4656ce
  9. diff: Run external diff tools in their temp dirEyvind Bernhardsen committed 1 year ago94f28e9
  10. merge: do not map absent tree entry to non-executableYuya Nishihara committed 1 year agob28bc42
  11. conflicts: pack MaterializedTreeValue::FileConflict fields into structYuya Nishihara committed 1 year agof047add
  12. diff: add option to render color-words diffs without materializing conflictsYuya Nishihara committed 2 years agob63ab33
  13. diff: parameterize "removed"/"added" labels in color-words diffsYuya Nishihara committed 1 year agob24efa8
  14. diff: test identical contents early when rendering color-words diffsYuya Nishihara committed 1 year ago8af238f
  15. diff: make FileContent genericYuya Nishihara committed 2 years ago6d009b3
  16. diff: use BString more consistently in rendering functionsYuya Nishihara committed 1 year ago022147e
  17. diff: pass left/right contents and line number pairs by arrayYuya Nishihara committed 1 year agoa3a59ab
  18. conflicts: pack MaterializedTreeValue::File fields, use read_all() helperYuya Nishihara committed 1 year agoe52ddda
  19. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  20. cli: emit warning for deprecated diff.format, move default to config/misc.tomlYuya Nishihara committed 1 year agodcf4771
  21. diff: fix inconsistent handling of "short" format argumentsYuya Nishihara committed 1 year ago902ef9f
  22. cleanup: switch to use<'_> capturing syntaxYuya Nishihara committed 1 year agoa27d925
  23. clippy: replace `allow` directives with `expect` or delete them when possibleIlya Grigoriev committed 1 year agoc36bfaf
  24. diff: extract DiffStats type and calculate() functionYuya Nishihara committed 1 year agob9aef59
  25. diff: map read error of materialized file to BackendErrorYuya Nishihara committed 1 year ago7c2d9f2
  26. diff: rename struct DiffStat to DiffStatEntryYuya Nishihara committed 1 year ago7a66122
  27. diff: accumulate diff stat numbers separatelyYuya Nishihara committed 1 year agoe856449
  28. diff: do not format diff stat paths earlyYuya Nishihara committed 1 year ago2bef93b
  29. diff: remove ad-hoc rename handling in show_diff_stat()Yuya Nishihara committed 1 year ago90e7934
  30. templater: add TreeDiffEntry typesYuya Nishihara committed 1 year agob22347e
  31. diff: extract function that maps diff entry to status label and charYuya Nishihara committed 1 year agoe21f8e6
  32. templater: load diff parameters from config fileYuya Nishihara committed 1 year ago9683d81
  33. cli: split diff options constructors to not require command argsYuya Nishihara committed 1 year ago3ed77c9
  34. style: remove useless type conversionSamuel Tardieu committed 1 year ago373b155
  35. cli/src/diff_util.rs: fix typo in `diff --name-only`Tim Janik committed 1 year ago779272c