Code

History

Commits on ig/rustfmt-generated to cli/src/diff_util.rs35+
  1. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  2. cli lib: make use of `Self` consistentadamnemecek committed 1 year ago8a26df2
  3. diff stat: ensure bar always has 2 spaces for commits with adds and removesBryce Berger committed 1 year ago38a23f9
  4. cli merge tools: allow setting `diff-args=[]` to disable diff formatting with a toolIlya Grigoriev committed 1 year agofedbc30
  5. cli: make diff --stat fill available widthEvan Martin committed 1 year agod9b0a42
  6. cli completion: complete diff tools such as `:git` and `:summary`Ilya Grigoriev committed 1 year ago13d747c
  7. cli completion: complete `--tool` args for merge toolsIlya Grigoriev committed 1 year ago1161e95
  8. cli: add "diff --template" argumentYuya Nishihara committed 1 year ago26ba2a0
  9. async: avoid some async blocks by making whole functions asyncMartin von Zweigbergk committed 1 year ago5ae5f9f
  10. async: bubble up async-ness from Backend::read_fileMartin von Zweigbergk committed 1 year agod2cf2cb
  11. cli: accept --tool=:<format> argument as builtin diff formatYuya Nishihara committed 1 year ago88d79c1
  12. cli: unify diff format/tool config variablesYuya Nishihara committed 1 year ago851d25c
  13. cli: add CommandNameAndArgs::as_str() helperYuya Nishihara committed 1 year agof0386e2
  14. cli: keep short/long diff formats specified by args separatelyYuya Nishihara committed 1 year ago79cb3d2
  15. cli: split builtin diff format resolution into two partsYuya Nishihara committed 1 year agoe4656ce
  16. diff: Run external diff tools in their temp dirEyvind Bernhardsen committed 1 year ago94f28e9
  17. merge: do not map absent tree entry to non-executableYuya Nishihara committed 1 year agob28bc42
  18. conflicts: pack MaterializedTreeValue::FileConflict fields into structYuya Nishihara committed 1 year agof047add
  19. diff: add option to render color-words diffs without materializing conflictsYuya Nishihara committed 2 years agob63ab33
  20. diff: parameterize "removed"/"added" labels in color-words diffsYuya Nishihara committed 1 year agob24efa8
  21. diff: test identical contents early when rendering color-words diffsYuya Nishihara committed 1 year ago8af238f
  22. diff: make FileContent genericYuya Nishihara committed 2 years ago6d009b3
  23. diff: use BString more consistently in rendering functionsYuya Nishihara committed 1 year ago022147e
  24. diff: pass left/right contents and line number pairs by arrayYuya Nishihara committed 1 year agoa3a59ab
  25. conflicts: pack MaterializedTreeValue::File fields, use read_all() helperYuya Nishihara committed 1 year agoe52ddda
  26. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  27. cli: emit warning for deprecated diff.format, move default to config/misc.tomlYuya Nishihara committed 1 year agodcf4771
  28. diff: fix inconsistent handling of "short" format argumentsYuya Nishihara committed 1 year ago902ef9f
  29. cleanup: switch to use<'_> capturing syntaxYuya Nishihara committed 1 year agoa27d925
  30. clippy: replace `allow` directives with `expect` or delete them when possibleIlya Grigoriev committed 1 year agoc36bfaf
  31. diff: extract DiffStats type and calculate() functionYuya Nishihara committed 1 year agob9aef59
  32. diff: map read error of materialized file to BackendErrorYuya Nishihara committed 1 year ago7c2d9f2
  33. diff: rename struct DiffStat to DiffStatEntryYuya Nishihara committed 1 year ago7a66122
  34. diff: accumulate diff stat numbers separatelyYuya Nishihara committed 1 year agoe856449
  35. diff: do not format diff stat paths earlyYuya Nishihara committed 1 year ago2bef93b