Code

History

Commits on CacheMyWorkingCopy to lib/src/tree.rs35+
  1. cleanup: remove remaining ": {source}" from error message templatesYuya Nishihara committed 2 years ago77ceadb
  2. object_id: extract ObjectId trait and macros to separate moduleYuya Nishihara committed 2 years agofa5e407
  3. merged_tree: remove canceling terms prior to resolving file-level conflictYuya Nishihara committed 2 years ago35f718f
  4. repo_path: split RepoPath into owned and borrowed typesYuya Nishihara committed 2 years ago28ab959
  5. repo_path: add stub RepoPathBuf type, update callersYuya Nishihara committed 2 years ago0a1bc2b
  6. repo_path: make RepoPath::components() return iteratorYuya Nishihara committed 2 years ago974a687
  7. repo_path: add stub type to introduce borrowed RepoPathComponent typeYuya Nishihara committed 2 years agof2096da
  8. repo_path: remove RepoPathJoin trait, just implement join() on the typeYuya Nishihara committed 2 years ago6344cd5
  9. tree: make TreeEntriesDirItem not self-referentialMartin von Zweigbergk committed 2 years ago9be24db
  10. tree: remove unsafe with `ouroboros` for self-referential iteratorsWaleed Khan committed 3 years agoa60733f
  11. merge: add Merge constructor that accepts interleaved valuesYuya Nishihara committed 3 years agodd26b7b
  12. files: use borrowed Merge iterator in merge()Yuya Nishihara committed 3 years ago895bbce
  13. merge: introduce a type alias for `Merge<Option<TreeValue>>`Martin von Zweigbergk committed 3 years ago309f120
  14. tree: simplify conflict before resolving at hunk levelMartin von Zweigbergk committed 3 years ago7fda80f
  15. files: take `Merge` argument to `merge()`Martin von Zweigbergk committed 3 years agoaf80e4e
  16. tree: leverage `Merge::try_map()` when reading file contents to mergeMartin von Zweigbergk committed 3 years ago9946e52
  17. tree: inline `legacy_id()` into its sole callerMartin von Zweigbergk committed 3 years ago64b47ba
  18. tree: delete recursive diff iterator, which is no longer usedMartin von Zweigbergk committed 3 years agof47da04
  19. tree: move `diff_summary()` to `MergedTree`Martin von Zweigbergk committed 3 years ago1b24b52
  20. tree: delete unused `DiffSummary::is_empty()`Martin von Zweigbergk committed 3 years agoa7a2150
  21. commit_builder: take `MergedTreeId` for root id argumentMartin von Zweigbergk committed 3 years ago1674a42
  22. tree: inline `simplify_conflict()`Martin von Zweigbergk committed 3 years agoadf9679
  23. merge: add a `Merge::into_resolved()` to avoid cloningMartin von Zweigbergk committed 3 years ago0570963
  24. conflicts: move `Merge<T>` to `merge` moduleMartin von Zweigbergk committed 3 years agoef5f97f
  25. conflicts: rename `Conflict<T>` to `Merge<T>`Martin von Zweigbergk committed 3 years agoecc0308
  26. perf: add `#[instrument]` to all `cmd_*` functionsWaleed Khan committed 3 years ago7875656
  27. merged_tree: add a function for resolving conflictsMartin von Zweigbergk committed 3 years ago828d528
  28. cleanup: use let-else now that we're on Rust 1.65+Martin von Zweigbergk committed 3 years agoe033f91
  29. docs: warn about missing docs for `jj-lib` crateWaleed Khan committed 3 years ago54dba51
  30. tree: avoid "file" in name of variables that can be non-filesMartin von Zweigbergk committed 3 years ago2bc58eb
  31. tree: avoid redoing a `RepoPath::join()`Martin von Zweigbergk committed 3 years ago76b1d53
  32. tree: remove `dir` argument from `TreeDiffIterator::new()`Martin von Zweigbergk committed 3 years ago7e48033
  33. tree: inline two trivial functionsMartin von Zweigbergk committed 3 years ago1d8e9ec
  34. tree: add a `Diff::from_options()` constructorMartin von Zweigbergk committed 3 years ago5da131f
  35. tree: drop `Diff::as_options()`, use `Diff::into_options()` insteadMartin von Zweigbergk committed 3 years agob738f88