Code

History

Commits on ig/commit-debug to lib105+
  1. cargo: bump MSRV to 1.88Austin Seipp committed 1 year ago419bd51
  2. op_store: serialize proto without constructing empty slotYuya Nishihara committed 1 year ago0dcf73e
  3. op_store: flag legacy git_refs.commit_id field as deprecatedYuya Nishihara committed 1 year agoe236180
  4. revset: add new `exactly(x, n)` expressionAustin Seipp committed 1 year ago7ec5980
  5. op_store: drop support for legacy remote bookmarks without tracking stateYuya Nishihara committed 1 year agoe357281
  6. op_store: add error propagation path to view_from_proto()Yuya Nishihara committed 1 year agoc344547
  7. tests: rewrite test_fsmonitor() to use TreeState APIYuya Nishihara committed 1 year ago3e02975
  8. merge: remove Default from MergeOptionsYuya Nishihara committed 1 year ago8cd43d1
  9. local_working_copy: remove Default from TreeStateSettingsYuya Nishihara committed 1 year ago79a2a77
  10. working_copy: move SnapshotOptions::empty_for_test() to testutilsYuya Nishihara committed 1 year agoccd1373
  11. git: remove Default from GitSettingsYuya Nishihara committed 1 year ago4ea52e1
  12. cleanup: replace clippy allow() exemptions by expect()Martin von Zweigbergk committed 1 year ago8aa9d1d
  13. revset engine: remove stale clippy exemptions for missing docsMartin von Zweigbergk committed 1 year agoc0dfa2f
  14. local_working_copy: remove stale clippy exemptionYuya Nishihara committed 1 year agocee5ea6
  15. tree: move try_resolve_file_conflict() to tree_merge()Martin von Zweigbergk committed 1 year agoc12ee12
  16. merged_tree: move MergeOptions to tree_mergeMartin von Zweigbergk committed 1 year ago92bc6e4
  17. merged_tree: extract `merge_tree()` to new moduleMartin von Zweigbergk committed 1 year ago5d93019
  18. ci: ignore flaky test on windowsRemo Senekowitsch committed 1 year agoddb3e4a
  19. files, tree: make same-change conflict resolution configurableYuya Nishihara committed 1 year agoaf4fe21
  20. files: rename FileMergeOptions to MergeOptions, move to merged_treeYuya Nishihara committed 1 year ago0376bcf
  21. merge: parameterize same-change rule of trivial_merge()Yuya Nishihara committed 1 year ago949fd2a
  22. config: add platforms conditional configurationStephen Jennings committed 1 year ago08f2e21
  23. working_copy: Move `FsmonitorSettings` to `TreeStateSettings` and add test method to update settingsIan Wrzesinski committed 1 year ago5f6f938
  24. files: add option to resolve conflicts word by wordYuya Nishihara committed 2 years ago9589bec
  25. files: introduce Cow-like wrapper for merge hunksYuya Nishihara committed 2 years agoeb75fc5
  26. files: introduce stub of FileMergeOptionsYuya Nishihara committed 1 year agoe9e9c6f
  27. codespell: forbid British EnglishIlya Grigoriev committed 1 year ago93368f1
  28. cli, lib: convert revset expressions to use Arc over RcAustin Seipp committed 1 year ago5b83c98
  29. revset: require SymbolResolverExtension to be Send and SyncMartin von Zweigbergk committed 1 year agoba60fe1
  30. conflicts: compare new hunks without fully materializing original to textYuya Nishihara committed 1 year ago4dee8e4
  31. tests: add test for unchanged conflict in working copyYuya Nishihara committed 1 year ago0b34bb3
  32. backend: remove unused TreeValue::Conflict and read/write methodsMartin von Zweigbergk committed 1 year agoda6c4b6
  33. git_backend: drop support for reading conflictsMartin von Zweigbergk committed 1 year agoea2b53b
  34. git_backend: drop support for writing TreeValue::ConflictMartin von Zweigbergk committed 1 year ago5f3269d
  35. working_copy: drop support for legacy treesMartin von Zweigbergk committed 1 year ago5f7f431