History

Commits on ig/commit-debug to lib/src2170+

working_copy: leverage `Store::get_root_tree()` in `current_tree()`Martin von Zweigbergk committed 3 years agof54b456
merged_tree: propagate errors from `from_legacy_tree()`Martin von Zweigbergk committed 3 years ago2d50d8a
merged_tree: take store argument to `write_tree()` instead of `new()`Martin von Zweigbergk committed 3 years ago67832a3
tree: inline `legacy_id()` into its sole callerMartin von Zweigbergk committed 3 years ago64b47ba
commit_builder: remove last traces of pre-`MergedTree` APIMartin von Zweigbergk committed 3 years ago9c77e6a
tests: remove last uses of `Commit:tree()` and delete itMartin von Zweigbergk committed 3 years ago6e3590f
git: remove handling of real remote named "git", always overrideYuya Nishihara committed 3 years ago55c6e90
git: do not import refs from remote named "git"Yuya Nishihara committed 3 years agoce3d28e
git: fix typo in GitFetchError messageYuya Nishihara committed 3 years ago04e2f5e
git: prohibit creation of remote named "git"Yuya Nishihara committed 3 years ago35a596f
git: add constant for pseudo remote name "git"Yuya Nishihara committed 3 years ago0e26ef7
tree: delete recursive diff iterator, which is no longer usedMartin von Zweigbergk committed 3 years agof47da04
tree: move `diff_summary()` to `MergedTree`Martin von Zweigbergk committed 3 years ago1b24b52
tree: delete unused `DiffSummary::is_empty()`Martin von Zweigbergk committed 3 years agoa7a2150
commit: migrate remaining uses of `Commit::tree_id()` and delete itMartin von Zweigbergk committed 3 years agodc06bbc
rewrite: return `MergedTree` from `merge_commit_trees_without_repo()`Martin von Zweigbergk committed 3 years ago7bfd439
rewrite: return `MergedTree` from `merge_commit_trees()`Martin von Zweigbergk committed 3 years ago90e78a1
cli: merge trees via `MergedTree` in `jj move`Martin von Zweigbergk committed 3 years agobd6098e
merged_tree: add a function for merging 3 `MergedTree`sMartin von Zweigbergk committed 3 years ago873a6f0
commit_builder: take `MergedTreeId` for root id argumentMartin von Zweigbergk committed 3 years ago1674a42
backout: propagate error from merging of treesMartin von Zweigbergk committed 3 years agoe5ec99d
working_copy: make `old_checkout` argument be `MergedTreeId`Martin von Zweigbergk committed 3 years ago1895a55
working_copy: return `MergedTreeId` on snapshotMartin von Zweigbergk committed 3 years agoabf3853
working_copy: enable storing multiple tree ids in state fileMartin von Zweigbergk committed 3 years ago88e9933
merged_tree: teach tree builder to build multiple treesMartin von Zweigbergk committed 3 years ago49e32aa
store: add function to look up `MergedTree` by `MergedTreeId`Martin von Zweigbergk committed 3 years ago1577b40
merged_tree: add `entries()` for iterating over all entriesMartin von Zweigbergk committed 3 years ago2dd2e77
merged_tree: make `id()` return a `MergedTreeId`Martin von Zweigbergk committed 3 years ago36674e8
cli: use `MergedTreeBuilder` in `jj chmod`Martin von Zweigbergk committed 3 years agod0fb154
working_copy: move writing of conflict objects into new tree builderMartin von Zweigbergk committed 3 years ago389f27f
backends: store tree id conflicts as list with alternating signsMartin von Zweigbergk committed 3 years agoe4ba6a4
backend: use new enum for `Commit::root_tree`Martin von Zweigbergk committed 3 years agofd4146d
local_backend: allow storing legacy treesMartin von Zweigbergk committed 3 years agoe3d67d5
git_backend: remove unused proto field for resolved tree idMartin von Zweigbergk committed 3 years ago589e0db
tree_builder: remove unnecessary `has_overrides()` methodMartin von Zweigbergk committed 3 years ago2fe4372