Code

History

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