Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the gix group with 2 updates #1446

Merged
merged 6 commits into from
Nov 10, 2024
Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Oct 28, 2024

Bumps the gix group with 2 updates: gix and gix-features.

Updates gix from 0.66.0 to 0.67.0

Release notes

Sourced from gix's releases.

gix v0.67.0

New Features

  • add Repository::diff_tree_to_tree() for greater similarity to git2

  • add gix merge-file with similar features as git merge-file

  • add Repository::blob_merge_options() to obtain options for merging blobs and Repository::diff_algorithm()

  • Repository::merge_resource_cache() to obtain the foundation for merging files directly.

  • make implicit free-list more controllable This is done by three new Repository methods:

    • empty_reusable_buffer() - hook into the free-list yourself.
  • set_freelist() - enable or initialize the free-list.
  • without_freelist() - a builder to disable the freelist from the start.

Bug Fixes

  • make GIT_WORK_TREE variable work as expected. Now it's picked up durign initialization.
  • improve directory matching Previously the sorting wasn't accounted for, so an assumption about the order of changes weren't actually true.
  • don't be too generous when extrapolating worktree directories. Previously it was possible that a non-bare repository that didn't have worktree directory incorrectly claimed it had one.
  • don't unconditionally stuff fetch-specs if these are already present. Previously, we'd always add 'default' refspecs, even though ref-specs might already have been present. Now we only do this if there were no refspecs prior, and that might still be more than Git does. I wonder where this requirement came from, except that it might help with tests.
  • Don't bail out if there are extra-refspecs.
  • make rev_walk available even without the revision feature. Technically it doesn't depend on it.

Other

  • Update gitoxide repository URLs This updates Byron/gitoxide URLs to GitoxideLabs/gitoxide in:

    • Markdown documentation, except changelogs and other such files where such changes should not be made.

    • Documentation comments (in .rs files).

    • Manifest (.toml) files, for the value of the repository key.

    • The comments appearing at the top of a sample hook that contains a repository URL as an example.

    When making these changes, I also allowed my editor to remove

... (truncated)

Commits
  • f1364dc Release gix-merge v0.0.0, gix-negotiate v0.16.0, gix-pack v0.54.0, gix-odb v0...
  • fa3e260 add new changelog for gix-merge
  • 3f7e8ee Release gix-date v0.9.1, gix-utils v0.1.13, gix-actor v0.33.0, gix-hash v0.15...
  • 435b30d add progress report for October 2024
  • 48aa74b Merge pull request #1639 from cruessler/respect-env-variables
  • e9b3db8 fix: make GIT_WORK_TREE variable work as expected.
  • 9c619e4 fix!: make all filter arguments non-dyn.
  • 0bebe52 Respect env variables when running gix
  • bcdce6e Merge pull request #1638 from tisonkun/allow-contructCustomFormat
  • 4910912 refactor
  • Additional commits viewable in compare view

Updates gix-features from 0.38.2 to 0.39.0

Release notes

Sourced from gix-features's releases.

gix-config v0.39.0

A maintenance release without user-facing changes.

Commit Statistics

  • 8 commits contributed to the release over the course of 24 calendar days.
  • 30 days passed between releases.
  • 0 commits were understood as conventional.
  • 0 issues like '(#ID)' were seen in commit messages

Commit Details

  • Uncategorized
    • Release gix-glob v0.16.5, gix-filter v0.12.0, gix-fs v0.11.3, gix-revwalk v0.14.0, gix-traverse v0.40.0, gix-worktree-stream v0.14.0, gix-archive v0.14.0, gix-config-value v0.14.8, gix-tempfile v14.0.2, gix-ref v0.46.0, gix-sec v0.10.8, gix-config v0.39.0, gix-prompt v0.8.7, gix-url v0.27.5, gix-credentials v0.24.5, gix-ignore v0.11.4, gix-index v0.34.0, gix-worktree v0.35.0, gix-diff v0.45.0, gix-discover v0.34.0, gix-pathspec v0.7.7, gix-dir v0.7.0, gix-mailmap v0.23.6, gix-negotiate v0.14.0, gix-pack v0.52.0, gix-odb v0.62.0, gix-packetline v0.17.6, gix-transport v0.42.3, gix-protocol v0.45.3, gix-revision v0.28.0, gix-refspec v0.24.0, gix-status v0.12.0, gix-submodule v0.13.0, gix-worktree-state v0.12.0, gix v0.65.0, gix-fsck v0.5.0, gitoxide-core v0.40.0, gitoxide v0.38.0 (a65a17f)
    • Release gix-date v0.9.0, gix-actor v0.31.6, gix-validate v0.9.0, gix-object v0.43.0, gix-path v0.10.10, gix-attributes v0.22.4, gix-command v0.3.9, gix-packetline-blocking v0.17.5, gix-filter v0.12.0, gix-fs v0.11.3, gix-revwalk v0.14.0, gix-traverse v0.40.0, gix-worktree-stream v0.14.0, gix-archive v0.14.0, gix-ref v0.46.0, gix-config v0.39.0, gix-prompt v0.8.7, gix-url v0.27.5, gix-credentials v0.24.5, gix-ignore v0.11.4, gix-index v0.34.0, gix-worktree v0.35.0, gix-diff v0.45.0, gix-discover v0.34.0, gix-dir v0.7.0, gix-mailmap v0.23.6, gix-negotiate v0.14.0, gix-pack v0.52.0, gix-odb v0.62.0, gix-packetline v0.17.6, gix-transport v0.42.3, gix-protocol v0.45.3, gix-revision v0.28.0, gix-refspec v0.24.0, gix-status v0.12.0, gix-submodule v0.13.0, gix-worktree-state v0.12.0, gix v0.65.0, gix-fsck v0.5.0, gitoxide-core v0.40.0, gitoxide v0.38.0, safety bump 25 crates (d19af16)
    • Prepare changelogs prior to release (0f25841)
    • Merge branch 'dependabot/github_actions/github-actions-c4bcf5a8e2' (2e00b5e)
    • Use workspace dependency for unicode-bom (89d77dc)
    • Make winnow a workspace dependency (78a7e32)
    • Merge branch 'upgrades' (1d37bf6)
    • Update all dependencies and fix deprecations (f5cd3ba)
