History

Commits on ig/commit-debug5425+

test_merged_tree: nest each part of `test_diff_dir_file()`Martin von Zweigbergk committed 3 years ago16aa8e8
merged_tree: extract function for merged iterator of basenames in diffMartin von Zweigbergk committed 3 years agoc9ce80a
merged_tree: rename `all_tree_conflict_names()` since it's not about conflictsMartin von Zweigbergk committed 3 years agob72f04b
website: Stop `mike` from always changing `sitemaps.xml.gz`Ilya Grigoriev committed 3 years ago043f786
poetry: Update pyproject.toml to use newer conventionIlya Grigoriev committed 3 years agoed245e2
poetry: create a CI with Debian stable's version of `poetry`.Ilya Grigoriev committed 3 years ago61cb38a
poetry: Poetry 1.7 issuesIlya Grigoriev committed 3 years ago745f5b7
merge: remove Merge::take() which is no longer usedYuya Nishihara committed 3 years ago3fddc31
refs: run non-trivial merge of ref targets without destructuring Merge objectYuya Nishihara committed 3 years ago92dfe59
refs: use swap_remove() in non-trivial merge of ref targetsYuya Nishihara committed 3 years ago9360154
merge_tools: borrow file contents without consuming Merge objectYuya Nishihara committed 3 years agoe4b0e62
files: use borrowed Merge iterator in merge()Yuya Nishihara committed 3 years ago895bbce
cargo: bump the cargo-dependencies group with 1 updatedependabot[bot] committed 3 years agof344651
cli: move description utils to description_util.rsAntoine Cezar committed 3 years agoafc2382
merge: simply print interleaved conflict values in debug outputYuya Nishihara committed 3 years agof1898a3
merge: simply generate content hash from interleaved valuesYuya Nishihara committed 3 years agob07b370
merge: store negative/positive terms internally in an interleaved VecYuya Nishihara committed 3 years ago46ffb2f
merge: extract trivial_merge() that takes interleaved adds/removes iteratorYuya Nishihara committed 3 years ago287728f
merge: rewrite bottom half of trivial_merge() for non-copyable typesYuya Nishihara committed 3 years ago01523ba
merge_tools: do not follow or change permission of symlinksYuya Nishihara committed 3 years agod8a7822
readme: improved frontmatter, part 2Austin Seipp committed 3 years ago56ba801
contributing.md: suggest making the `gh-pages` branch immutableMartin von Zweigbergk committed 3 years ago9a5c19a
git: add config to disable abandoning of unreachable commitsMartin von Zweigbergk committed 3 years ago7c92351
git: extract a function for abandoning unreachable commitsMartin von Zweigbergk committed 3 years ago7bf8906
merge: have Merge::adds()/removes() return iteratorYuya Nishihara committed 3 years agod9fbf21
merge: use Merge::iter() instead of adds()/removes() where order doesn't matterYuya Nishihara committed 3 years ago1c6913d
merge: fix copy-paste error in doc comment for adds()Yuya Nishihara committed 3 years ago99e6ff4
merge: add non-optional Merge accessor to the zeroth valueYuya Nishihara committed 3 years agof6d85c5
merge: add method for indexed adds/removes accessYuya Nishihara committed 3 years agob12c688
rewrite: use `MergedTree::diff_stream()` when restoring from treeMartin von Zweigbergk committed 3 years ago6a5615c
merge tools: use `MergedTree::diff_stream()`Martin von Zweigbergk committed 3 years ago5b02987
workspace: add function that initializes colocated git repositoryYuya Nishihara committed 3 years ago602b442
tests: assert paths of initialized GitBackendYuya Nishihara committed 3 years ago77e1624
git_backend: extract inner function that initializes backend with open git repoYuya Nishihara committed 3 years agoce46c10
workspace: one less cloning of workspace_root in init_external_git()Yuya Nishihara committed 3 years agodce640a