chore(deps): update rust crate gix to 0.68 #186
No reviewers
Labels
No labels
Forge
ForgeJo
Forge
GitHub
Kind/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/TUI
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference: kemitix/git-next#186
Loading…
Reference in a new issue
No description provided.
Delete branch "renovate/gix-0.x"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
This PR contains the following updates:
0.67->0.68Release Notes
GitoxideLabs/gitoxide (gix)
v0.68.0: gix v0.68.0Compare Source
New Features
Add support for
indexapplication in merge results viamerge::tree::Outcome::index_changed_after_applying_conflicts()add
Repository::merge_base_octopus()add
Repository::virtual_merge_base()andRepository::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
HEADisn'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::Repositoryimplements 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()andcommit()merge support, en par withmerge-ORTas 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.renamesconfiguration.respect
core.bare=truein conjunction with the main worktreepropagate 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 ofOptions.Repository::merge_trees()now has a fully-wrapped outcome.That way, more attached types are used for greater convenience.
Bug Fixes (BREAKING)
rename
blob-mergefeature totree-merge.By now,
blob-mergeis the lowest-level of features which is requiredfor 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
Commit Details
view details
dc3d8bf)d15a493)core.bare=truein conjunction with the main worktree (88d9d43)8ce4912)bc9d994)0b7abfb)indexapplication in merge results viamerge::tree::Outcome::index_changed_after_applying_conflicts()(71b0cea)Repository::tree_merge_options()now comes with rewrite tracking. (b57be71)gix-merge. (47110d6)aeaebec)==size assertions (daf9990)<=on 32-bit for some size assertions (fc13fc3)9ab86a2)275a0c5)49ba115)7a40648)0f0e4fe)cf0c7ee)Repository::merge_base_octopus()(65ae68e)905e5b4)Repository::virtual_merge_base()andRepository::virtual_merge_base_with_graph(). (7aee32a)Repository::merge_commits()(5f3f63a)c5955fc)hasconfigis working ongixlevel as well. (d51aec9)697a632)4079519)a876533)Repository::merge_trees()now takes portable version ofOptions. (a43e563)blob-mergefeature totree-merge. (2547935)Repository::merge_trees()now has a fully-wrapped outcome. (1d2262f)objects::tree::Editor::detach()to get the underlying editor back. (27b663e)Repository::index_or_load_from_head_or_empty(). (1f9556a)Object::peel_to_commit()to assure an object turns into a commit. (2fce14f)5b428a9)8e99eba)chmodin make_rev_spec_parse_repos; regenerate archive on macOS (d74e919)72cd7f3)8720acb)3fb989b)Repository::merge_trees()(d1ac584)gix::Repositoryimplements all traits for object reading and writing. (07746f3)80e006b)tree()andcommit()merge support, en par withmerge-ORTas far as tests go. (4b1764c)gix-objectandgix-odb(96488f7)de1cfb6)db5c9cf)Configuration
📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this PR and you won't be reminded about this update again.
This PR has been generated by Renovate Bot.