History

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

conflicts: add `take()`, returning the removes and adds `Vec`sMartin von Zweigbergk committed 3 years ago35e4d5f
files: add a newtype around `Vec<u8>` for content hunksMartin von Zweigbergk committed 3 years agob1f2e80
conflicts: avoid unnecessary cloning of conflict contentMartin von Zweigbergk committed 3 years agob3946be
git: add .gitmodules parserGlen Choo committed 3 years ago7afaa24
git: remove unused `push_commit()`Martin von Zweigbergk committed 3 years agof64e481
conflicts: add `try_map()` methodMartin von Zweigbergk committed 3 years agob8221d4
merge: fast-path trivial merge of 1-way "conflicts"Martin von Zweigbergk committed 3 years agob8f6a48
conflicts: add a method returning the resolved value, if resolvedMartin von Zweigbergk committed 3 years ago9c486eb
id_prefix: only store first few bytes of keys in IdIndexYuya Nishihara committed 3 years agoca6b982
id_prefix: inline IdIndex::resolve_prefix_range()Yuya Nishihara committed 3 years agob789ffb
id_prefix: store (CommitId, ChangeId) pairs separately in disambiguation indexYuya Nishihara committed 3 years ago7ada219
id_prefix: introduce builder interface to IdIndexYuya Nishihara committed 3 years ago580d8bd
id_prefix: test resolve_prefix_with() instead of _to_values()Yuya Nishihara committed 3 years ago3799aa4
id_prefix: insert intermediate lookup state to resolve unique len from thereYuya Nishihara committed 3 years ago020aeff
git: on import_refs(), avoid loading git commit object if it's knownYuya Nishihara committed 3 years agod1701a5
backend: drop deprecated fields from `local_store.proto`Martin von Zweigbergk committed 3 years agoea2d5fd
backend: split up `store.proto` in git and local versionsMartin von Zweigbergk committed 3 years agoda5db27
conflicts: preserve diffs when simplfying a conflictMartin von Zweigbergk committed 3 years agodee5dff
conflicts: add test of higher-arity conflict simplificaton changing diffsMartin von Zweigbergk committed 3 years ago8f75a82
Fix `jj init --git-repo` fails and leaves broken .jj folderKevin Liao committed 3 years ago86b6a11
repo: add submodule_store, default implGlen Choo committed 3 years ago6621f26
conflicts: add `resolve_trivial()` and test invariantsMartin von Zweigbergk committed 3 years ago038b64d
conflicts: resolve trivial merge of `A+A-B+C-C` to `A`Martin von Zweigbergk committed 3 years ago3f95daf
conflicts: move `describe_conflict()` etc. onto `Conflict`Martin von Zweigbergk committed 3 years ago82883e6
conflicts: remove unused `Conflict::set_{add,remove}()`Martin von Zweigbergk committed 3 years ago7a8caba
index: turn CompositeIndex::walk_revs() into position-based APIYuya Nishihara committed 3 years agoa67d8b5
git: return early from import_refs() if no commits to abandonYuya Nishihara committed 3 years ago8b0c01d
git: unify loop that consumes stale/excluded git refsYuya Nishihara committed 3 years ago5fda093
git: rename new_git_heads to pinned_git_heads as it isn't always "new"Yuya Nishihara committed 3 years agoaa2359f
git: remove uninteresting old refs from list of heads to abandonYuya Nishihara committed 3 years agoc8eb1a3
git: on import_refs(), don't clobber view's heads with known HEAD@gitYuya Nishihara committed 3 years agocf2c142
tree: reuse caller-provided path in known_sub_tree(), mark it as privateYuya Nishihara committed 3 years ago55f93bf
tree: rewrite sub_tree_recursive() to not use known_sub_tree()Yuya Nishihara committed 3 years agodb7facb
repo_path: micro-optimize .join() to not reallocate cloned VecYuya Nishihara committed 3 years ago589917a
conflicts: extract methods for converting to/from generic legacy formMartin von Zweigbergk committed 3 years agod886d8c