Commits
  • 3f7e8ee Release gix-date v0.9.1, gix-utils v0.1.13, gix-actor v0.33.0, gix-hash v0.15...
  • 435b30d add progress report for October 2024
  • 48aa74b Merge pull request #1639 from cruessler/respect-env-variables
  • e9b3db8 fix: make GIT_WORK_TREE variable work as expected.
  • 9c619e4 fix!: make all filter arguments non-dyn.
  • 0bebe52 Respect env variables when running gix
  • bcdce6e Merge pull request #1638 from tisonkun/allow-contructCustomFormat
  • 4910912 refactor
  • 4b20bd1 feat: add CustomFormat::new() to allow construction.
  • b36d7ef Merge pull request #1637 from GitoxideLabs/improve-error-message
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
  • @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
  • @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
  • @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
  • @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions

@dependabot dependabot bot added dependencies Pull requests that update a dependency file rust Pull requests that update Rust code labels Oct 28, 2024
@dependabot dependabot bot force-pushed the dependabot/cargo/gix-04e439d90a branch from 23d1789 to 86f8b1d Compare November 4, 2024 20:42
Copy link
Collaborator

@spenserblack spenserblack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heads up that #1305 will update gix and resolve the compilation errors

Bumps the gix group with 2 updates: [gix](https://github.com/GitoxideLabs/gitoxide) and [gix-features](https://github.com/GitoxideLabs/gitoxide).


Updates `gix` from 0.66.0 to 0.67.0
- [Release notes](https://github.com/GitoxideLabs/gitoxide/releases)
- [Changelog](https://github.com/GitoxideLabs/gitoxide/blob/main/CHANGELOG.md)
- [Commits](GitoxideLabs/gitoxide@gix-v0.66.0...gix-v0.67.0)

Updates `gix-features` from 0.38.2 to 0.39.0
- [Release notes](https://github.com/GitoxideLabs/gitoxide/releases)
- [Changelog](https://github.com/GitoxideLabs/gitoxide/blob/main/CHANGELOG.md)
- [Commits](GitoxideLabs/gitoxide@gix-features-v0.38.2...gix-features-v0.39.0)

---
updated-dependencies:
- dependency-name: gix
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: gix
- dependency-name: gix-features
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: gix
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps the gix group with 2 updates: [gix](https://github.com/GitoxideLabs/gitoxide) and [gix-features](https://github.com/GitoxideLabs/gitoxide).


Updates `gix` from 0.66.0 to 0.67.0
- [Release notes](https://github.com/GitoxideLabs/gitoxide/releases)
- [Changelog](https://github.com/GitoxideLabs/gitoxide/blob/main/CHANGELOG.md)
- [Commits](GitoxideLabs/gitoxide@gix-v0.66.0...gix-v0.67.0)

Updates `gix-features` from 0.38.2 to 0.39.0
- [Release notes](https://github.com/GitoxideLabs/gitoxide/releases)
- [Changelog](https://github.com/GitoxideLabs/gitoxide/blob/main/CHANGELOG.md)
- [Commits](GitoxideLabs/gitoxide@gix-features-v0.38.2...gix-features-v0.39.0)

---
updated-dependencies:
- dependency-name: gix
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: gix
- dependency-name: gix-features
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: gix
...

Signed-off-by: dependabot[bot] <[email protected]>
@o2sh
Copy link
Owner

o2sh commented Nov 9, 2024

@Byron I refactored the compute_diff_with_parent to use the new Repository::diff_tree_to_tree() API

Did I do it right? I used the default options.

@o2sh o2sh requested review from Byron and removed request for o2sh November 9, 2024 14:58
Copy link
Collaborator

@Byron Byron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for porting it over!

Personally I'd prefer the fluent APIs, also because they don't allocate the list of changes and also don't allocate the affected paths, but diff_tree_to_tree was specifically made to resemble git2, so why not use it for convenience.

src/info/git/mod.rs Outdated Show resolved Hide resolved
@o2sh o2sh merged commit 287571c into main Nov 10, 2024
10 checks passed
@o2sh o2sh deleted the dependabot/cargo/gix-04e439d90a branch November 10, 2024 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file rust Pull requests that update Rust code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants