Code

History

Commits on git-sync to cli/src/diff_util.rs35+
  1. cli: add option to limit diff stat bar widthivelieu committed 3 months ago9f9e3e9
  2. diff: avoid word inlining without colorJakub Stasiak committed 5 months ago92b7af4
  3. diff.git: Add a show-path-prefix option to disable a/ and b/ prefixesjonmeow committed 7 months ago09ede03
  4. cli: make diff_util::get_copy_records() asyncYuya Nishihara committed 8 months agodff1e74
  5. cli: diff: insert format name to color labelsYuya Nishihara committed 8 months ago8f24605
  6. cli: diff: propagate future from diff_content()Yuya Nishihara committed 8 months agoa95bee7
  7. lib: make a few more functions asyncAustin Seipp committed 8 months ago5ae2acc
  8. merge_tools: make asyncMartin von Zweigbergk committed 8 months ago7acd15d
  9. cli: remove some redundant block_on() callsAustin Seipp committed 8 months agob27e4d8
  10. commit: delete sync version of parent_tree()Martin von Zweigbergk committed 8 months agod518716
  11. rewrite: make all functions asyncMartin von Zweigbergk committed 9 months ago9d62d0d
  12. clippy: fix unnecessary_semicolon lintxtqqczze committed 9 months agocbe8b79
  13. commands: extract completer configuration to separate arg() attributesYuya Nishihara committed 10 months agof4fc391
  14. commands: insert blank line between args struct fieldsYuya Nishihara committed 10 months agof7efb3b
  15. merge: include conflict labels when describing non-file conflictsScott Taylor committed 10 months ago34a1f86
  16. merge: add `Diff::invert` methodScott Taylor committed 11 months ago5c7d0b0
  17. repo_path: use Diff<T> to specify copied source/target pathsYuya Nishihara committed 11 months ago79cefeb
  18. diff: reduce intensity of context line numbers in color-words diffsYuya Nishihara committed 11 months ago2f9041b
  19. conflicts: propagate conflict labels down to materialization functionsScott Taylor committed 1 year ago9b9bdd0
  20. merge: implement IntoIterator for references of Merge<T>Yuya Nishihara committed 11 months ago3890c28
  21. clippy: fix cast_lossless lintxtqqczze committed 11 months agob0ee9bd
  22. conflicts: wrap materialized diff values in Diff<T>Yuya Nishihara committed 11 months agodd41f0e
  23. template: Add support for per-file diff statsVelociraptor115 committed 11 months agoc1b7a6e
  24. diff_util: Add DiffEntryStatus enum and refactor relevant codeVelociraptor115 committed 11 months ago2db1fc8
  25. docs: fix some typosMartin von Zweigbergk committed 11 months ago7f28aad
  26. diff_util: replace `[T; 2]` with `Diff<T>`Scott Taylor committed 1 year ago6433180
  27. merged_tree: use `Merge<TreeId>` instead of `Merge<Tree>`Scott Taylor committed 1 year ago79fc20e
  28. diff_util: move unified diff utils to `jj-lib`Ilya Grigoriev committed 1 year agoe921bfa
  29. commit: introduce `parent_tree_async()`, use in already async callersMartin von Zweigbergk committed 1 year ago3a7babe
  30. merge: add a generic `Diff<T>` type, use in `TreeDiffEntry`Martin von Zweigbergk committed 1 year ago4f456ec
  31. cli_util: rename `Diff` to `ContentDiff`Martin von Zweigbergk committed 1 year ago452a1a4
  32. cargo: bump MSRV to 1.88Austin Seipp committed 1 year ago419bd51
  33. cli: diff: pass $width parameter to external diff toolsYuya Nishihara committed 1 year ago84c7f5d
  34. cli: merge-tools: simply build map of owned substitution variablesYuya Nishihara committed 1 year agof4fe07b
  35. cli: diff: pass left/right trees as array to reduce number of argumentsYuya Nishihara committed 1 year ago91e5bef