Code

History

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