Code

History

Commits on ig/commit-debug to cli/src/diff_util.rs35+
  1. commit: introduce `parent_tree_async()`, use in already async callersMartin von Zweigbergk committed 1 year ago3a7babe
  2. merge: add a generic `Diff<T>` type, use in `TreeDiffEntry`Martin von Zweigbergk committed 1 year ago4f456ec
  3. cli_util: rename `Diff` to `ContentDiff`Martin von Zweigbergk committed 1 year ago452a1a4
  4. cargo: bump MSRV to 1.88Austin Seipp committed 1 year ago419bd51
  5. cli: diff: pass $width parameter to external diff toolsYuya Nishihara committed 1 year ago84c7f5d
  6. cli: merge-tools: simply build map of owned substitution variablesYuya Nishihara committed 1 year agof4fe07b
  7. cli: diff: pass left/right trees as array to reduce number of argumentsYuya Nishihara committed 1 year ago91e5bef
  8. files: rename FileMergeOptions to MergeOptions, move to merged_treeYuya Nishihara committed 1 year ago0376bcf
  9. files: introduce stub of FileMergeOptionsYuya Nishihara committed 1 year agoe9e9c6f
  10. formatter: migrate away from .with_label*() functionsYuya Nishihara committed 1 year ago3f434ad
  11. formatter: move labeled() to extension trait, add owned versionYuya Nishihara committed 2 years ago2c0f65e
  12. backend: remove unused TreeValue::Conflict and read/write methodsMartin von Zweigbergk committed 1 year agoda6c4b6
  13. conflicts: pack marker style/len into struct, merge materialize functionsYuya Nishihara committed 1 year ago1cd6f9f
  14. cli: include diff of commit descriptions in inter-diffYuya Nishihara committed 2 years ago939b093
  15. cli: make all DiffRenderer methods asyncYuya Nishihara committed 1 year agod61be4c
  16. cli: pass from/to_tree in to DiffRenderer as an arrayYuya Nishihara committed 1 year ago914903a
  17. cli: make diff --stat show byte counts for binary filesEvan Martin committed 1 year ago60a6e94
  18. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  19. cli lib: make use of `Self` consistentadamnemecek committed 1 year ago8a26df2
  20. diff stat: ensure bar always has 2 spaces for commits with adds and removesBryce Berger committed 1 year ago38a23f9
  21. cli merge tools: allow setting `diff-args=[]` to disable diff formatting with a toolIlya Grigoriev committed 1 year agofedbc30
  22. cli: make diff --stat fill available widthEvan Martin committed 1 year agod9b0a42
  23. cli completion: complete diff tools such as `:git` and `:summary`Ilya Grigoriev committed 1 year ago13d747c
  24. cli completion: complete `--tool` args for merge toolsIlya Grigoriev committed 1 year ago1161e95
  25. cli: add "diff --template" argumentYuya Nishihara committed 1 year ago26ba2a0
  26. async: avoid some async blocks by making whole functions asyncMartin von Zweigbergk committed 1 year ago5ae5f9f
  27. async: bubble up async-ness from Backend::read_fileMartin von Zweigbergk committed 1 year agod2cf2cb
  28. cli: accept --tool=:<format> argument as builtin diff formatYuya Nishihara committed 1 year ago88d79c1
  29. cli: unify diff format/tool config variablesYuya Nishihara committed 1 year ago851d25c
  30. cli: add CommandNameAndArgs::as_str() helperYuya Nishihara committed 1 year agof0386e2
  31. cli: keep short/long diff formats specified by args separatelyYuya Nishihara committed 1 year ago79cb3d2
  32. cli: split builtin diff format resolution into two partsYuya Nishihara committed 1 year agoe4656ce
  33. diff: Run external diff tools in their temp dirEyvind Bernhardsen committed 1 year ago94f28e9
  34. merge: do not map absent tree entry to non-executableYuya Nishihara committed 1 year agob28bc42
  35. conflicts: pack MaterializedTreeValue::FileConflict fields into structYuya Nishihara committed 1 year agof047add