Code

History

Commits on ig/diff-multiples-warning to cli/src/diff_util.rs35+
  1. commit: delete sync version of parent_tree()Martin von Zweigbergk committed 8 months agod518716
  2. rewrite: make all functions asyncMartin von Zweigbergk committed 9 months ago9d62d0d
  3. clippy: fix unnecessary_semicolon lintxtqqczze committed 9 months agocbe8b79
  4. commands: extract completer configuration to separate arg() attributesYuya Nishihara committed 10 months agof4fc391
  5. commands: insert blank line between args struct fieldsYuya Nishihara committed 10 months agof7efb3b
  6. merge: include conflict labels when describing non-file conflictsScott Taylor committed 10 months ago34a1f86
  7. merge: add `Diff::invert` methodScott Taylor committed 11 months ago5c7d0b0
  8. repo_path: use Diff<T> to specify copied source/target pathsYuya Nishihara committed 11 months ago79cefeb
  9. diff: reduce intensity of context line numbers in color-words diffsYuya Nishihara committed 11 months ago2f9041b
  10. conflicts: propagate conflict labels down to materialization functionsScott Taylor committed 1 year ago9b9bdd0
  11. merge: implement IntoIterator for references of Merge<T>Yuya Nishihara committed 11 months ago3890c28
  12. clippy: fix cast_lossless lintxtqqczze committed 11 months agob0ee9bd
  13. conflicts: wrap materialized diff values in Diff<T>Yuya Nishihara committed 11 months agodd41f0e
  14. template: Add support for per-file diff statsVelociraptor115 committed 11 months agoc1b7a6e
  15. diff_util: Add DiffEntryStatus enum and refactor relevant codeVelociraptor115 committed 11 months ago2db1fc8
  16. docs: fix some typosMartin von Zweigbergk committed 11 months ago7f28aad
  17. diff_util: replace `[T; 2]` with `Diff<T>`Scott Taylor committed 1 year ago6433180
  18. merged_tree: use `Merge<TreeId>` instead of `Merge<Tree>`Scott Taylor committed 1 year ago79fc20e
  19. diff_util: move unified diff utils to `jj-lib`Ilya Grigoriev committed 1 year agoe921bfa
  20. commit: introduce `parent_tree_async()`, use in already async callersMartin von Zweigbergk committed 1 year ago3a7babe
  21. merge: add a generic `Diff<T>` type, use in `TreeDiffEntry`Martin von Zweigbergk committed 1 year ago4f456ec
  22. cli_util: rename `Diff` to `ContentDiff`Martin von Zweigbergk committed 1 year ago452a1a4
  23. cargo: bump MSRV to 1.88Austin Seipp committed 1 year ago419bd51
  24. cli: diff: pass $width parameter to external diff toolsYuya Nishihara committed 1 year ago84c7f5d
  25. cli: merge-tools: simply build map of owned substitution variablesYuya Nishihara committed 1 year agof4fe07b
  26. cli: diff: pass left/right trees as array to reduce number of argumentsYuya Nishihara committed 1 year ago91e5bef
  27. files: rename FileMergeOptions to MergeOptions, move to merged_treeYuya Nishihara committed 1 year ago0376bcf
  28. files: introduce stub of FileMergeOptionsYuya Nishihara committed 1 year agoe9e9c6f
  29. formatter: migrate away from .with_label*() functionsYuya Nishihara committed 1 year ago3f434ad
  30. formatter: move labeled() to extension trait, add owned versionYuya Nishihara committed 2 years ago2c0f65e
  31. backend: remove unused TreeValue::Conflict and read/write methodsMartin von Zweigbergk committed 1 year agoda6c4b6
  32. conflicts: pack marker style/len into struct, merge materialize functionsYuya Nishihara committed 1 year ago1cd6f9f
  33. cli: include diff of commit descriptions in inter-diffYuya Nishihara committed 2 years ago939b093
  34. cli: make all DiffRenderer methods asyncYuya Nishihara committed 1 year agod61be4c
  35. cli: pass from/to_tree in to DiffRenderer as an arrayYuya Nishihara committed 1 year ago914903a