Code

History

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