Code

History

Commits on ig/commit-debug to lib/src1960+
  1. merged_tree: extract function for merged iterator of basenames in diffMartin von Zweigbergk committed 3 years agoc9ce80a
  2. merged_tree: rename `all_tree_conflict_names()` since it's not about conflictsMartin von Zweigbergk committed 3 years agob72f04b
  3. merge: remove Merge::take() which is no longer usedYuya Nishihara committed 3 years ago3fddc31
  4. refs: run non-trivial merge of ref targets without destructuring Merge objectYuya Nishihara committed 3 years ago92dfe59
  5. refs: use swap_remove() in non-trivial merge of ref targetsYuya Nishihara committed 3 years ago9360154
  6. files: use borrowed Merge iterator in merge()Yuya Nishihara committed 3 years ago895bbce
  7. merge: simply print interleaved conflict values in debug outputYuya Nishihara committed 3 years agof1898a3
  8. merge: simply generate content hash from interleaved valuesYuya Nishihara committed 3 years agob07b370
  9. merge: store negative/positive terms internally in an interleaved VecYuya Nishihara committed 3 years ago46ffb2f
  10. merge: extract trivial_merge() that takes interleaved adds/removes iteratorYuya Nishihara committed 3 years ago287728f
  11. merge: rewrite bottom half of trivial_merge() for non-copyable typesYuya Nishihara committed 3 years ago01523ba
  12. git: add config to disable abandoning of unreachable commitsMartin von Zweigbergk committed 3 years ago7c92351
  13. git: extract a function for abandoning unreachable commitsMartin von Zweigbergk committed 3 years ago7bf8906
  14. merge: have Merge::adds()/removes() return iteratorYuya Nishihara committed 3 years agod9fbf21
  15. merge: use Merge::iter() instead of adds()/removes() where order doesn't matterYuya Nishihara committed 3 years ago1c6913d
  16. merge: fix copy-paste error in doc comment for adds()Yuya Nishihara committed 3 years ago99e6ff4
  17. merge: add non-optional Merge accessor to the zeroth valueYuya Nishihara committed 3 years agof6d85c5
  18. merge: add method for indexed adds/removes accessYuya Nishihara committed 3 years agob12c688
  19. rewrite: use `MergedTree::diff_stream()` when restoring from treeMartin von Zweigbergk committed 3 years ago6a5615c
  20. workspace: add function that initializes colocated git repositoryYuya Nishihara committed 3 years ago602b442
  21. git_backend: extract inner function that initializes backend with open git repoYuya Nishihara committed 3 years agoce46c10
  22. workspace: one less cloning of workspace_root in init_external_git()Yuya Nishihara committed 3 years agodce640a
  23. workspace: fix repository path in init_internal_git() doc commentYuya Nishihara committed 3 years agoc866b4a
  24. commands: move rebase_to_dest_parent to jj_lib::rewriteAntoine Cezar committed 3 years ago5973ab4
  25. working copy: use `MergedTree::diff_stream()`Martin von Zweigbergk committed 3 years ago904c37d
  26. merged_tree: add `Stream`-based version of `diff()`, delegating for nowMartin von Zweigbergk committed 3 years ago72245cf
  27. async: switch to `pollster`'s `block_on()`Martin von Zweigbergk committed 3 years ago24b7066
  28. cli: add a function for restoring part of a tree from another treeMartin von Zweigbergk committed 3 years ago3a378dc
  29. cli: rewrite base GitIgnoreFile lookup to use gitoxide instead of libgit2Yuya Nishihara committed 3 years ago162dcd4
  30. git_backend: replace git2::Repository with gix::RepositoryYuya Nishihara committed 3 years agoc88e69a
  31. git_backend: open just-initialized repo with canonicalized pathYuya Nishihara committed 3 years agof5a61dc
  32. git_backend: box GitBackendInit/LoadError up frontYuya Nishihara committed 3 years agofd187d2
  33. git: preserve HEAD when possibleIsabella Basso committed 3 years ago749d8bb
  34. git_backend: remove redundant copy back of author timestampYuya Nishihara committed 3 years ago1788b50
  35. git_backend: use .strip_suffix() instead of manual slicingYuya Nishihara committed 3 years agof5aa739