Code

History

Commits on ig/contributing to cli/src/diff_util.rs35+
  1. cli: change `R` to `D` for "deleted" in diff summaryIlya Grigoriev committed 2 years agobef2eca
  2. cli: group diff formatting options in helpYuya Nishihara committed 2 years ago3357882
  3. object_id: extract ObjectId trait and macros to separate moduleYuya Nishihara committed 2 years agofa5e407
  4. cli: read files concurrently when diffingMartin von Zweigbergk committed 3 years ago0d02724
  5. repo_path: make to_internal_file_string() return &str, rename accordinglyYuya Nishihara committed 2 years ago55f7527
  6. diff_utils: return `&str` from `basic_diff_file_type()`Martin von Zweigbergk committed 3 years agobf36933
  7. cli: pass `MaterializedTreeValue` into `diff_content()`Martin von Zweigbergk committed 3 years agoffbfd74
  8. cli: pass `MaterializedTreeValue` into `git_diff_part()`Martin von Zweigbergk committed 3 years ago120115a
  9. diff_utils: pass tree value into `diff_content()` by valueMartin von Zweigbergk committed 3 years agob11f7ee
  10. conflicts: add another helper for materializing a tree valueMartin von Zweigbergk committed 3 years ago9b24d24
  11. merged_tree: add `Stream`-based version of `diff()`, delegating for nowMartin von Zweigbergk committed 3 years ago72245cf
  12. async: switch to `pollster`'s `block_on()`Martin von Zweigbergk committed 3 years ago24b7066
  13. merged_tree: propagate backend errors in diff iteratorMartin von Zweigbergk committed 3 years agoa1ef9dc
  14. merge: introduce a type alias for `Merge<Option<TreeValue>>`Martin von Zweigbergk committed 3 years ago309f120
  15. conflicts: make materialization asyncMartin von Zweigbergk committed 3 years ago8764ad9
  16. merge_tools: enable `:builtin` as default diff/merge editorWaleed Khan committed 3 years ago409356f
  17. cli: make diff stat calculate path length based on unicode widthYuya Nishihara committed 3 years ago1c7d2b9
  18. cli: trim path in diff stat if it's long, to give room for statMartin von Zweigbergk committed 3 years agob18c97a
  19. cli: make diff stat determine path length in chars, not bytesMartin von Zweigbergk committed 3 years ago5ecc95a
  20. cli: don't crash diffstat on very narrow terminalsMartin von Zweigbergk committed 3 years ago4377c08
  21. cli: reuse `number_padding` instead of calculating twice in diff statMartin von Zweigbergk committed 3 years ago5a054fc
  22. cli: allow diff stat bar to be one character longerMartin von Zweigbergk committed 3 years ago5ce4ed4
  23. cli: fix crash on diff stat with long path nameMartin von Zweigbergk committed 3 years ago9395281
  24. commit: drop `merged_` prefix from `tree()` and `tree_id()`Martin von Zweigbergk committed 3 years ago145b0b2
  25. rewrite: return `MergedTree` from `merge_commit_trees()`Martin von Zweigbergk committed 3 years ago90e78a1
  26. diff_util: use `MergedTree` throughoutMartin von Zweigbergk committed 3 years ago732e448
  27. diff_util: make `diff_content()` return empty for missing pathMartin von Zweigbergk committed 3 years ago5309335
  28. diff_util: unify handling of unexpected casesMartin von Zweigbergk committed 3 years ago5ef925d
  29. merge_tools: pass `MergedTree`s to `edit_diff()`Martin von Zweigbergk committed 3 years ago17fe5e3
  30. Fix docs for diff --statOscar Bonilla committed 3 years ago30c2a21
  31. Add jj diffs --stat optionOscar Bonilla committed 3 years ago5bd726f
  32. merge_tools: rename `MergeTool` -> `ExternalMergeTool`Waleed Khan committed 3 years agoc572c1a
  33. cli: indicate empty files in default diff formatMartin von Zweigbergk committed 3 years ago00d2d2d
  34. merge: move some methods back to `conflicts` as free functionsMartin von Zweigbergk committed 3 years agoa995c66
  35. cli: pass ui in to merge_tools::generate_diff()Yuya Nishihara committed 3 years ago9dbadda