Code

History

Commits on CacheMyWorkingCopy to lib/src/conflicts.rs35+
  1. cli: pass `MaterializedTreeValue` into `git_diff_part()`Martin von Zweigbergk committed 3 years ago120115a
  2. conflicts: add another helper for materializing a tree valueMartin von Zweigbergk committed 3 years ago9b24d24
  3. merge: rename Merge::new() to Merge::from_removes_adds()Yuya Nishihara committed 3 years agoe0c3568
  4. files: use borrowed Merge iterator in merge()Yuya Nishihara committed 3 years ago895bbce
  5. merge: have Merge::adds()/removes() return iteratorYuya Nishihara committed 3 years agod9fbf21
  6. merge: add method for indexed adds/removes accessYuya Nishihara committed 3 years agob12c688
  7. merge: introduce a type alias for `Merge<Option<TreeValue>>`Martin von Zweigbergk committed 3 years ago309f120
  8. conflicts: make materialization asyncMartin von Zweigbergk committed 3 years ago8764ad9
  9. files: take `Merge` argument to `merge()`Martin von Zweigbergk committed 3 years agoaf80e4e
  10. conflicts: leverage `Merge::map()` in `materialize_merge_result()`Martin von Zweigbergk committed 3 years ago16c897d
  11. conflicts: leverage `Merge::iter_mut()` and `Merge::into_iter()`Martin von Zweigbergk committed 3 years agoab4d44d
  12. merge: add `Merge::num_sides()`Martin von Zweigbergk committed 3 years agof877610
  13. conflicts: combine loops for adds/removes in `update_from_content()`Martin von Zweigbergk committed 3 years agob16fd3b
  14. conflicts: check earlier for edited absent part in conflict markersMartin von Zweigbergk committed 3 years agof45b805
  15. conflicts: remove redundant check of `num_sides` from conditionMartin von Zweigbergk committed 3 years agodffe069
  16. conflicts: remove redundant `num_removes` argument from `parse_conflict()`Martin von Zweigbergk committed 3 years ago0b3b62a
  17. conflicts: make `update_from_content()` write resolved content to storeMartin von Zweigbergk committed 3 years ago4c46398
  18. conflicts: make `update_from_content()` work with only `FileId`sMartin von Zweigbergk committed 3 years ago0b85f06
  19. merge: move some methods back to `conflicts` as free functionsMartin von Zweigbergk committed 3 years agoa995c66
  20. conflicts: move `Merge` tests to `merge` moduleMartin von Zweigbergk committed 3 years agob9b285c
  21. conflicts: move `Merge<T>` to `merge` moduleMartin von Zweigbergk committed 3 years agoef5f97f
  22. conflicts: rename `Conflict<T>` to `Merge<T>`Martin von Zweigbergk committed 3 years agoecc0308
  23. backend: learn to store tree-level conflictsMartin von Zweigbergk committed 3 years ago006c764
  24. merged_tree: add an iterator over conflictsMartin von Zweigbergk committed 3 years agodeb4ae4
  25. merged_tree: add a function for resolving conflictsMartin von Zweigbergk committed 3 years ago828d528
  26. cleanup: use let-else now that we're on Rust 1.65+Martin von Zweigbergk committed 3 years agoe033f91
  27. docs: warn about missing docs for `jj-lib` crateWaleed Khan committed 3 years ago54dba51
  28. conflicts: relax from_legacy_form() to accept any iterableYuya Nishihara committed 3 years ago9140e5b
  29. conflicts: simplify inner loop of simplify() a bitYuya Nishihara committed 3 years agoafb1e16
  30. conflicts: move repeated definition of `c()` in tests to module levelMartin von Zweigbergk committed 3 years ago7bcb01a
  31. conflicts: add `flatten()` for flattening nested conflictsMartin von Zweigbergk committed 3 years ago07dbc9f
  32. conflicts: add `try_map()` for `Result`Martin von Zweigbergk committed 3 years ago183021f
  33. conflicts: rename `try_map()` to `maybe_map()`Martin von Zweigbergk committed 3 years ago24c0190
  34. conflicts: add a `map()`, use in `extract_as_single_hunk()`Martin von Zweigbergk committed 3 years ago83fefa9
  35. files: replace uses of `MergeHunk` by `Conflict<ContentHunk>`Martin von Zweigbergk committed 3 years ago779b8ba