Code

History

Commits on CacheMyWorkingCopy to cli/src/merge_tools35+
  1. cli: ensure child processes are wait()ed on I/O errorYuya Nishihara committed 2 years ago2817e30
  2. merge_tools: add Diff/MergeEditor constructors that look up tools by nameYuya Nishihara committed 2 years ago4a47cba
  3. merge_tools: box external tool variant to minimize stack sizeYuya Nishihara committed 2 years ago0f42c56
  4. Nightly clippy fixesIlya Grigoriev committed 2 years ago96bf190
  5. merge_tools: move "ui.diff-instructions" to CLI and config/misc.tomlYuya Nishihara committed 2 years ago5df7a42
  6. merge_tools: inline edit_diff() into DiffEditor::edit()Yuya Nishihara committed 2 years agob118e2f
  7. merge_tools: capture base_ignores and "ui.diff-instructions" by DiffEditorYuya Nishihara committed 2 years ago5cc89dd
  8. merge_tools: move run_mergetool() to MergeEditor::edit_file()Yuya Nishihara committed 2 years agofc4aa36
  9. merge_tools: extract configuration error to separate typeYuya Nishihara committed 2 years agob926fd8
  10. merge_tools: load diff/merge editor settings by callerYuya Nishihara committed 2 years ago003b40d
  11. merge_tools: introduce Diff/MergeEditor newtypesYuya Nishihara committed 2 years ago863a264
  12. merge_tools: process "ui.diff-instructions" option by callerYuya Nishihara committed 2 years ago529acb3
  13. merge_tools: take diff editor instruction as Option<&str>Yuya Nishihara committed 2 years agofbabd0c
  14. merge_tools: don't enable fsmonitor (and file size limit) in temporary snapshotYuya Nishihara committed 2 years ago51496de
  15. cli: don't ignore 'diff --tool=:builtin', report errorYuya Nishihara committed 2 years ago9698a13
  16. merge_tools: extract function that doesn't look up :builtin merge toolYuya Nishihara committed 2 years ago8148daa
  17. merge_tools: inline get_tool_config_from_args()Yuya Nishihara committed 2 years agod7ad054
  18. merge-tools: make :builtin materialize conflictsMartin von Zweigbergk committed 2 years agobce8cb9
  19. cli: rename --verbose to --debug to better fit what it doesAlexis (Poliorcetics) Bourget committed 2 years ago0fc5005
  20. cli: inform the user of the command which disables the hintBenjamin Brittain committed 2 years ago416bde2
  21. cleanup: remove remaining ": {source}" from error message templatesYuya Nishihara committed 2 years ago77ceadb
  22. object_id: extract ObjectId trait and macros to separate moduleYuya Nishihara committed 2 years agofa5e407
  23. clenaup: don't use debug format to embed ObjectId in error messageYuya Nishihara committed 2 years agobb73cd4
  24. merge_tools: upgrade to `scm-record` v0.2.0Waleed Khan committed 2 years ago88cc4da
  25. repo_path: split RepoPath into owned and borrowed typesYuya Nishihara committed 2 years ago28ab959
  26. repo_path: add stub RepoPathBuf type, update callersYuya Nishihara committed 2 years ago0a1bc2b
  27. cleanup: don't use debug format to print source errorsYuya Nishihara committed 2 years ago31def4b
  28. merge_tools: use `left_file_mode` in `make_diff_files`Łukasz Kurowski committed 2 years agoe21ffb0
  29. merge_tools: use `right_file_mode` in `make_diff_files`Łukasz Kurowski committed 3 years agoffd6884
  30. merge: add Merge constructor that accepts interleaved valuesYuya Nishihara committed 3 years agodd26b7b
  31. merge_tools: borrow file contents without consuming Merge objectYuya Nishihara committed 3 years agoe4b0e62
  32. files: use borrowed Merge iterator in merge()Yuya Nishihara committed 3 years ago895bbce
  33. merge_tools: do not follow or change permission of symlinksYuya Nishihara committed 3 years agod8a7822
  34. merge tools: use `MergedTree::diff_stream()`Martin von Zweigbergk committed 3 years ago5b02987
  35. async: switch to `pollster`'s `block_on()`Martin von Zweigbergk committed 3 years ago24b7066