GitoxideLabs/gitoxide gix-merge-v0.1.0

gix-merge v0.1.0

on GitHub

New Features

• provide a way to record and apply index changes.
  These changes will then be applicable to an index that is created
  from the written tree editor.

• when blob-merging, clarify if something would have conflicted.

• add Conflict::is_unresolved() as utility to see if multiple of them are considered unresolved.

• respect the conflict-marker-size attribute as well.

• 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.

• add blob::PlatformRef::id_by_pick() to more efficiently pick merge results.
  This works by either selecting a possibly unchanged and not even loaded resource,
  instead of always loading it to provide a buffer, in case the user doesn't
  actually want a buffer.

  Note that this also alters buffer_by_pick() to enforce handling of the 'buffer-too-large'
  option.

Other

• Fix code fences in gix-merge ConflictStyle and Driver
  They are not Rust code (they are text with conflict markers and a
  shell command, respectively) and they are not intended as doctests,
  but the absence of anything on the opening line caused them to be
  taken as doctests, so cargo test --workspace --doc would fail
  with parsing errors.

  (Doctests for all crates have not always been run automatically on
  CI, so this was not caught when these documentation comments were
  introduced in #1585.)

New Features (BREAKING)

• Add more modes for checking for unresolved conflicts.
  They aim at making it possible to know if a conflict happened that was
  automatically resolved.

• add commit::virtual_merge_base() to produce the single merge-base to use.
  This allows more flexibility in conjunction with tree-merging, as
  commits as input aren't required.

  This is breaking as it changes the return value of commit().

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

• Don't fail on big files during blob-merge, but turn them into binary merges.
  Binary merges are mere choices of which side to pick, which works well for big files
  as well. Git doesn't define this well during its own merges, so there is some room here.

Bug Fixes (BREAKING)

• 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.

• prefer to receive borrowed gix_command::Context when it's just passed on.
  That way, the clone occours only when needed, without forcing the caller
  to pre-emptively clone each time it's called.

Commit Statistics

• 28 commits contributed to the release.
• 13 commits were understood as conventional.
• 0 issues like '(#ID)' were seen in commit messages

Commit Details