Code

History

Commits on patch-1 to cli/src/diff_util.rs35+
  1. backend: remove unused TreeValue::Conflict and read/write methodsMartin von Zweigbergk committed 1 year agoda6c4b6
  2. conflicts: pack marker style/len into struct, merge materialize functionsYuya Nishihara committed 1 year ago1cd6f9f
  3. cli: include diff of commit descriptions in inter-diffYuya Nishihara committed 2 years ago939b093
  4. cli: make all DiffRenderer methods asyncYuya Nishihara committed 1 year agod61be4c
  5. cli: pass from/to_tree in to DiffRenderer as an arrayYuya Nishihara committed 1 year ago914903a
  6. cli: make diff --stat show byte counts for binary filesEvan Martin committed 1 year ago60a6e94
  7. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  8. cli lib: make use of `Self` consistentadamnemecek committed 1 year ago8a26df2
  9. diff stat: ensure bar always has 2 spaces for commits with adds and removesBryce Berger committed 1 year ago38a23f9
  10. cli merge tools: allow setting `diff-args=[]` to disable diff formatting with a toolIlya Grigoriev committed 1 year agofedbc30
  11. cli: make diff --stat fill available widthEvan Martin committed 1 year agod9b0a42
  12. cli completion: complete diff tools such as `:git` and `:summary`Ilya Grigoriev committed 1 year ago13d747c
  13. cli completion: complete `--tool` args for merge toolsIlya Grigoriev committed 1 year ago1161e95
  14. cli: add "diff --template" argumentYuya Nishihara committed 1 year ago26ba2a0
  15. async: avoid some async blocks by making whole functions asyncMartin von Zweigbergk committed 1 year ago5ae5f9f
  16. async: bubble up async-ness from Backend::read_fileMartin von Zweigbergk committed 1 year agod2cf2cb
  17. cli: accept --tool=:<format> argument as builtin diff formatYuya Nishihara committed 1 year ago88d79c1
  18. cli: unify diff format/tool config variablesYuya Nishihara committed 1 year ago851d25c
  19. cli: add CommandNameAndArgs::as_str() helperYuya Nishihara committed 1 year agof0386e2
  20. cli: keep short/long diff formats specified by args separatelyYuya Nishihara committed 1 year ago79cb3d2
  21. cli: split builtin diff format resolution into two partsYuya Nishihara committed 1 year agoe4656ce
  22. diff: Run external diff tools in their temp dirEyvind Bernhardsen committed 1 year ago94f28e9
  23. merge: do not map absent tree entry to non-executableYuya Nishihara committed 1 year agob28bc42
  24. conflicts: pack MaterializedTreeValue::FileConflict fields into structYuya Nishihara committed 1 year agof047add
  25. diff: add option to render color-words diffs without materializing conflictsYuya Nishihara committed 2 years agob63ab33
  26. diff: parameterize "removed"/"added" labels in color-words diffsYuya Nishihara committed 1 year agob24efa8
  27. diff: test identical contents early when rendering color-words diffsYuya Nishihara committed 1 year ago8af238f
  28. diff: make FileContent genericYuya Nishihara committed 2 years ago6d009b3
  29. diff: use BString more consistently in rendering functionsYuya Nishihara committed 1 year ago022147e
  30. diff: pass left/right contents and line number pairs by arrayYuya Nishihara committed 1 year agoa3a59ab
  31. conflicts: pack MaterializedTreeValue::File fields, use read_all() helperYuya Nishihara committed 1 year agoe52ddda
  32. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  33. cli: emit warning for deprecated diff.format, move default to config/misc.tomlYuya Nishihara committed 1 year agodcf4771
  34. diff: fix inconsistent handling of "short" format argumentsYuya Nishihara committed 1 year ago902ef9f
  35. cleanup: switch to use<'_> capturing syntaxYuya Nishihara committed 1 year agoa27d925