GitoxideLabs/gitoxide gix-v0.68.0

gix v0.68.0

on GitHub

New Features

• Add support for index application in merge results via merge::tree::Outcome::index_changed_after_applying_conflicts()

• add Repository::merge_base_octopus()

• add Repository::virtual_merge_base() and Repository::virtual_merge_base_with_graph().

• add Repository::merge_commits()
  It's often more convenient to work with commits when merging, especially
  when merge-bases are dealt with automatically.

• add objects::tree::Editor::detach() to get the underlying editor back.
  This can be useful to have more control over what gets written, or how.

• add Repository::index_or_load_from_head_or_empty().
  It's useful to get a reasonable index in any case, even on unborn repositories.
  It's for cases where the HEAD isn't setup at all, despite content being available,
  and to avoid unnecessary restrictions on what works.

• add Object::peel_to_commit() to assure an object turns into a commit.

• add Repository::merge_trees()

• gix::Repository implements all traits for object reading and writing.
  That way it becomes usable when merging trees, which benefits from automatic
  checking of hashes before writing loose objects.

• add tree() and commit() merge support, en par with merge-ORT as far as tests go.
  Note that this judgement of quality is based on a limited amount of partially complex
  test, but it's likely that in practice there will be deviations of sorts.

  Also, given the complexity of the implementation it is definitely under-tested,
  but with that it's mostly en par with Git, unfortunatly.

  On the bright side, some of the tests are very taxing and I'd hope this
  means something for real-world quality.

Bug Fixes

• Repository::tree_merge_options() now comes with rewrite tracking.
  This is the way Git acts, as it's either configured, or defaults to the value
  coming from the diff.renames configuration.

• respect core.bare=true in conjunction with the main worktree

• propagate errors that are triggered when writing objects
  Previously it was assumed that writing objects could never fail unless
  there isn't enough memory to do so. However, it turns out that
  some last-minute validation can always be triggered and prevent an object
  to be written.

  Now that error is propagated instead.

• assure submodules are skipped everywhere
  This also adds Repository::head_tree() for convenience.

New Features (BREAKING)

• Repository::merge_trees() now takes portable version of Options.
• Repository::merge_trees() now has a fully-wrapped outcome.
  That way, more attached types are used for greater convenience.

Bug Fixes (BREAKING)

• rename blob-merge feature to tree-merge.
  By now, blob-merge is the lowest-level of features which is required
  for both tree-merges and commit based merges. Hence it's better
  to just call it merge.

• Adjust blob-merge baseline to also test the reverse of each operation
  This also fixes an issue with blob merge computations.

  It's breaking because the marker-size was reduced to u8.

Commit Statistics

• 46 commits contributed to the release.
• 18 commits were understood as conventional.
• 2 unique issues were worked on: #1678, #1683

Commit Details