History

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

git: add separate step to apply HEAD@git changeYuya Nishihara committed 3 years ago157a0e7
git: remove redundant id.clone() from diff_refs_to_import()Yuya Nishihara committed 3 years ago359c871
cleanup: use `fs:read()` instead of `File::open().read_to_end()`Martin von Zweigbergk committed 3 years agoe414f3b
conflicts: remove redundant `num_removes` argument from `parse_conflict()`Martin von Zweigbergk committed 3 years ago0b3b62a
repo: micro-optimize add_head() to not instantiate indexed commit objectYuya Nishihara committed 3 years ago72271c0
index: rewrite topological sort by leveraging dag_walk functionYuya Nishihara committed 3 years ago15fb8b9
index: add tracing output to "jj debug reindex" pathYuya Nishihara committed 3 years ago8652bae
working_copy: return early from `write_path_to_store()` for non-filesMartin von Zweigbergk committed 3 years agof9e0fea
working_copy: propagate errors when reading conflicted fileMartin von Zweigbergk committed 3 years ago23f54b8
working_copy: reduce scope of a `content` variableMartin von Zweigbergk committed 3 years ago33a93b6
working_copy: reduce scope of an `executable` variableMartin von Zweigbergk committed 3 years ago585c212
working_copy: inline `write_conflict_to_store()`Martin von Zweigbergk committed 3 years ago2102de9
conflicts: make `update_from_content()` write resolved content to storeMartin von Zweigbergk committed 3 years ago4c46398
conflicts: make `update_from_content()` work with only `FileId`sMartin von Zweigbergk committed 3 years ago0b85f06
tree: inline `simplify_conflict()`Martin von Zweigbergk committed 3 years agoadf9679
merged_tree: rename some symbols away from "conflict"Martin von Zweigbergk committed 3 years agod4e755b
merge: move some methods back to `conflicts` as free functionsMartin von Zweigbergk committed 3 years agoa995c66
revset: remove round-trip conversion from heads() evaluationYuya Nishihara committed 3 years ago925d546
git: propagate errors for missing commits when importing refsMartin von Zweigbergk committed 3 years agod1dbe6d
working_copy: avoid an unused variable on WindowsMartin von Zweigbergk committed 3 years agoabc7312
merge: add a `Merge::into_resolved()` to avoid cloningMartin von Zweigbergk committed 3 years ago0570963
merge: add `absent()` and `normal()` to `Merge<Option<T>>`Martin von Zweigbergk committed 3 years agof7160cf
git: ensure that remote branches never divergeYuya Nishihara committed 3 years agoe7e4952
git: refactor SSH key callbacks to allow multiple keysMartin von Zweigbergk committed 3 years ago1d2324a
local_backend: don't reference uninitialized memoryBenjamin Saunders committed 3 years ago75636d6
git: only try to use ssh-agent once per connectionMartin von Zweigbergk committed 3 years agoc752b43
config: Rename `push.branch-prefix` option to `git.push-branch-prefix`Ilya Grigoriev committed 3 years ago74d9970
refs: rename RefTarget::as_conflict() to as_merge()Yuya Nishihara committed 3 years ago2619200
conflicts: move `Merge` tests to `merge` moduleMartin von Zweigbergk committed 3 years agob9b285c
merge: move `tests` module to end of fileMartin von Zweigbergk committed 3 years agoaf2dba1
working_copy: add debug assertion that tree and file states matchMartin von Zweigbergk committed 3 years ago14ddd17
working_copy: reduce scope of some variablesMartin von Zweigbergk committed 3 years ago6cce5e7
working_copy: add trace scope to tree-writing callMartin von Zweigbergk committed 3 years ago16d0058
working_copy: split up tracing scope a bitMartin von Zweigbergk committed 3 years agod06f51a
working_copy: rename `deleted_files_tx` to `present_files_tx`Martin von Zweigbergk committed 3 years agob27b686