diff --git a/.gitattributes b/.gitattributes
index 21a8a6960ba..c3e94f4dbf1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,8 @@
**/generated-archives/*.tar.xz filter=lfs-disabled diff=lfs merge=lfs -text
-# assure line feeds don't interfere with our working copy hash
+# assure line feeds don't interfere with our working copy hash
**/tests/fixtures/**/*.sh text crlf=input eol=lf
/justfile text crlf=input eol=lf
+
+# have GitHub treat the gix-packetline-blocking src copy as auto-generated
+gix-packetline-blocking/src/ linguist-generated=true
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000000..ce30635aa48
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+version: 2
+updates:
+- package-ecosystem: github-actions
+ directory: "/"
+ schedule:
+ interval: weekly
+ groups:
+ github-actions:
+ patterns: ["*"]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4ce6e9e5b7f..640f112c6ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
runs-on: ubuntu-latest
container: debian:buster
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Prerequisites
run: apt-get update && apt-get install --no-install-recommends -y ca-certificates curl gcc libc-dev # gcc is required as OS abstraction
- name: install Rust via Rustup
@@ -47,18 +47,18 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
- - uses: dtolnay/rust-toolchain@stable
- - uses: Swatinem/rust-cache@v2
- - name: Setup dependencies
- run:
- sudo apt-get install tree
- - uses: extractions/setup-just@v1
- - name: test
- env:
- CI: true
- GITOXIDE_TEST_IGNORE_ARCHIVES: 1
- run: just ci-test
+ - uses: actions/checkout@v4
+ - uses: dtolnay/rust-toolchain@stable
+ - uses: Swatinem/rust-cache@v2
+ - name: Setup dependencies
+ run:
+ sudo apt-get install tree
+ - uses: extractions/setup-just@v2
+ - name: test
+ env:
+ CI: true
+ GIX_TEST_IGNORE_ARCHIVES: 1
+ run: just ci-test
test-fast:
strategy:
@@ -69,7 +69,7 @@ jobs:
- ubuntu-latest
runs-on: ${{ matrix.os }}
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- name: Setup dependencies (macos)
@@ -79,10 +79,7 @@ jobs:
- name: "cargo check default features"
if: startsWith(matrix.os, 'windows')
run: cargo check --all --bins --examples
- - run: |
- # it should never be a failure not to get the caches, as they can be regenerated.
- git lfs fetch && git lfs checkout || true
- - uses: taiki-e/install-action@v1
+ - uses: taiki-e/install-action@v2
with:
tool: nextest
- name: "Test (nextest)"
@@ -94,7 +91,7 @@ jobs:
matrix:
target: [ armv7-linux-androideabi ]
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- name: Install Rust
@@ -102,7 +99,7 @@ jobs:
with:
toolchain: stable
targets: ${{ matrix.target }}
- - uses: taiki-e/install-action@v1
+ - uses: taiki-e/install-action@v2
with:
tool: cross
- name: "check"
@@ -135,7 +132,7 @@ jobs:
target: i686-pc-windows-gnu
runs-on: ${{ matrix.os }}
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Install Rust
uses: dtolnay/rust-toolchain@master
with:
@@ -150,20 +147,20 @@ jobs:
- name: "Install prerequisites"
run: vcpkg install zlib:x64-windows-static-md
- name: "Installation from crates.io: gitoxide"
- run: cargo +${{ matrix.rust }} install --target ${{ matrix.target }} --target-dir install-artifacts --debug --force gitoxide
+ run: cargo +${{ matrix.rust }} install --target ${{ matrix.target }} --no-default-features --features max-pure --target-dir install-artifacts --debug --force gitoxide
shell: msys2 {0}
lint:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
components: clippy,rustfmt
- - uses: extractions/setup-just@v1
+ - uses: extractions/setup-just@v2
- name: Run cargo clippy
- run: just clippy -D warnings
+ run: just clippy -D warnings -A unknown-lints
- name: Run cargo doc
run: just doc
- name: Run cargo fmt
@@ -176,7 +173,7 @@ jobs:
# Let's not fail CI for this, it will fail locally often enough, and a crate a little bigger
# than allows is no problem either if it comes to that.
just check-size || true
-
+
cargo-deny:
runs-on: ubuntu-latest
strategy:
@@ -189,10 +186,11 @@ jobs:
continue-on-error: ${{ matrix.checks == 'advisories' }}
steps:
- - uses: actions/checkout@v3
- - uses: EmbarkStudios/cargo-deny-action@v1
- with:
- command: check ${{ matrix.checks }}
+ - uses: actions/checkout@v4
+ - uses: EmbarkStudios/cargo-deny-action@v1
+ with:
+ command: check ${{ matrix.checks }}
+
wasm:
name: WebAssembly
runs-on: ubuntu-latest
@@ -213,3 +211,32 @@ jobs:
name: crates with 'wasm' feature
- run: cd gix-pack && cargo build --all-features --target ${{ matrix.target }}
name: gix-pack with all features (including wasm)
+
+ check-packetline:
+ strategy:
+ fail-fast: false
+ matrix:
+ os:
+ - ubuntu-latest
+ # We consider this script read-only and its effect is the same everywhere.
+ # However, when changes are made to `etc/copy-packetline.sh`, re-enable the other platforms for testing.
+ # - macos-latest
+ # - windows-latest
+ runs-on: ${{ matrix.os }}
+ defaults:
+ run:
+ shell: bash
+ steps:
+ - uses: actions/checkout@v4
+ - name: Check that working tree is initially clean
+ run: |
+ set -x
+ git status
+ git diff --exit-code
+ - name: Regenerate gix-packetline-blocking/src
+ run: etc/copy-packetline.sh
+ - name: Check that gix-packetline-blocking/src was already up to date
+ run: |
+ set -x
+ git status
+ git diff --exit-code
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 0fd6950846c..350029cec1f 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -17,7 +17,7 @@ jobs:
language: rust
fuzz-seconds: 600
- name: Upload Crash
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
if: failure() && steps.build.outcome == 'success'
with:
name: artifacts
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 812b3ec7cf0..c4479841d8a 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -9,7 +9,7 @@ jobs:
stress:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
- name: stress
run: make stress
diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
index 1e77eaa241d..4d2e98cbfd7 100644
--- a/.github/workflows/msrv.yml
+++ b/.github/workflows/msrv.yml
@@ -18,8 +18,13 @@ jobs:
- windows-2019
- ubuntu-latest
runs-on: ${{ matrix.os }}
+ env:
+ # dictated by `firefox` to support the `helix` editor, but now driven by the `time` crate. IMPORTANT: adjust etc/msrv-badge.svg as well
+ rust_version: 1.67.0
steps:
- - uses: actions/checkout@v3
- - uses: dtolnay/rust-toolchain@1.67.0 # dictated by `firefox` to support the `helix` editor, but now driven by the `time` crate. IMPORTANT: adjust etc/msrv-badge.svg as well
- - uses: extractions/setup-just@v1
+ - uses: actions/checkout@v4
+ - uses: extractions/setup-just@v2
+ - run: |
+ rustup toolchain install ${{ env.rust_version }} --profile minimal --no-self-update
+ rustup default ${{ env.rust_version }}
- run: just ci-check-msrv
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3cb6d99c6f0..06e73353cfd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,7 +60,7 @@ jobs:
run: echo "${{ env.ARTIFACT_VERSION }}" > artifacts/release-version
- name: Upload artifacts
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: artifacts
path: artifacts
@@ -129,7 +129,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
fetch-depth: 1
@@ -161,7 +161,7 @@ jobs:
echo "target dir is: ${{ env.TARGET_DIR }}"
- name: Get release download URL
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
name: artifacts
path: artifacts
@@ -211,7 +211,7 @@ jobs:
fi
- name: Upload release archive
- uses: actions/upload-release-asset@v1.0.1
+ uses: actions/upload-release-asset@v1.0.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
diff --git a/.gitignore b/.gitignore
index 33cedd75f8d..78cd84318a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,6 @@ $/tests/fixtures/commit-graphs/
# newer Git sees these as precious, older Git falls through to the pattern above
$**/fuzz/Cargo.lock
+
+# Instead of adding more environment-specific ignores here, like for the IDE in use, prefer Git's user-global
+# `core.excludesFile` mechanism, see https://git-scm.com/docs/git-config#Documentation/git-config.txt-coreexcludesFile.
diff --git a/.gov/info.yml b/.gov/info.yml
index 2adfce84eee..5c835210b13 100644
--- a/.gov/info.yml
+++ b/.gov/info.yml
@@ -8,6 +8,6 @@ maintainers:
- push directly to 'main' branch
- reviews or suggestions by other maintainers if PRs are used
- co-ownership of contributed crates
- - reveive sponsorship via GitHub from project page
+ - receive sponsorship via GitHub from project page
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 228c6207b8e..a4046ac2cc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,123 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.36.0 (2024-05-22)
+
+### New Features
+
+ - checkout respects options for `core.protectHFS` and `core.protectNTFS`.
+ This also adds `gitoxide.core.protectWindows` as a way to enforce
+ additional restrictions that are usually only available on Windows.
+
+ Note that `core.protectNFS` is always enabled by default, just like
+ [it is in Git](https://github.com/git/git/commit/9102f958ee5254b10c0be72672aa3305bf4f4704).
+
+### Bug Fixes
+
+ - more robustness in the face of a trampling-herd of threads loading a single index.
+ The motivating example is here: https://github.com/praetorian-inc/noseyparker/issues/179
+
+ Previously, it was possible for a trampling herd of threads to consolidate the
+ disk state. Most of them would be 'needs-init' threads which could notice that
+ the initialization already happened, and just use that.
+
+ But a thread might be late for the party and somehow manages to not get any
+ newly loaded index, and thus tries to consolidate with what's on disk again.
+ Then it would again determine no change, and return nothing, causing the caller
+ to abort and not find objects it should find because it wouldn't see the index
+ that it should have seen.
+
+ The reason the thread got into this mess is that the 'is-load-ongoing' flagging
+ was racy itself, so it would not wait for ongoing loads and just conclude nothing
+ happened. An extra delay (by yielding) now assures it either seees the loading state
+ and waits for it, sees the newly loaded indices.
+
+ Note that this issue can be reproduced with:
+
+ ```
+ './target/release/gix -r repo-with-one-pack -t10 --trace odb stats --extra-header-lookup'
+ ```
+
+### Commit Statistics
+
+
+
+ - 6 commits contributed to the release over the course of 10 calendar days.
+ - 38 days passed between releases.
+ - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Merge branch 'various-fixes' ([`d6cd449`](https://github.com/Byron/gitoxide/commit/d6cd44930fb204b06e2b70fc6965e7705530c47a))
+ - Merge pull request from GHSA-7w47-3wg8-547c ([`79dce79`](https://github.com/Byron/gitoxide/commit/79dce79c62f6072aa2653780d590dc3993dfa401))
+ - Checkout respects options for `core.protectHFS` and `core.protectNTFS`. ([`886d6b5`](https://github.com/Byron/gitoxide/commit/886d6b58e4612ac21cc660ea4ddf1dd0b49d1c6e))
+ - Mark safety-related core-flags as planned ([`f3d5a69`](https://github.com/Byron/gitoxide/commit/f3d5a69bbe0ad14502ce617dc580cc2aa481bb0a))
+ - Merge branch 'status' ([`04ef31e`](https://github.com/Byron/gitoxide/commit/04ef31e9d6f5332d49037a5a4c248ebbb5aaf92b))
+ - More robustness in the face of a trampling-herd of threads loading a single index. ([`addf446`](https://github.com/Byron/gitoxide/commit/addf446f052ff74edcdb083f2b2968b313daa940))
+view details
+
+ * **Uncategorized**
+ - Merge pull request #1341 from szepeviktor/typos ([`55f379b`](https://github.com/Byron/gitoxide/commit/55f379bc47065822d078393d83d30c0835a89782))
+ - Fix typos ([`f72ecce`](https://github.com/Byron/gitoxide/commit/f72ecce45babcad2a0c9b73c79d01ff502907a57))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Add `gix status --format` to communicate the current format is very simple. ([`23bea36`](https://github.com/Byron/gitoxide/commit/23bea36f046a6f652cd1e06885ae132c85bb4f05))
+ - Add `gix status --ignored` support ([`84c74ff`](https://github.com/Byron/gitoxide/commit/84c74ffa698d35f8395c63db6acd3d0e6700d07f))
+ - Add `gix status --index-worktree-renames` ([`66e87cd`](https://github.com/Byron/gitoxide/commit/66e87cd31c060c3f97ac685ee0541c408f600362))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+ - `gix status` with submodule and rewrite support. ([`61c002b`](https://github.com/Byron/gitoxide/commit/61c002bc4ca5b5345c411e561fdcb492e7ae1d97))
+ - Add `gix is-clean|is-changed` ([`98b3680`](https://github.com/Byron/gitoxide/commit/98b368095ec99d1bc287da7f9294a9fce424deed))
+ - `gix submodules list --dirty-suffix` for dirty-information ([`afd20ca`](https://github.com/Byron/gitoxide/commit/afd20caadb40b6b793f2099b7232669f9a8f9086))
+ - Add `gix commit describe --dirty-suffix` ([`58231b4`](https://github.com/Byron/gitoxide/commit/58231b418fa39ea122ef41bb7691289f5b0be855))
+
`gitoxide` is an implementation of `git` written in Rust for developing future-proof applications which strive for correctness and
-performance while providing a pleasant and unsurprising developer experience.
+performance while providing a pleasant and unsurprising developer experience.
`gitoxide` provides the `gix` and `ein` binaries for use on the command-line to allow experimentation with key features
-like `fetch` and `clone`, and to validate the usability and control of the API offered by the [`gix`] crate.
+like `fetch` and `clone`, and to validate the usability and control of the API offered by the [`gix`] crate.
`gitoxide` aspires to be a production-grade server implementation and the `ein` binary aspires to become the default way to interact with git repositories.
@@ -16,10 +16,10 @@ like `fetch` and `clone`, and to validate the usability and control of the API o
## Development Status
-The command-line tools as well as the status of each crate is described in
+The command-line tools as well as the status of each crate is described in
[the crate status document](https://github.com/Byron/gitoxide/blob/main/crate-status.md).
-For use in applications, look for the [`gix`](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix) crate,
+For use in applications, look for the [`gix`](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix) crate,
which serves as entrypoint to the functionality provided by various lower-level plumbing crates like
[`gix-config`](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-config).
@@ -66,10 +66,10 @@ Follow linked crate name for detailed status. Please note that all crates follow
* **Stability Tier 1**
- [gix-lock](https://github.com/Byron/gitoxide/blob/main/gix-lock/README.md)
-
+
* **Stability Tier 2**
- [gix-tempfile](https://github.com/Byron/gitoxide/blob/main/gix-tempfile/README.md)
-
+
### Stabilization Candidates
Crates that seem feature complete and need to see some more use before they can be released as 1.0.
@@ -144,13 +144,13 @@ is usable to some extent.
* [gix-tix](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-tix)
* [gix-bundle](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-bundle)
* [gix-fsck](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-fsck)
-
+
### Stress Testing
* [x] Verify huge packs
- * [x] Explode a pack to disk
+ * [x] Explode a pack to disk
* [x] Generate and verify large commit graphs
* [ ] Generate huge pack from a lot of loose objects
-
+
### Stability and MSRV
Our [stability guide] helps to judge how much churn can be expected when depending on crates in this workspace.
@@ -161,7 +161,7 @@ Our [stability guide] helps to judge how much churn can be expected when dependi
### Download a Binary Release
-Using `cargo binstall`, one is able to fetch [binary releases][releases]. You can install it via `cargo install cargo-binstall`, assuming
+Using `cargo binstall`, one is able to fetch [binary releases][releases]. You can install it via `cargo install cargo-binstall`, assuming
the [rust toolchain][rustup] is present.
Then install gitoxide with `cargo binstall gitoxide`.
@@ -178,6 +178,14 @@ For Arch Linux you can download `gitoxide` from `community` repository:
pacman -S gitoxide
```
+### Download from Exherbo Linux Rust repository
+
+For Exherbo Linux you can download `gitoxide` from the [Rust](https://gitlab.exherbo.org/exherbo/rust/-/tree/master/packages/dev-scm/gitoxide) repository:
+```
+cave resolve -x repository/rust
+cave resolve -x gitoxide
+```
+
### From Source via Cargo
`cargo` is the Rust package manager which can easily be obtained through [rustup]. With it, you can build your own binary
@@ -192,7 +200,7 @@ for packagers who need to tune external dependencies.
```
# A certain way to install `gitoxide` with just Rust and a C compiler installed.
# If there are problems with SSL certificates during clones, try to omit `--locked`.
-cargo install gitoxide --locked --no-default-features --features max-pure
+cargo install gitoxide --locked --no-default-features --features max-pure
# The default installation, 'max', is the fastest, but also needs some libraries available to build successfully.
# Installing these is platform-dependent and thus can't be explained here.
@@ -218,8 +226,41 @@ What follows is a list of known failures.
- On Fedora, `perl` needs to be installed for `OpenSSL` to build properly. This can be done with the following command:
`dnf install perl` (see [this issue](https://github.com/Byron/gitoxide/issues/592)).
+-
+### Using Docker
+
+Some CI/CD pipelines leverage repository cloning. Below is a copy-paste-able example to build docker images for such workflows.
+As no official image exists (at this time), an image must first be built.
+
+> [!NOTE]
+> The dockerfile isn't continuously tested as it costs too much time and thus might already be broken.
+> PRs are welcome.
+
+#### Building the most compatible base image
+
+```sh
+docker build -f etc/docker/Dockerfile.alpine -t gitoxide:latest --compress . --target=pipeline
+```
+
+#### Basic usage in a Pipeline
+
+For example, if a `Dockerfile` currently uses something like `RUN git clone https://github.com/Byron/gitoxide`, first build the image:
-[releases]: https://github.com/Byron/gitoxide/releases
+```sh
+docker build -f etc/docker/Dockerfile.alpine -t gitoxide:latest --compress .
+```
+
+Then copy the binaries into your image and replace the `git` directive with a `gix` equivalent.
+
+```dockerfile
+COPY --from gitoxide:latest /bin/gix /usr/local/bin/
+COPY --from gitoxide:latest /bin/ein /usr/local/bin/
+
+RUN /usr/local/bin/gix clone --depth 1 https://github.com/Byron/gitoxide gitoxide
+```
+
+
+[releases]: https://github.com/Byron/gitoxide/releases
[rustup]: https://rustup.rs
## Usage
@@ -261,7 +302,6 @@ Project goals can change over time as we learn more, and they can be challenged.
* With the tools and experience available here there is no reason not to support Windows.
* [Windows is tested on CI](https://github.com/Byron/gitoxide/blob/df66d74aa2a8cb62d8a03383135f08c8e8c579a8/.github/workflows/rust.yml#L34)
and failures do prevent releases.
-
## Non-Goals
@@ -275,7 +315,7 @@ Project non-goals can change over time as we learn more, and they can be challen
* **use async IO everywhere**
* for the most part, git operations are heavily reliant on memory mapped IO as well as CPU to decompress data,
which doesn't lend itself well to async IO out of the box.
- * Use `blocking` as well as `gix-features::interrupt` to bring operations into the async world and to control
+ * Use `blocking` as well as `gix-features::interrupt` to bring operations into the async world and to control
long running operations.
* When connecting or streaming over TCP connections, especially when receiving on the server, async seems like a must
though, but behind a feature flag.
@@ -284,12 +324,9 @@ Project non-goals can change over time as we learn more, and they can be challen
If what you have seen so far sparked your interest to contribute, then let us say: We are happy to have you and help you to get started.
-> ❗️Note❗️: For cloning, `gix-lfs` needs to be locally installed or the checkout will fail. `git lfs install` must have been called once, followed
- by `git lfs pull` to replace the `lfs`-pointer files.
-
We recommend running `just test check-size` during the development process to assure CI is green before pushing.
-A backlog for work ready to be picked up is [available in the Project's Kanban board][project-board], which contains instructions on how
+A backlog for work ready to be picked up is [available in the Project's Kanban board][project-board], which contains instructions on how
to pick a task. If it's empty or you have other questions, feel free to [start a discussion][discussions] or reach out to @Byron [privately][keybase].
For additional details, also take a look at the [collaboration guide].
@@ -307,7 +344,7 @@ For additional details, also take a look at the [collaboration guide].
- Get an introduction to `gitoxide` itself which should be a good foundation for any contribution, but isn't a requirement for contributions either.
- [Gifting Gitoxide](https://www.youtube.com/playlist?list=PLMHbQxe1e9MlhyyZQXPi_dc-bKudE-WUw)
- See how PRs are reviewed along with a lot of inner monologue.
-
+
#### Other Media
- [Rustacean Station Podcast](https://rustacean-station.org/episode/055-sebastian-thiel/)
@@ -366,24 +403,23 @@ Provide a CLI to for the most basic user journey:
[fossil-scm]: https://www.fossil-scm.org
[magit]: https://magit.vc
-
## Shortcomings & Limitations
Please take a look at the [`SHORTCOMINGS.md` file](https://github.com/Byron/gitoxide/blob/main/SHORTCOMINGS.md) for details.
-
+
## Credits
* **itertools** _(MIT Licensed)_
* We use the `izip!` macro in code
* **deflate2** _(MIT Licensed)_
* We use various abstractions to implement decompression and compression directly on top of the rather low-level `miniz_oxide` crate
-
+
## 🙏 Special Thanks 🙏
At least for now this section is exclusive to highlight the incredible support that [Josh Triplett](https://github.com/joshtriplett) has provided to me
in the form of advice, sponsorship and countless other benefits that were incredibly meaningful. Going full time with `gitoxide` would hardly have been
feasible without his involvement, and I couldn't be more grateful 😌.
-
+
## License
This project is licensed under either of
@@ -399,6 +435,6 @@ at your option.
* Originally @Byron was really fascinated by [this problem](https://github.com/gitpython-developers/GitPython/issues/765#issuecomment-396072153)
and believes that with `gitoxide` it will be possible to provide the fastest solution for it.
-* @Byron has been absolutely blown away by `git` from the first time he experienced git more than 13 years ago, and
+* @Byron has been absolutely blown away by `git` from the first time he experienced git more than 13 years ago, and
tried to implement it in [various shapes](https://github.com/gitpython-developers/GitPython/pull/1028) and [forms](https://github.com/byron/gogit)
multiple [times](https://github.com/Byron/gitplusplus). Now with Rust @Byron finally feels to have found the right tool for the job!
diff --git a/SECURITY.md b/SECURITY.md
index f80d96826d1..0cfacebcfaf 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,4 +2,9 @@
## Reporting a Vulnerability
-Please inform me by writing an email to the @icloud.com email used in my commits. Thank you.
+Please feel free to [draft a GitHub advisory](https://github.com/Byron/gitoxide/security/advisories/new), and I will work with you to disclose and or resolve the issue
+responsibly.
+
+If this doesn't seem like the right approach or there are questions, please feel free to reach out to the @icloud.com email used in my commits.
+
+Thank you.
diff --git a/_typos.toml b/_typos.toml
index 8d8226d7aa3..ea8c5e4c03a 100644
--- a/_typos.toml
+++ b/_typos.toml
@@ -1,19 +1,32 @@
-[default]
-extend-ignore-identifiers-re = [
- "[a-f0-9]{7,}",
- "[Ff][Oo][Oo]",
- "[a-zA-Z0-9]{20,}",
-]
-
[files]
extend-exclude = [
"**/CHANGELOG.md",
- "**/tests/fixtures/**",
+ "*.response",
+ "etc/corpus/repo_metadata.sample.jsonl",
"gix-config/benches/large_config_file.rs",
- "gix-glob/tests/wildmatch/mod.rs"
+ "gix-config/tests/fixtures/clusterfuzz-testcase-minimized-gix-config-parse-6431708583690240",
+ "gix-glob/tests/wildmatch/mod.rs",
+ "gix-path/tests/fixtures/fuzzed/54k-path-components.path",
]
+ignore-hidden = false
+[default]
+extend-ignore-re = [
+ # PGP signature
+ "[0-9A-Za-z+=]{44,}",
+ '"egal"',
+ '"bar", "bart", "ba"',
+ '"foo/ba"',
+ '"FO", "FO", &\[\], "FO"',
+ '"(BarFoO|BarFoOo|FoO|FoOo)"',
+ "\\|pn: &BStr\\| pn !=",
+]
+extend-ignore-identifiers-re = [
+ # Git commit hash
+ "[0-9a-f]{7,}",
+ "rela_[a-z_]+",
+]
-[default.extend-words]
-rela = "rela"
-unter = "unter"
+[default.extend-identifiers]
+_pn = "_pn"
+ein = "ein"
diff --git a/crate-status.md b/crate-status.md
index 6a43168f4e7..ee017c8ef69 100644
--- a/crate-status.md
+++ b/crate-status.md
@@ -44,32 +44,31 @@ The top-level crate that acts as hub to all functionality provided by the `gix-*
* [ ] handle other non-discovery modes and provide control over environment variable usage required in applications
* [x] rev-parse
- [ ] handle relative paths as relative to working directory
- - [ ] handle `upstream` and `push` resolution.
+ - [x] handle `upstream` and `push` resolution.
* [x] rev-walk
* [x] include tips
* [ ] exclude commits
* [x] instantiation
* [x] access to refs and objects
+ * [x] create a pathspec-search from a set of strings
+ - [ ] allow to construct Pathspecs using data structure instead of enforcing them to be passed as strings.
* **credentials**
* [x] run `git credential` directly
* [x] use credential helper configuration and to obtain credentials with `gix_credentials::helper::Cascade`
- * **config**
- * [ ] facilities to apply the [url-match](https://git-scm.com/docs/git-config#Documentation/git-config.txt-httplturlgt) algorithm and to
- [normalize urls](https://github.com/git/git/blob/be1a02a17ede4082a86dfbfee0f54f345e8b43ac/urlmatch.c#L109:L109) before comparison.
* **traverse**
* [x] commit graphs
* [ ] make [git-notes](https://git-scm.com/docs/git-notes) accessible
* [x] tree entries
* **diffs/changes**
* [x] tree with other tree
- * [ ] respect case-sensitivity of host filesystem.
+ * [x] respect case-sensitivity of host filesystem.
* [x] a way to access various diff related settings or use them
- * [ ] respect `diff.*.textconv`, `diff.*.cachetextconv` and external diff viewers with `diff.*.command`,
+ * [x] respect `diff.*.textconv`, `diff.*.cachetextconv` and external diff viewers with `diff.*.command`,
[along with support for reading `diff` gitattributes](https://github.com/git/git/blob/73876f4861cd3d187a4682290ab75c9dccadbc56/Documentation/gitattributes.txt#L699:L699).
* **rewrite tracking**
* **deviation** - git keeps up to four candidates whereas we use the first-found candidate that matches the similarity percentage.
This can lead to different sources being found. As such, we also don't consider the filename at all.
- * [ ] handle binary files correctly, and apply filters for that matter
+ * [x] handle binary files correctly, and apply filters for that matter
* [x] computation limit with observable reduction of precision when it is hit, for copies and renames separately
* **by identity**
* [x] renames (sym-links are only ever compared by identity)
@@ -78,9 +77,9 @@ The top-level crate that acts as hub to all functionality provided by the `gix-*
* [x] renames
* [x] copies
* [x] 'find-copies-harder' - find copies with the source being the entire tree.
- * [ ] tree or index with working tree
- - [ ] rename tracking
- - [ ] submodule status (recursive)
+ * [x] tree or index with working tree
+ - [x] rename tracking
+ - [x] submodule status (recursive)
* [x] diffs between modified blobs with various algorithms
* [ ] tree with index (via index-from-tree and index)
- [ ] rename tracking
@@ -152,7 +151,10 @@ The top-level crate that acts as hub to all functionality provided by the `gix-*
* [x] read the primitive types `boolean`, `integer`, `string`
* [x] read and interpolate trusted paths
* [x] low-level API for more elaborate access to all details of `git-config` files
- * [ ] a way to make changes to individual configuration files
+ * [ ] a way to make changes to individual configuration files in memory
+ * [ ] write configuration back
+ * [ ] auto-refresh configuration values after they changed on disk
+ * [ ] facilities to apply the [url-match](https://git-scm.com/docs/git-config#Documentation/git-config.txt-httplturlgt) algorithm and to [normalize urls](https://github.com/git/git/blob/be1a02a17ede4082a86dfbfee0f54f345e8b43ac/urlmatch.c#L109:L109) before comparison.
* [x] mailmap
* [x] object replacements (`git replace`)
* [x] read git configuration
@@ -459,7 +461,9 @@ Check out the [performance discussion][gix-traverse-performance] as well.
### gix-pathspec
* [x] parse single
* [ ] parse file line by line (with or without quoting, NUL and LF/CRLF line separation) (see `--pathspec-from-file` and `--pathspec-file-nul`)
-* [ ] matching of paths with git-attributes support
+* [x] matching of paths with git-attributes support
+* [ ] programmatic creation of pathspecs
+* [ ] `TryIntoPathspec` trait to parse strings or accept ready-made pathspecs as well, for use in APIs
### gix-refspec
* [x] parse
@@ -552,12 +556,12 @@ Make it the best-performing implementation and the most convenient one.
### gix-status
* [x] differences between index and worktree to turn index into worktree
- - [ ] rename tracking
+ - [x] rename tracking
+ - [x] untracked files
+ - [ ] support for fs-monitor for modification checks
* [ ] differences between index and index to learn what changed
- [ ] rename tracking
-* [ ] untracked files
-* [ ] fast answer to 'is it dirty'.
-*
+
### gix-worktree-state
* handle the working **tree/checkout**
- [x] checkout an index of files, executables and symlinks just as fast as git
diff --git a/deny.toml b/deny.toml
index ddddea8f5f6..bd16612e281 100644
--- a/deny.toml
+++ b/deny.toml
@@ -8,21 +8,10 @@
# More documentation for the advisories section can be found here:
# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
[advisories]
-# The path where the advisory database is cloned/fetched into
-db-path = "~/.cargo/advisory-db"
-# The url(s) of the advisory databases to use
-db-urls = ["https://github.com/rustsec/advisory-db"]
-# The lint level for security vulnerabilities
-vulnerability = "deny"
-# The lint level for unmaintained crates
-unmaintained = "warn"
-# The lint level for crates that have been yanked from their source registry
-yanked = "warn"
-# The lint level for crates with security notices. Note that as of
-# 2019-12-17 there are no security notice advisories in
-# https://github.com/rustsec/advisory-db
-notice = "warn"
-ignore = []
+ignore = [
+ # this is `rustls@0.20.9` coming in with `curl`, which doesn't have an update yet. It's only active optionally, not by default.
+ "RUSTSEC-2024-0336",
+]
@@ -30,28 +19,21 @@ ignore = []
# More documentation for the licenses section can be found here:
# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
[licenses]
-# The lint level for crates which do not have a detectable license
-unlicensed = "deny"
# List of explicitly allowed licenses
# See https://spdx.org/licenses/ for list of possible licenses
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
allow = [
"Apache-2.0",
"BSD-3-Clause",
+ "BSL-1.0",
"MIT",
"MIT-0",
"ISC",
"Unicode-DFS-2016",
"LicenseRef-ring",
- "Zlib"
+ "Zlib",
+ "Unicode-3.0"
]
-# Lint level for licenses considered copyleft
-copyleft = "allow"
-# Lint level used when no other predicates are matched
-# 1. License isn't in the allow or deny lists
-# 2. License isn't copyleft
-# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
-default = "deny"
# The confidence threshold for detecting a license from license text.
# The higher the value, the more closely the license text must be to the
# canonical license text of a valid SPDX license file.
diff --git a/etc/check-package-size.sh b/etc/check-package-size.sh
index 7eee9d606ba..c23bad23336 100755
--- a/etc/check-package-size.sh
+++ b/etc/check-package-size.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
diff --git a/etc/copy-packetline.sh b/etc/copy-packetline.sh
new file mode 100755
index 00000000000..9ed5a0eea89
--- /dev/null
+++ b/etc/copy-packetline.sh
@@ -0,0 +1,152 @@
+#!/usr/bin/env bash
+
+set -euC -o pipefail
+
+readonly input_dir='gix-packetline/src'
+readonly output_parent_dir='gix-packetline-blocking'
+readonly output_dir="$output_parent_dir/src"
+
+function fail () {
+ printf '%s: error: %s\n' "$0" "$1" >&2
+ exit 1
+}
+
+function chdir_toplevel () {
+ local root_padded root
+
+ # Find the working tree's root. (Padding covers the trailing-newline case.)
+ root_padded="$(git rev-parse --show-toplevel && echo -n .)" ||
+ fail 'git-rev-parse failed to find top-level dir'
+ root="${root_padded%$'\n.'}"
+
+ cd -- "$root"
+}
+
+function merging () {
+ local git_dir_padded git_dir
+
+ # Find the .git directory. (Padding covers the trailing-newline case.)
+ git_dir_padded="$(git rev-parse --git-dir && echo -n .)" ||
+ fail 'git-rev-parse failed to find git dir'
+ git_dir="${git_dir_padded%$'\n.'}"
+
+ test -e "$git_dir/MERGE_HEAD"
+}
+
+function output_dir_status () {
+ git status --porcelain --ignored=traditional -- "$output_dir" ||
+ fail 'git-status failed'
+}
+
+function check_output_dir () {
+ if ! test -e "$output_dir"; then
+ # The destination does not exist on disk, so nothing will be lost. Proceed.
+ return
+ fi
+
+ if merging; then
+ # In a merge, it would be confusing to replace anything at the destination.
+ if output_dir_status | grep -q '^'; then
+ fail 'output location exists, and a merge is in progress'
+ fi
+ else
+ # We can lose data if anything of value at the destination is not in the
+ # index. (This includes unstaged deletions, for two reasons. We could lose
+ # track of which files had been deleted. More importantly, replacing a
+ # staged symlink or regular file with an unstaged directory is shown by
+ # git-status as only a deletion, even if the directory is non-empty.)
+ if output_dir_status | grep -q '^.[^ ]'; then
+ fail 'output location exists, with unstaged changes or ignored files'
+ fi
+ fi
+}
+
+function first_line_ends_crlf () {
+ # This is tricky to check portably. In Cygwin-like environments including
+ # MSYS2 and Git Bash, most text processing tools, including awk, sed, and
+ # grep, automatically ignore \r before \n. Some ignore \r everywhere. Some
+ # can be told to keep \r, but in non-portable ways that may affect other
+ # implementations. Bash ignores \r in some places even without "-o igncr",
+ # and ignores \r even more with it, including in all text from command
+ # substitution. Simple checks may be non-portable to other OSes. Fortunately,
+ # tools that treat input as binary data are exempt (even cat, but "-v" is
+ # non-portable, and unreliable in general because lines can end in "^M").
+ # This may be doable without od, by using tr more heavily, but it could be
+ # hard to avoid false positives with unexpected characters or \r without \n.
+
+ head -n 1 -- "$1" | # Get the longest prefix with no non-trailing \n byte.
+ od -An -ta | # Represent all bytes symbolically, without addresses.
+ tr -sd '\n' ' ' | # Scrunch into one line, so "cr nl" appears as such.
+ grep -q 'cr nl$' # Check if the result signifies a \r\n line ending.
+}
+
+function make_header () {
+ local input_file endline
+
+ input_file="$1"
+ endline="$2"
+
+ # shellcheck disable=SC2016 # The backticks are intentionally literal.
+ printf '// DO NOT EDIT - this is a copy of %s. Run `just copy-packetline` to update it.%s%s' \
+ "$input_file" "$endline" "$endline"
+}
+
+function copy_with_header () {
+ local input_file output_file endline
+
+ input_file="$1"
+ output_file="$2"
+
+ if first_line_ends_crlf "$input_file"; then
+ endline=$'\r\n'
+ else
+ endline=$'\n'
+ fi
+
+ make_header "$input_file" "$endline" | cat -- - "$input_file" >"$output_file"
+}
+
+function generate_one () {
+ local input_file output_file
+
+ input_file="$1"
+ output_file="$output_dir${input_file#"$input_dir"}"
+
+ if test -d "$input_file"; then
+ mkdir -p -- "$output_file"
+ elif test -L "$input_file"; then
+ # Cover this case separately, for more useful error messages.
+ fail "input file is symbolic link: $input_file"
+ elif ! test -f "$input_file"; then
+ # This covers less common kinds of files we can't or shouldn't process.
+ fail "input file neither regular file nor directory: $input_file"
+ elif [[ "$input_file" =~ \.rs$ ]]; then
+ copy_with_header "$input_file" "$output_file"
+ else
+ fail "input file not named as Rust source code: $input_file"
+ fi
+}
+
+function generate_all () {
+ local input_file
+
+ if ! test -d "$input_dir"; then
+ fail "no input directory: $input_dir"
+ fi
+ if ! test -d "$output_parent_dir"; then
+ fail "no output parent directory: $output_parent_dir"
+ fi
+ check_output_dir
+
+ rm -rf -- "$output_dir" # It may be a directory, symlink, or regular file.
+ if test -e "$output_dir"; then
+ fail 'unable to remove output location'
+ fi
+
+ find "$input_dir" -print0 | while IFS= read -r -d '' input_file; do
+ generate_one "$input_file"
+ done
+}
+
+chdir_toplevel
+generate_all
diff --git a/etc/corpus/clone-repos.sh b/etc/corpus/clone-repos.sh
index 0581544b16f..b302fcbd4e8 100755
--- a/etc/corpus/clone-repos.sh
+++ b/etc/corpus/clone-repos.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# Check if there is input on stdin
if [ -t 0 ]; then
diff --git a/etc/docker/Dockerfile.alpine b/etc/docker/Dockerfile.alpine
new file mode 100644
index 00000000000..0c29bccb162
--- /dev/null
+++ b/etc/docker/Dockerfile.alpine
@@ -0,0 +1,70 @@
+# Please note that this file is not regularly tested, and you are welcome to create PRs with fixes as needed.
+ARG GITOXIDE_VERSION=0.36.0
+
+FROM rust:alpine AS bootstrap_os
+ # hadolint ignore=DL3018
+ RUN apk upgrade --update-cache --available \
+ && apk add --no-cache --virtual .runtime-gitoxide libressl zlib-ng \
+ libressl3.8-libcrypto
+
+
+FROM bootstrap_os AS bootstrap_build_deps
+ # hadolint ignore=DL3018
+ RUN apk add --no-cache --virtual .rust-builder cmake gcc musl-dev make pkgconfig \
+ && apk add --no-cache --virtual .bootstrap-gitoxide libressl-dev zlib-ng \
+ libressl3.8-libcrypto
+
+
+FROM bootstrap_build_deps AS bootstrap_builder
+ ARG GITOXIDE_VERSION
+
+ ENV RUST_BACKTRACE=1
+
+ RUN cargo install gitoxide --version "${GITOXIDE_VERSION}" --message-format short \
+ && apk del .bootstrap-gitoxide \
+ && apk del .rust-builder
+
+
+FROM alpine:3.13.3 AS pipeline
+ # hadolint ignore=SC2016
+ RUN apk upgrade --update-cache --available \
+ && { \
+ echo '#!/bin/sh'; \
+ echo 'set -eu'; \
+ echo 'if [ "${#}" -gt 0 ] && [ "${1#-}" = "${1}" ] \'; \
+ echo ' && command -v "${1}" > "/dev/null" 2>&1; then'; \
+ echo ' exec "${@}"'; \
+ echo 'else exec /bin/shfmt "${@}"; fi'; \
+ echo 'exit 0'; \
+ } > /init && chmod +x /init
+
+ COPY --from=bootstrap_builder /usr/local/cargo/bin/gix /usr/local/cargo/bin/
+ COPY --from=bootstrap_builder /usr/local/cargo/bin/ein /usr/local/cargo/bin/
+
+ WORKDIR /usr/local/cargo/bin
+
+ SHELL [ "/bin/ash", "-o", "pipefail", "-c" ]
+
+ RUN find . -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); gsub(".*/", "", so); print so }' \
+ | xargs -r apk search -f | awk '{ so = $(NF-1); gsub(/-\d+.*$/, "", so); print so }' \
+ | xargs -r apk add --no-cache --virtual .runtime
+
+ ENV PATH="/usr/local/cargo/bin:${PATH}"
+
+ WORKDIR /root
+
+ HEALTHCHECK --retries=1 --timeout=15s CMD gix help
+
+ ENTRYPOINT [ "/init" ]
+
+
+FROM scratch
+ COPY --from=bootstrap_builder /usr/local/cargo/bin/gix /bin/
+ COPY --from=bootstrap_builder /usr/local/cargo/bin/ein /bin/
+
+ ENTRYPOINT [ "/bin/gix" ]
+
+ CMD [ "/bin/gix" ]
+
+# vi: nospell
diff --git a/examples/log.rs b/examples/log.rs
index be892f37e15..c143f8544cc 100644
--- a/examples/log.rs
+++ b/examples/log.rs
@@ -8,7 +8,7 @@ use clap::Parser;
use gix::{
bstr::{BString, ByteSlice},
date::time::format,
- traverse::commit::Sorting,
+ traverse::commit::simple::Sorting,
};
fn main() {
diff --git a/gitoxide-core/CHANGELOG.md b/gitoxide-core/CHANGELOG.md
index 4edba6a85c9..0878ad87357 100644
--- a/gitoxide-core/CHANGELOG.md
+++ b/gitoxide-core/CHANGELOG.md
@@ -5,6 +5,135 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.38.0 (2024-05-22)
+
+### Bug Fixes
+
+ - more robustness in the face of a trampling-herd of threads loading a single index.
+ The motivating example is here: https://github.com/praetorian-inc/noseyparker/issues/179
+
+ Previously, it was possible for a trampling herd of threads to consolidate the
+ disk state. Most of them would be 'needs-init' threads which could notice that
+ the initialization already happened, and just use that.
+
+ But a thread might be late for the party and somehow manages to not get any
+ newly loaded index, and thus tries to consolidate with what's on disk again.
+ Then it would again determine no change, and return nothing, causing the caller
+ to abort and not find objects it should find because it wouldn't see the index
+ that it should have seen.
+
+ The reason the thread got into this mess is that the 'is-load-ongoing' flagging
+ was racy itself, so it would not wait for ongoing loads and just conclude nothing
+ happened. An extra delay (by yielding) now assures it either seees the loading state
+ and waits for it, sees the newly loaded indices.
+
+ Note that this issue can be reproduced with:
+
+ ```
+ './target/release/gix -r repo-with-one-pack -t10 --trace odb stats --extra-header-lookup'
+ ```
+
+### Commit Statistics
+
+
+
+ - 7 commits contributed to the release over the course of 10 calendar days.
+ - 38 days passed between releases.
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge branch 'various-fixes' ([`d6cd449`](https://github.com/Byron/gitoxide/commit/d6cd44930fb204b06e2b70fc6965e7705530c47a))
+ - Update dependencies ([`cd4de83`](https://github.com/Byron/gitoxide/commit/cd4de8327fc195eb862ab6e138f2315a87374f85))
+ - Merge pull request from GHSA-7w47-3wg8-547c ([`79dce79`](https://github.com/Byron/gitoxide/commit/79dce79c62f6072aa2653780d590dc3993dfa401))
+ - Adapt to changes in `gix-worktree` ([`1ca6a3c`](https://github.com/Byron/gitoxide/commit/1ca6a3ce22887c7eb42ec3e0a19f6e1202715745))
+ - Merge branch 'status' ([`04ef31e`](https://github.com/Byron/gitoxide/commit/04ef31e9d6f5332d49037a5a4c248ebbb5aaf92b))
+ - More robustness in the face of a trampling-herd of threads loading a single index. ([`addf446`](https://github.com/Byron/gitoxide/commit/addf446f052ff74edcdb083f2b2968b313daa940))
+view details
+
+ * **[#1330](https://github.com/Byron/gitoxide/issues/1330)**
+ - Fix unread-fields warnings on latest nightly ([`2e06a00`](https://github.com/Byron/gitoxide/commit/2e06a00800418a6f571ba1731ffe05074565af03))
+ * **Uncategorized**
+ - Release gix-trace v0.1.9, gix-utils v0.1.12, gix-packetline-blocking v0.17.4, gix-filter v0.11.1, gix-fs v0.10.2, gix-traverse v0.39.0, gix-worktree-stream v0.12.0, gix-archive v0.12.0, gix-config v0.36.1, gix-url v0.27.3, gix-index v0.32.0, gix-worktree v0.33.0, gix-diff v0.43.0, gix-pathspec v0.7.3, gix-dir v0.4.0, gix-pack v0.50.0, gix-odb v0.60.0, gix-transport v0.42.0, gix-protocol v0.45.0, gix-status v0.9.0, gix-worktree-state v0.10.0, gix v0.62.0, gix-fsck v0.4.0, gitoxide-core v0.37.0, gitoxide v0.35.0, safety bump 14 crates ([`095c673`](https://github.com/Byron/gitoxide/commit/095c6739b2722a8b9af90776b435ef2da454c0e6))
+ - Prepare changelogs prior to release ([`5755271`](https://github.com/Byron/gitoxide/commit/57552717f46f96c35ba4ddc0a64434354ef845e9))
+ - Merge pull request #1341 from szepeviktor/typos ([`55f379b`](https://github.com/Byron/gitoxide/commit/55f379bc47065822d078393d83d30c0835a89782))
+ - Fix typos ([`f72ecce`](https://github.com/Byron/gitoxide/commit/f72ecce45babcad2a0c9b73c79d01ff502907a57))
+ - Merge branch 'add-topo-walk' ([`b590a9d`](https://github.com/Byron/gitoxide/commit/b590a9d2b6a273f76f0320d2b9fe1f679c08f549))
+ - Adapt to changes in `gix-traverse` ([`1cfeb11`](https://github.com/Byron/gitoxide/commit/1cfeb11f1fe9ad9c7b9084840ed7f5c5877f2f9a))
+ - Make `topo` more similar to `Ancestors`, but also rename `Ancestors` to `Simple` ([`2a9c178`](https://github.com/Byron/gitoxide/commit/2a9c178326b7f13ba6bc1f89fc2b9d9facbecf48))
+ - Adapt to changes in `gix-traverse` ([`6154bf3`](https://github.com/Byron/gitoxide/commit/6154bf3a346d69f9749271d50e4f3aacdcbad4d0))
+ - Merge branch 'status' ([`45edd2e`](https://github.com/Byron/gitoxide/commit/45edd2ea66035adf526cb2f617873dcba60a2a9a))
+ - Adapt to changes in `gix-index` ([`1e1fce1`](https://github.com/Byron/gitoxide/commit/1e1fce11a968ebbcede1135ccbd0b03e749a1267))
+ - Release gix-packetline v0.17.5, gix-transport v0.41.3, gix v0.61.1 ([`57579f1`](https://github.com/Byron/gitoxide/commit/57579f1ee4ef12c214db36325a2a0b2e8b2b14fd))
+ - Release gix-actor v0.31.1, gix-object v0.42.1, gix-index v0.31.1, gix-pathspec v0.7.2, gix-dir v0.3.0, gix-status v0.8.0, gix v0.61.0, safety bump 2 crates ([`155cc45`](https://github.com/Byron/gitoxide/commit/155cc45730b259e662d7c4be42a469a3af3750e1))
+ - Merge branch 'improvements-for-cargo' ([`41cd53e`](https://github.com/Byron/gitoxide/commit/41cd53e2af76e35e047aac4eca6324774df4cb50))
+ - Adapt to changes in `gix` ([`eff82eb`](https://github.com/Byron/gitoxide/commit/eff82eb0c67a7e7153c6119623a8aec052661b7d))
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Add `gix status --format` to communicate the current format is very simple. ([`23bea36`](https://github.com/Byron/gitoxide/commit/23bea36f046a6f652cd1e06885ae132c85bb4f05))
+ - Add `gix status --ignored` support ([`84c74ff`](https://github.com/Byron/gitoxide/commit/84c74ffa698d35f8395c63db6acd3d0e6700d07f))
+ - Add `gix status --index-worktree-renames` ([`66e87cd`](https://github.com/Byron/gitoxide/commit/66e87cd31c060c3f97ac685ee0541c408f600362))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+ - `gix status` with submodule and rewrite support. ([`61c002b`](https://github.com/Byron/gitoxide/commit/61c002bc4ca5b5345c411e561fdcb492e7ae1d97))
+ - Add `gix is-clean|is-changed` ([`98b3680`](https://github.com/Byron/gitoxide/commit/98b368095ec99d1bc287da7f9294a9fce424deed))
+ - `gix submodules list --dirty-suffix` for dirty-information ([`afd20ca`](https://github.com/Byron/gitoxide/commit/afd20caadb40b6b793f2099b7232669f9a8f9086))
+ - Add `gix commit describe --dirty-suffix` ([`58231b4`](https://github.com/Byron/gitoxide/commit/58231b418fa39ea122ef41bb7691289f5b0be855))
+ - Adapt to changes in `gix` ([`2d40bdf`](https://github.com/Byron/gitoxide/commit/2d40bdf325ed5b09b0ef6fd21e8b3da47d710451))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Merge branch 'status' ([`d53504a`](https://github.com/Byron/gitoxide/commit/d53504a1fad41cec7b6ca2a4abb7f185d8941e3f))
- Adapt to changes in `gix-dir` ([`aa7c190`](https://github.com/Byron/gitoxide/commit/aa7c1908b82e3e23859a4c663faa40ec54611919))
diff --git a/gitoxide-core/Cargo.toml b/gitoxide-core/Cargo.toml
index b69fb946a2a..1a5458e12ba 100644
--- a/gitoxide-core/Cargo.toml
+++ b/gitoxide-core/Cargo.toml
@@ -2,7 +2,7 @@
name = "gitoxide-core"
description = "The library implementing all capabilities of the gitoxide CLI"
repository = "https://github.com/Byron/gitoxide"
-version = "0.36.0"
+version = "0.38.0"
authors = ["Sebastian Thiel "]
license = "MIT OR Apache-2.0"
edition = "2021"
@@ -23,7 +23,7 @@ estimate-hours = ["dep:fs-err", "dep:crossbeam-channel", "dep:smallvec"]
query = ["dep:rusqlite"]
## Run algorithms on a corpus of repositories and store their results for later comparison and intelligence gathering.
## *Note that* `organize` we need for finding git repositories fast.
-corpus = [ "dep:rusqlite", "dep:sysinfo", "organize", "dep:crossbeam-channel", "dep:serde_json", "dep:tracing-forest", "dep:tracing-subscriber", "tracing", "dep:parking_lot" ]
+corpus = ["dep:rusqlite", "dep:sysinfo", "organize", "dep:crossbeam-channel", "dep:serde_json", "dep:tracing-forest", "dep:tracing-subscriber", "tracing", "dep:parking_lot"]
## The ability to create archives from virtual worktrees, similar to `git archive`.
archive = ["dep:gix-archive-for-configuration-only", "gix/worktree-archive"]
@@ -47,12 +47,12 @@ serde = ["gix/serde", "dep:serde_json", "dep:serde", "bytesize/serde"]
[dependencies]
# deselect everything else (like "performance") as this should be controllable by the parent application.
-gix = { version = "^0.59.0", path = "../gix", default-features = false, features = ["blob-diff", "revision", "mailmap", "excludes", "attributes", "worktree-mutation", "credentials", "interrupt", "status", "dirwalk"] }
-gix-pack-for-configuration-only = { package = "gix-pack", version = "^0.48.0", path = "../gix-pack", default-features = false, features = ["pack-cache-lru-dynamic", "pack-cache-lru-static", "generate", "streaming-input"] }
-gix-transport-configuration-only = { package = "gix-transport", version = "^0.41.1", path = "../gix-transport", default-features = false }
-gix-archive-for-configuration-only = { package = "gix-archive", version = "^0.10.0", path = "../gix-archive", optional = true, features = ["tar", "tar_gz"] }
-gix-status = { version = "^0.6.0", path = "../gix-status" }
-gix-fsck = { version = "^0.3.0", path = "../gix-fsck" }
+gix = { version = "^0.63.0", path = "../gix", default-features = false, features = ["blob-diff", "revision", "mailmap", "excludes", "attributes", "worktree-mutation", "credentials", "interrupt", "status", "dirwalk"] }
+gix-pack-for-configuration-only = { package = "gix-pack", version = "^0.51.0", path = "../gix-pack", default-features = false, features = ["pack-cache-lru-dynamic", "pack-cache-lru-static", "generate", "streaming-input"] }
+gix-transport-configuration-only = { package = "gix-transport", version = "^0.42.1", path = "../gix-transport", default-features = false }
+gix-archive-for-configuration-only = { package = "gix-archive", version = "^0.13.1", path = "../gix-archive", optional = true, features = ["tar", "tar_gz"] }
+gix-status = { version = "^0.10.0", path = "../gix-status" }
+gix-fsck = { version = "^0.4.0", path = "../gix-fsck" }
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
anyhow = "1.0.42"
thiserror = "1.0.34"
@@ -68,7 +68,7 @@ futures-io = { version = "0.3.16", optional = true }
blocking = { version = "1.0.2", optional = true }
# for 'organize' functionality
-gix-url = { version = "^0.27.1", path = "../gix-url", optional = true }
+gix-url = { version = "^0.27.3", path = "../gix-url", optional = true }
jwalk = { version = "0.8.0", optional = true }
# for 'hours'
@@ -77,7 +77,7 @@ crossbeam-channel = { version = "0.5.6", optional = true }
smallvec = { version = "1.10.0", optional = true }
# for 'query' and 'corpus'
-rusqlite = { version = "0.30.0", optional = true, features = ["bundled"] }
+rusqlite = { version = "0.31.0", optional = true, features = ["bundled"] }
# for 'corpus'
parking_lot = { version = "0.12.1", optional = true }
diff --git a/gitoxide-core/src/hours/mod.rs b/gitoxide-core/src/hours/mod.rs
index 0418ef1f01e..4080c30c4a0 100644
--- a/gitoxide-core/src/hours/mod.rs
+++ b/gitoxide-core/src/hours/mod.rs
@@ -175,7 +175,7 @@ where
}
commit_idx += 1;
}
- Err(gix::traverse::commit::ancestors::Error::Find { .. }) => {
+ Err(gix::traverse::commit::simple::Error::Find { .. }) => {
is_shallow = true;
break;
}
diff --git a/gitoxide-core/src/index/information.rs b/gitoxide-core/src/index/information.rs
index aa618ab10c3..4540e5bc832 100644
--- a/gitoxide-core/src/index/information.rs
+++ b/gitoxide-core/src/index/information.rs
@@ -6,6 +6,7 @@ pub struct Options {
#[cfg(feature = "serde")]
mod serde_only {
+ use gix::index::entry::Stage;
mod ext {
#[derive(serde::Serialize)]
@@ -115,11 +116,10 @@ mod serde_only {
let (mut intent_to_add, mut skip_worktree) = (0, 0);
for entry in f.entries() {
match entry.flags.stage() {
- 0 => stage_0_merged += 1,
- 1 => stage_1_base += 1,
- 2 => stage_2_ours += 1,
- 3 => stage_3_theirs += 1,
- invalid => anyhow::bail!("Invalid stage {} encountered", invalid),
+ Stage::Unconflicted => stage_0_merged += 1,
+ Stage::Base => stage_1_base += 1,
+ Stage::Ours => stage_2_ours += 1,
+ Stage::Theirs => stage_3_theirs += 1,
}
match entry.mode {
gix::index::entry::Mode::DIR => dir += 1,
diff --git a/gitoxide-core/src/lib.rs b/gitoxide-core/src/lib.rs
index 2cf788a994a..9ff7ab73760 100644
--- a/gitoxide-core/src/lib.rs
+++ b/gitoxide-core/src/lib.rs
@@ -84,3 +84,11 @@ pub use discover::discover;
#[cfg(all(feature = "async-client", feature = "blocking-client"))]
compile_error!("Cannot set both 'blocking-client' and 'async-client' features as they are mutually exclusive");
+
+fn is_dir_to_mode(is_dir: bool) -> gix::index::entry::Mode {
+ if is_dir {
+ gix::index::entry::Mode::DIR
+ } else {
+ gix::index::entry::Mode::FILE
+ }
+}
diff --git a/gitoxide-core/src/pack/create.rs b/gitoxide-core/src/pack/create.rs
index f8141e357d6..76bacd079c3 100644
--- a/gitoxide-core/src/pack/create.rs
+++ b/gitoxide-core/src/pack/create.rs
@@ -130,7 +130,7 @@ where
.collect::, _>>()?;
let handle = repo.objects.into_shared_arc().to_cache_arc();
let iter = Box::new(
- traverse::commit::Ancestors::new(tips, traverse::commit::ancestors::State::default(), handle.clone())
+ traverse::commit::Simple::new(tips, handle.clone())
.map(|res| res.map_err(|err| Box::new(err) as Box<_>).map(|c| c.id))
.inspect(move |_| progress.inc()),
);
@@ -361,7 +361,7 @@ pub mod input_iteration {
#[derive(Debug, thiserror::Error)]
pub enum Error {
#[error("input objects couldn't be iterated completely")]
- Iteration(#[from] traverse::commit::ancestors::Error),
+ Iteration(#[from] traverse::commit::simple::Error),
#[error("An error occurred while reading hashes from standard input")]
InputLinesIo(#[from] std::io::Error),
#[error("Could not decode hex hash provided on standard input")]
diff --git a/gitoxide-core/src/query/engine/update.rs b/gitoxide-core/src/query/engine/update.rs
index b5c6467e0d6..2e809f0e2b3 100644
--- a/gitoxide-core/src/query/engine/update.rs
+++ b/gitoxide-core/src/query/engine/update.rs
@@ -429,7 +429,7 @@ pub fn update(
break;
}
}
- Err(gix::traverse::commit::ancestors::Error::Find { .. }) => {
+ Err(gix::traverse::commit::simple::Error::Find { .. }) => {
writeln!(err, "shallow repository - commit history is truncated").ok();
break;
}
diff --git a/gitoxide-core/src/repository/attributes/query.rs b/gitoxide-core/src/repository/attributes/query.rs
index 09d1b0a0b48..9081eb9ed78 100644
--- a/gitoxide-core/src/repository/attributes/query.rs
+++ b/gitoxide-core/src/repository/attributes/query.rs
@@ -1,4 +1,4 @@
-use gix::repository::IndexPersistedOrInMemory;
+use gix::worktree::IndexPersistedOrInMemory;
use crate::OutputFormat;
@@ -14,6 +14,7 @@ pub(crate) mod function {
use gix::bstr::BStr;
use crate::{
+ is_dir_to_mode,
repository::{
attributes::query::{attributes_cache, Options},
PathsOrPatterns,
@@ -38,12 +39,12 @@ pub(crate) mod function {
match input {
PathsOrPatterns::Paths(paths) => {
for path in paths {
- let is_dir = gix::path::from_bstr(Cow::Borrowed(path.as_ref()))
+ let mode = gix::path::from_bstr(Cow::Borrowed(path.as_ref()))
.metadata()
.ok()
- .map(|m| m.is_dir());
+ .map(|m| is_dir_to_mode(m.is_dir()));
- let entry = cache.at_entry(path.as_slice(), is_dir)?;
+ let entry = cache.at_entry(path.as_slice(), mode)?;
if !entry.matching_attributes(&mut matches) {
continue;
}
@@ -61,9 +62,9 @@ pub(crate) mod function {
)?;
let mut pathspec_matched_entry = false;
if let Some(it) = pathspec.index_entries_with_paths(&index) {
- for (path, _entry) in it {
+ for (path, entry) in it {
pathspec_matched_entry = true;
- let entry = cache.at_entry(path, Some(false))?;
+ let entry = cache.at_entry(path, entry.mode.into())?;
if !entry.matching_attributes(&mut matches) {
continue;
}
@@ -87,10 +88,10 @@ pub(crate) mod function {
let path = pattern.path();
let entry = cache.at_entry(
path,
- Some(
+ Some(is_dir_to_mode(
workdir.map_or(false, |wd| wd.join(gix::path::from_bstr(path)).is_dir())
|| pattern.signature.contains(gix::pathspec::MagicSignature::MUST_BE_DIR),
- ),
+ )),
)?;
if !entry.matching_attributes(&mut matches) {
continue;
diff --git a/gitoxide-core/src/repository/attributes/validate_baseline.rs b/gitoxide-core/src/repository/attributes/validate_baseline.rs
index f2c92f71a30..686c668add6 100644
--- a/gitoxide-core/src/repository/attributes/validate_baseline.rs
+++ b/gitoxide-core/src/repository/attributes/validate_baseline.rs
@@ -192,7 +192,7 @@ pub(crate) mod function {
);
for (rela_path, baseline) in rx_base {
- let entry = cache.at_entry(rela_path.as_str(), Some(false))?;
+ let entry = cache.at_entry(rela_path.as_str(), None)?;
match baseline {
Baseline::Attribute { assignments: expected } => {
entry.matching_attributes(&mut matches);
@@ -262,6 +262,8 @@ pub(crate) mod function {
}
#[derive(Debug)]
+ // See note on `Mismatch`
+ #[allow(dead_code)]
pub struct ExcludeLocation {
pub line: usize,
pub rela_source_file: String,
@@ -269,6 +271,9 @@ pub(crate) mod function {
}
#[derive(Debug)]
+ // We debug-print this structure, which makes all fields 'used', but it doesn't count.
+ // TODO: find a way to not have to do more work, but make the warning go away.
+ #[allow(dead_code)]
pub enum Mismatch {
Attributes {
actual: Vec,
@@ -281,6 +286,8 @@ pub(crate) mod function {
}
#[derive(Debug)]
+ // See note on `Mismatch`
+ #[allow(dead_code)]
pub struct ExcludeMatch {
pub pattern: gix::glob::Pattern,
pub source: Option,
@@ -298,13 +305,13 @@ pub(crate) mod function {
}
fn parse_exclude(line: &str) -> Option<(String, Baseline)> {
- let (left, value) = line.split_at(line.find(|c| c == '\t')?);
+ let (left, value) = line.split_at(line.find('\t')?);
let value = &value[1..];
let location = if left == "::" {
None
} else {
- let mut tokens = left.split(|b| b == ':');
+ let mut tokens = left.split(':');
let source = tokens.next()?;
let line_number: usize = tokens.next()?.parse().ok()?;
let pattern = tokens.next()?;
@@ -356,8 +363,8 @@ pub(crate) mod function {
"unspecified" => StateRef::Unspecified,
_ => StateRef::from_bytes(info.as_bytes()),
};
- path = path.trim_end_matches(|b| b == ':');
- let attr = attr.trim_end_matches(|b| b == ':');
+ path = path.trim_end_matches(':');
+ let attr = attr.trim_end_matches(':');
let assignment = gix::attrs::AssignmentRef {
name: gix::attrs::NameRef::try_from(attr.as_bytes().as_bstr()).ok()?,
state,
diff --git a/gitoxide-core/src/repository/clean.rs b/gitoxide-core/src/repository/clean.rs
index fe91e3d2b38..b9bac90d9f3 100644
--- a/gitoxide-core/src/repository/clean.rs
+++ b/gitoxide-core/src/repository/clean.rs
@@ -60,7 +60,7 @@ pub(crate) mod function {
let index = repo.index_or_empty()?;
let pathspec_for_dirwalk = !pathspec_matches_result;
let has_patterns = !patterns.is_empty();
- let mut collect = InterruptableCollect::default();
+ let mut collect = InterruptibleCollect::default();
let collapse_directories = CollapseDirectory;
let options = repo
.dirwalk_options()?
@@ -86,6 +86,7 @@ pub(crate) mod function {
} else {
Vec::new()
},
+ &gix::interrupt::IS_INTERRUPTED,
options,
&mut collect,
)?;
@@ -364,11 +365,11 @@ pub(crate) mod function {
}
#[derive(Default)]
- struct InterruptableCollect {
+ struct InterruptibleCollect {
inner: gix::dir::walk::delegate::Collect,
}
- impl gix::dir::walk::Delegate for InterruptableCollect {
+ impl gix::dir::walk::Delegate for InterruptibleCollect {
fn emit(&mut self, entry: EntryRef<'_>, collapsed_directory_status: Option) -> walk::Action {
let res = self.inner.emit(entry, collapsed_directory_status);
if gix::interrupt::is_triggered() {
diff --git a/gitoxide-core/src/repository/clone.rs b/gitoxide-core/src/repository/clone.rs
index 9f09b71d55e..cf810deb389 100644
--- a/gitoxide-core/src/repository/clone.rs
+++ b/gitoxide-core/src/repository/clone.rs
@@ -6,6 +6,7 @@ pub struct Options {
pub handshake_info: bool,
pub no_tags: bool,
pub shallow: gix::remote::fetch::Shallow,
+ pub ref_name: Option,
}
pub const PROGRESS_RANGE: std::ops::RangeInclusive = 1..=3;
@@ -31,6 +32,7 @@ pub(crate) mod function {
handshake_info,
bare,
no_tags,
+ ref_name,
shallow,
}: Options,
) -> anyhow::Result<()>
@@ -75,6 +77,7 @@ pub(crate) mod function {
}
let (mut checkout, fetch_outcome) = prepare
.with_shallow(shallow)
+ .with_ref_name(ref_name.as_ref())?
.fetch_then_checkout(&mut progress, &gix::interrupt::IS_INTERRUPTED)?;
let (repo, outcome) = if bare {
diff --git a/gitoxide-core/src/repository/commit.rs b/gitoxide-core/src/repository/commit.rs
index 17ce99e5f3c..e0070dc2ae3 100644
--- a/gitoxide-core/src/repository/commit.rs
+++ b/gitoxide-core/src/repository/commit.rs
@@ -52,6 +52,7 @@ pub fn describe(
statistics,
max_candidates,
long_format,
+ dirty_suffix,
}: describe::Options,
) -> Result<()> {
repo.object_cache_size_if_unset(4 * 1024 * 1024);
@@ -80,7 +81,7 @@ pub fn describe(
writeln!(err, "traversed {} commits", resolution.outcome.commits_seen)?;
}
- let mut describe_id = resolution.format()?;
+ let mut describe_id = resolution.format_with_dirty_suffix(dirty_suffix)?;
describe_id.long(long_format);
writeln!(out, "{describe_id}")?;
@@ -97,5 +98,6 @@ pub mod describe {
pub long_format: bool,
pub statistics: bool,
pub max_candidates: usize,
+ pub dirty_suffix: Option,
}
}
diff --git a/gitoxide-core/src/repository/commitgraph/list.rs b/gitoxide-core/src/repository/commitgraph/list.rs
index 59e74a699cd..d9c024ed3f1 100644
--- a/gitoxide-core/src/repository/commitgraph/list.rs
+++ b/gitoxide-core/src/repository/commitgraph/list.rs
@@ -2,7 +2,7 @@ pub(crate) mod function {
use std::{borrow::Cow, ffi::OsString};
use anyhow::{bail, Context};
- use gix::{prelude::ObjectIdExt, traverse::commit::Sorting};
+ use gix::{prelude::ObjectIdExt, traverse::commit::simple::Sorting};
use crate::OutputFormat;
diff --git a/gitoxide-core/src/repository/credential.rs b/gitoxide-core/src/repository/credential.rs
index b9b93b9d057..c901f06f2ba 100644
--- a/gitoxide-core/src/repository/credential.rs
+++ b/gitoxide-core/src/repository/credential.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
#[derive(Debug, thiserror::Error)]
enum Error {
#[error(transparent)]
diff --git a/gitoxide-core/src/repository/dirty.rs b/gitoxide-core/src/repository/dirty.rs
new file mode 100644
index 00000000000..8981199d532
--- /dev/null
+++ b/gitoxide-core/src/repository/dirty.rs
@@ -0,0 +1,32 @@
+use crate::OutputFormat;
+use anyhow::bail;
+
+pub enum Mode {
+ IsClean,
+ IsDirty,
+}
+
+pub fn check(
+ repo: gix::Repository,
+ mode: Mode,
+ out: &mut dyn std::io::Write,
+ format: OutputFormat,
+) -> anyhow::Result<()> {
+ if format != OutputFormat::Human {
+ bail!("JSON output isn't implemented yet");
+ }
+ let is_dirty = repo.is_dirty()?;
+ let res = match (is_dirty, mode) {
+ (false, Mode::IsClean) => Ok("The repository is clean"),
+ (true, Mode::IsClean) => Err("The repository has changes"),
+ (false, Mode::IsDirty) => Err("The repository is clean"),
+ (true, Mode::IsDirty) => Ok("The repository has changes"),
+ };
+
+ let suffix = "(not counting untracked files)";
+ match res {
+ Ok(msg) => writeln!(out, "{msg} {suffix}")?,
+ Err(msg) => bail!("{msg} {suffix}"),
+ }
+ Ok(())
+}
diff --git a/gitoxide-core/src/repository/exclude.rs b/gitoxide-core/src/repository/exclude.rs
index ac837fe0303..a0cd212d08e 100644
--- a/gitoxide-core/src/repository/exclude.rs
+++ b/gitoxide-core/src/repository/exclude.rs
@@ -3,7 +3,7 @@ use std::{borrow::Cow, io};
use anyhow::bail;
use gix::bstr::BStr;
-use crate::{repository::PathsOrPatterns, OutputFormat};
+use crate::{is_dir_to_mode, repository::PathsOrPatterns, OutputFormat};
pub mod query {
use std::ffi::OsString;
@@ -44,11 +44,11 @@ pub fn query(
match input {
PathsOrPatterns::Paths(paths) => {
for path in paths {
- let is_dir = gix::path::from_bstr(Cow::Borrowed(path.as_ref()))
+ let mode = gix::path::from_bstr(Cow::Borrowed(path.as_ref()))
.metadata()
.ok()
- .map(|m| m.is_dir());
- let entry = cache.at_entry(path.as_slice(), is_dir)?;
+ .map(|m| is_dir_to_mode(m.is_dir()));
+ let entry = cache.at_entry(path.as_slice(), mode)?;
let match_ = entry
.matching_exclude_pattern()
.and_then(|m| (show_ignore_patterns || !m.pattern.is_negative()).then_some(m));
@@ -66,9 +66,9 @@ pub fn query(
)?;
if let Some(it) = pathspec.index_entries_with_paths(&index) {
- for (path, _entry) in it {
+ for (path, entry) in it {
pathspec_matched_something = true;
- let entry = cache.at_entry(path, Some(false))?;
+ let entry = cache.at_entry(path, entry.mode.into())?;
let match_ = entry
.matching_exclude_pattern()
.and_then(|m| (show_ignore_patterns || !m.pattern.is_negative()).then_some(m));
@@ -92,10 +92,10 @@ pub fn query(
let path = pattern.path();
let entry = cache.at_entry(
path,
- Some(
+ Some(is_dir_to_mode(
workdir.map_or(false, |wd| wd.join(gix::path::from_bstr(path)).is_dir())
|| pattern.signature.contains(gix::pathspec::MagicSignature::MUST_BE_DIR),
- ),
+ )),
)?;
let match_ = entry
.matching_exclude_pattern()
diff --git a/gitoxide-core/src/repository/index/entries.rs b/gitoxide-core/src/repository/index/entries.rs
index b4f335e6ae3..20a21e3a38b 100644
--- a/gitoxide-core/src/repository/index/entries.rs
+++ b/gitoxide-core/src/repository/index/entries.rs
@@ -23,13 +23,15 @@ pub(crate) mod function {
io::{BufWriter, Write},
};
+ use gix::index::entry::Stage;
use gix::{
bstr::{BStr, BString},
- repository::IndexPersistedOrInMemory,
+ worktree::IndexPersistedOrInMemory,
Repository,
};
use crate::{
+ is_dir_to_mode,
repository::index::entries::{Attributes, Options},
OutputFormat,
};
@@ -173,7 +175,7 @@ pub(crate) mod function {
}
// The user doesn't want attributes, so we set the cache position on demand only
None => cache
- .at_entry(rela_path, Some(is_dir))
+ .at_entry(rela_path, Some(is_dir_to_mode(is_dir)))
.ok()
.map(|platform| platform.matching_attributes(out))
.unwrap_or_default(),
@@ -317,7 +319,7 @@ pub(crate) mod function {
#[cfg(feature = "serde")]
fn to_json(
- mut out: &mut impl std::io::Write,
+ out: &mut impl std::io::Write,
index: &gix::index::File,
entry: &gix::index::Entry,
attrs: Option,
@@ -336,7 +338,7 @@ pub(crate) mod function {
}
serde_json::to_writer(
- &mut out,
+ &mut *out,
&Entry {
stat: &entry.stat,
hex_id: entry.id.to_hex().to_string(),
@@ -392,11 +394,10 @@ pub(crate) mod function {
out,
"{} {}{:?} {} {}{}{}",
match entry.flags.stage() {
- 0 => " ",
- 1 => "BASE ",
- 2 => "OURS ",
- 3 => "THEIRS ",
- _ => "UNKNOWN",
+ Stage::Unconflicted => " ",
+ Stage::Base => "BASE ",
+ Stage::Ours => "OURS ",
+ Stage::Theirs => "THEIRS ",
},
if entry.flags.is_empty() {
"".to_string()
diff --git a/gitoxide-core/src/repository/mod.rs b/gitoxide-core/src/repository/mod.rs
index 35d0c156a95..55816dcb774 100644
--- a/gitoxide-core/src/repository/mod.rs
+++ b/gitoxide-core/src/repository/mod.rs
@@ -26,6 +26,7 @@ pub use credential::function as credential;
pub mod attributes;
#[cfg(feature = "clean")]
pub mod clean;
+pub mod dirty;
#[cfg(feature = "clean")]
pub use clean::function::clean;
#[cfg(feature = "blocking-client")]
diff --git a/gitoxide-core/src/repository/odb.rs b/gitoxide-core/src/repository/odb.rs
index 85c35618db2..e8cb1f7a0b1 100644
--- a/gitoxide-core/src/repository/odb.rs
+++ b/gitoxide-core/src/repository/odb.rs
@@ -1,4 +1,5 @@
use std::io;
+use std::sync::atomic::Ordering;
use anyhow::bail;
@@ -50,6 +51,8 @@ pub mod statistics {
pub struct Options {
pub format: OutputFormat,
pub thread_limit: Option,
+ /// A debug-flag that triggers looking up the headers of all objects again, but without indices preloaded
+ pub extra_header_lookup: bool,
}
}
@@ -59,7 +62,11 @@ pub fn statistics(
mut progress: impl gix::Progress,
out: impl io::Write,
mut err: impl io::Write,
- statistics::Options { format, thread_limit }: statistics::Options,
+ statistics::Options {
+ format,
+ thread_limit,
+ extra_header_lookup,
+ }: statistics::Options,
) -> anyhow::Result<()> {
use bytesize::ByteSize;
use gix::odb::{find, HeaderExt};
@@ -76,6 +83,10 @@ pub fn statistics(
#[cfg_attr(feature = "serde", derive(serde::Serialize))]
#[derive(Default)]
struct Statistics {
+ /// All objects that were used to produce these statistics.
+ /// Only `Some` if we are doing an extra round of header queries on a repository without loaded indices.
+ #[cfg_attr(feature = "serde", serde(skip_serializing))]
+ ids: Option>,
total_objects: usize,
loose_objects: usize,
packed_objects: usize,
@@ -135,14 +146,17 @@ pub fn statistics(
}
impl gix::parallel::Reduce for Reduce {
- type Input = Result, anyhow::Error>;
+ type Input = Result, anyhow::Error>;
type FeedProduce = ();
type Output = Statistics;
type Error = anyhow::Error;
fn feed(&mut self, items: Self::Input) -> Result {
- for item in items? {
+ for (id, item) in items? {
self.stats.consume(item);
+ if let Some(ids) = self.stats.ids.as_mut() {
+ ids.push(id);
+ }
}
Ok(())
}
@@ -154,9 +168,9 @@ pub fn statistics(
}
let cancelled = || anyhow::anyhow!("Cancelled by user");
- let object_ids = repo.objects.store_ref().iter()?.filter_map(Result::ok);
+ let object_ids = repo.objects.iter()?.filter_map(Result::ok);
let chunk_size = 1_000;
- let stats = if gix::parallel::num_threads(thread_limit) > 1 {
+ let mut stats = if gix::parallel::num_threads(thread_limit) > 1 {
gix::parallel::in_parallel(
gix::interrupt::Iter::new(
gix::features::iter::Chunks {
@@ -166,19 +180,30 @@ pub fn statistics(
cancelled,
),
thread_limit,
- move |_| (repo.objects.clone().into_inner(), counter),
+ {
+ let objects = repo.objects.clone();
+ move |_| (objects.clone().into_inner(), counter)
+ },
|ids, (handle, counter)| {
let ids = ids?;
- counter.fetch_add(ids.len(), std::sync::atomic::Ordering::Relaxed);
+ counter.fetch_add(ids.len(), Ordering::Relaxed);
let out = ids
.into_iter()
- .map(|id| handle.header(id))
+ .map(|id| handle.header(id).map(|hdr| (id, hdr)))
.collect::, _>>()?;
Ok(out)
},
- Reduce::default(),
+ Reduce {
+ stats: Statistics {
+ ids: extra_header_lookup.then(Vec::new),
+ ..Default::default()
+ },
+ },
)?
} else {
+ if extra_header_lookup {
+ bail!("extra-header-lookup is only meaningful in threaded mode");
+ }
let mut stats = Statistics::default();
for (count, id) in object_ids.enumerate() {
@@ -193,6 +218,39 @@ pub fn statistics(
progress.show_throughput(start);
+ if let Some(mut ids) = stats.ids.take() {
+ // Critical to re-open the repo to assure we don't have any ODB state and start fresh.
+ let start = std::time::Instant::now();
+ let repo = gix::open_opts(repo.git_dir(), repo.open_options().to_owned())?;
+ progress.set_name("re-counting".into());
+ progress.init(Some(ids.len()), gix::progress::count("objects"));
+ let counter = progress.counter();
+ counter.store(0, Ordering::Relaxed);
+ let errors = gix::parallel::in_parallel_with_slice(
+ &mut ids,
+ thread_limit,
+ {
+ let objects = repo.objects.clone();
+ move |_| (objects.clone().into_inner(), counter, false)
+ },
+ |id, (odb, counter, has_error), _threads_left, _stop_everything| -> anyhow::Result<()> {
+ counter.fetch_add(1, Ordering::Relaxed);
+ if let Err(_err) = odb.header(id) {
+ *has_error = true;
+ gix::trace::error!(err = ?_err, "Object that is known to be present wasn't found");
+ }
+ Ok(())
+ },
+ || Some(std::time::Duration::from_millis(100)),
+ |(_, _, has_error)| has_error,
+ )?;
+
+ progress.show_throughput(start);
+ if errors.contains(&true) {
+ bail!("At least one object couldn't be looked up even though it must exist");
+ }
+ }
+
#[cfg(feature = "serde")]
{
serde_json::to_writer_pretty(out, &stats)?;
diff --git a/gitoxide-core/src/repository/revision/list.rs b/gitoxide-core/src/repository/revision/list.rs
index ab2bb2a60ed..7050bb6a667 100644
--- a/gitoxide-core/src/repository/revision/list.rs
+++ b/gitoxide-core/src/repository/revision/list.rs
@@ -17,7 +17,7 @@ pub const PROGRESS_RANGE: std::ops::RangeInclusive = 0..=2;
pub(crate) mod function {
use anyhow::{bail, Context};
- use gix::{hashtable::HashMap, traverse::commit::Sorting, Progress};
+ use gix::{hashtable::HashMap, traverse::commit::simple::Sorting, Progress};
use layout::{
backends::svg::SVGWriter,
core::{base::Orientation, geometry::Point, style::StyleAttr},
diff --git a/gitoxide-core/src/repository/revision/resolve.rs b/gitoxide-core/src/repository/revision/resolve.rs
index b4494e9e046..6e8a2b1ad65 100644
--- a/gitoxide-core/src/repository/revision/resolve.rs
+++ b/gitoxide-core/src/repository/revision/resolve.rs
@@ -127,11 +127,10 @@ pub(crate) mod function {
}
gix::object::Kind::Blob if cache.is_some() && spec.path_and_mode().is_some() => {
let (path, mode) = spec.path_and_mode().expect("is present");
- let is_dir = Some(mode.is_tree());
match cache.expect("is some") {
(BlobFormat::Git, _) => unreachable!("no need for a cache when querying object db"),
(BlobFormat::Worktree, cache) => {
- let platform = cache.attr_stack.at_entry(path, is_dir, &repo.objects)?;
+ let platform = cache.attr_stack.at_entry(path, Some(mode.into()), &repo.objects)?;
let object = id.object()?;
let mut converted = cache.filter.worktree_filter.convert_to_worktree(
&object.data,
diff --git a/gitoxide-core/src/repository/status.rs b/gitoxide-core/src/repository/status.rs
index ee36b1b1f3f..d3180f9c251 100644
--- a/gitoxide-core/src/repository/status.rs
+++ b/gitoxide-core/src/repository/status.rs
@@ -1,12 +1,8 @@
-use anyhow::{bail, Context};
-use gix::bstr::ByteSlice;
-use gix::{
- bstr::{BStr, BString},
- index::Entry,
- Progress,
-};
-use gix_status::index_as_worktree::{traits::FastEq, Change, Conflict, EntryStatus};
-use std::path::{Path, PathBuf};
+use anyhow::bail;
+use gix::bstr::{BStr, BString};
+use gix::status::index_worktree::iter::Item;
+use gix_status::index_as_worktree::{Change, Conflict, EntryStatus};
+use std::path::Path;
use crate::OutputFormat;
@@ -17,226 +13,196 @@ pub enum Submodules {
RefChange,
/// See if there are worktree modifications compared to the index, but do not check for untracked files.
Modifications,
+ /// Ignore all submodule changes.
+ None,
+}
+
+#[derive(Copy, Clone)]
+pub enum Ignored {
+ Collapsed,
+ Matching,
+}
+
+#[derive(Copy, Clone)]
+pub enum Format {
+ Simplified,
+ PorcelainV2,
}
pub struct Options {
- pub format: OutputFormat,
- pub submodules: Submodules,
+ pub ignored: Option,
+ pub format: Format,
+ pub output_format: OutputFormat,
+ pub submodules: Option,
pub thread_limit: Option,
pub statistics: bool,
pub allow_write: bool,
+ pub index_worktree_renames: Option,
}
pub fn show(
repo: gix::Repository,
pathspecs: Vec,
- out: impl std::io::Write,
+ mut out: impl std::io::Write,
mut err: impl std::io::Write,
- mut progress: impl gix::NestedProgress,
+ mut progress: impl gix::NestedProgress + 'static,
Options {
+ ignored,
format,
- // TODO: implement this
- submodules: _,
+ output_format,
+ submodules,
thread_limit,
allow_write,
statistics,
+ index_worktree_renames,
}: Options,
) -> anyhow::Result<()> {
- if format != OutputFormat::Human {
+ if output_format != OutputFormat::Human {
bail!("Only human format is supported right now");
}
- let mut index = repo.index_or_empty()?;
- let index = gix::threading::make_mut(&mut index);
- let mut progress = progress.add_child("traverse index");
- let start = std::time::Instant::now();
- let stack = repo
- .attributes_only(
- index,
- gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping,
- )?
- .detach();
- let pathspec = gix::Pathspec::new(&repo, false, pathspecs.iter().map(|p| p.as_bstr()), true, || {
- Ok(stack.clone())
- })?;
- let options = gix_status::index_as_worktree::Options {
- fs: repo.filesystem_options()?,
- thread_limit,
- stat: repo.stat_options()?,
- };
- let prefix = repo.prefix()?.unwrap_or(Path::new(""));
- let mut printer = Printer {
- out,
- changes: Vec::new(),
- prefix: prefix.to_owned(),
- };
- let filter_pipeline = repo
- .filter_pipeline(Some(gix::hash::ObjectId::empty_tree(repo.object_hash())))?
- .0
- .into_parts()
- .0;
- let ctx = gix_status::index_as_worktree::Context {
- pathspec: pathspec.into_parts().0,
- stack,
- filter: filter_pipeline,
- should_interrupt: &gix::interrupt::IS_INTERRUPTED,
- };
- let mut collect = gix::dir::walk::delegate::Collect::default();
- let (outcome, walk_outcome) = gix::features::parallel::threads(|scope| -> anyhow::Result<_> {
- // TODO: it's either this, or not running both in parallel and setting UPTODATE flags whereever
- // there is no modification. This can save disk queries as dirwalk can then trust what's in
- // the index regarding the type.
- // NOTE: collect here as rename-tracking needs that anyway.
- let walk_outcome = gix::features::parallel::build_thread()
- .name("gix status::dirwalk".into())
- .spawn_scoped(scope, {
- let repo = repo.clone().into_sync();
- let index = &index;
- let collect = &mut collect;
- move || -> anyhow::Result<_> {
- let repo = repo.to_thread_local();
- let outcome = repo.dirwalk(
- index,
- pathspecs,
- repo.dirwalk_options()?
- .emit_untracked(gix::dir::walk::EmissionMode::CollapseDirectory),
- collect,
- )?;
- Ok(outcome.dirwalk)
- }
- })?;
-
- let outcome = gix_status::index_as_worktree(
- index,
- repo.work_dir()
- .context("This operation cannot be run on a bare repository")?,
- &mut printer,
- FastEq,
- Submodule,
- repo.objects.clone().into_arc()?,
- &mut progress,
- ctx,
- options,
- )?;
-
- let walk_outcome = walk_outcome.join().expect("no panic")?;
- Ok((outcome, walk_outcome))
- })?;
-
- for entry in collect
- .into_entries_by_path()
- .into_iter()
- .filter_map(|(entry, dir_status)| dir_status.is_none().then_some(entry))
- {
- writeln!(
- printer.out,
- "{status: >3} {rela_path}",
- status = "?",
- rela_path = gix::path::relativize_with_prefix(&gix::path::from_bstr(entry.rela_path), prefix).display()
- )?;
+ if !matches!(format, Format::Simplified) {
+ bail!("Only the simplified format is currently implemented");
}
- if outcome.entries_to_update != 0 && allow_write {
- {
- let entries = index.entries_mut();
- for (entry_index, change) in printer.changes {
- let entry = &mut entries[entry_index];
- match change {
- ApplyChange::SetSizeToZero => {
- entry.stat.size = 0;
- }
- ApplyChange::NewStat(new_stat) => {
- entry.stat = new_stat;
+ let start = std::time::Instant::now();
+ let prefix = repo.prefix()?.unwrap_or(Path::new(""));
+ let index_progress = progress.add_child("traverse index");
+ let mut iter = repo
+ .status(index_progress)?
+ .should_interrupt_shared(&gix::interrupt::IS_INTERRUPTED)
+ .index_worktree_options_mut(|opts| {
+ if let Some((opts, ignored)) = opts.dirwalk_options.as_mut().zip(ignored) {
+ opts.set_emit_ignored(Some(match ignored {
+ Ignored::Collapsed => gix::dir::walk::EmissionMode::CollapseDirectory,
+ Ignored::Matching => gix::dir::walk::EmissionMode::Matching,
+ }));
+ }
+ opts.rewrites = index_worktree_renames.map(|percentage| gix::diff::Rewrites {
+ copies: None,
+ percentage: Some(percentage),
+ limit: 0,
+ });
+ if opts.rewrites.is_some() {
+ if let Some(opts) = opts.dirwalk_options.as_mut() {
+ opts.set_emit_untracked(gix::dir::walk::EmissionMode::Matching);
+ if ignored.is_some() {
+ opts.set_emit_ignored(Some(gix::dir::walk::EmissionMode::Matching));
}
}
}
+ opts.thread_limit = thread_limit;
+ opts.sorting = Some(gix::status::plumbing::index_as_worktree_with_renames::Sorting::ByPathCaseSensitive);
+ })
+ .index_worktree_submodules(match submodules {
+ Some(mode) => {
+ let ignore = match mode {
+ Submodules::All => gix::submodule::config::Ignore::None,
+ Submodules::RefChange => gix::submodule::config::Ignore::Dirty,
+ Submodules::Modifications => gix::submodule::config::Ignore::Untracked,
+ Submodules::None => gix::submodule::config::Ignore::All,
+ };
+ gix::status::Submodule::Given {
+ ignore,
+ check_dirty: false,
+ }
+ }
+ None => gix::status::Submodule::AsConfigured { check_dirty: false },
+ })
+ .into_index_worktree_iter(pathspecs)?;
+
+ for item in iter.by_ref() {
+ let item = item?;
+ match item {
+ Item::Modification {
+ entry: _,
+ entry_index: _,
+ rela_path,
+ status,
+ } => print_index_entry_status(&mut out, prefix, rela_path.as_ref(), status)?,
+ Item::DirectoryContents {
+ entry,
+ collapsed_directory_status,
+ } => {
+ if collapsed_directory_status.is_none() {
+ writeln!(
+ out,
+ "{status: >3} {rela_path}{slash}",
+ status = "?",
+ rela_path =
+ gix::path::relativize_with_prefix(&gix::path::from_bstr(entry.rela_path), prefix).display(),
+ slash = if entry.disk_kind.unwrap_or(gix::dir::entry::Kind::File).is_dir() {
+ "/"
+ } else {
+ ""
+ }
+ )?;
+ }
+ }
+ Item::Rewrite {
+ source,
+ dirwalk_entry,
+ copy: _, // TODO: how to visualize copies?
+ ..
+ } => {
+ // TODO: handle multi-status characters, there can also be modifications at the same time as determined by their ID and potentially diffstats.
+ writeln!(
+ out,
+ "{status: >3} {source_rela_path} → {dest_rela_path}",
+ status = "R",
+ source_rela_path =
+ gix::path::relativize_with_prefix(&gix::path::from_bstr(source.rela_path()), prefix).display(),
+ dest_rela_path = gix::path::relativize_with_prefix(
+ &gix::path::from_bstr(dirwalk_entry.rela_path.as_ref()),
+ prefix
+ )
+ .display(),
+ )?;
+ }
}
- index.write(gix::index::write::Options {
- extensions: Default::default(),
- skip_hash: false, // TODO: make this based on configuration
- })?;
}
-
- if statistics {
- writeln!(err, "{outcome:#?}").ok();
- writeln!(err, "{walk_outcome:#?}").ok();
+ if gix::interrupt::is_triggered() {
+ bail!("interrupted by user");
}
- writeln!(err, "\nhead -> index and untracked files aren't implemented yet")?;
- progress.show_throughput(start);
- Ok(())
-}
-
-#[derive(Clone)]
-struct Submodule;
-
-impl gix_status::index_as_worktree::traits::SubmoduleStatus for Submodule {
- type Output = ();
- type Error = std::convert::Infallible;
+ let out = iter.outcome_mut().expect("successful iteration has outcome");
- fn status(&mut self, _entry: &Entry, _rela_path: &BStr) -> Result, Self::Error> {
- Ok(None)
+ if out.has_changes() && allow_write {
+ out.write_changes().transpose()?;
}
-}
-
-struct Printer {
- out: W,
- changes: Vec<(usize, ApplyChange)>,
- prefix: PathBuf,
-}
-
-enum ApplyChange {
- SetSizeToZero,
- NewStat(gix::index::entry::Stat),
-}
-
-impl<'index, W> gix_status::index_as_worktree::VisitEntry<'index> for Printer
-where
- W: std::io::Write,
-{
- type ContentChange = ();
- type SubmoduleStatus = ();
- fn visit_entry(
- &mut self,
- _entries: &'index [Entry],
- _entry: &'index Entry,
- entry_index: usize,
- rela_path: &'index BStr,
- status: EntryStatus,
- ) {
- self.visit_inner(entry_index, rela_path, status).ok();
+ if statistics {
+ writeln!(err, "{outcome:#?}", outcome = out.index_worktree).ok();
}
+
+ writeln!(err, "\nhead -> index isn't implemented yet")?;
+ progress.init(Some(out.index.entries().len()), gix::progress::count("files"));
+ progress.set(out.index.entries().len());
+ progress.show_throughput(start);
+ Ok(())
}
-impl Printer {
- fn visit_inner(&mut self, entry_index: usize, rela_path: &BStr, status: EntryStatus<()>) -> std::io::Result<()> {
- let char_storage;
- let status = match status {
- EntryStatus::Conflict(conflict) => as_str(conflict),
- EntryStatus::Change(change) => {
- if matches!(
- change,
- Change::Modification {
- set_entry_stat_size_zero: true,
- ..
- }
- ) {
- self.changes.push((entry_index, ApplyChange::SetSizeToZero))
- }
- char_storage = change_to_char(&change);
- std::str::from_utf8(std::slice::from_ref(&char_storage)).expect("valid ASCII")
- }
- EntryStatus::NeedsUpdate(stat) => {
- self.changes.push((entry_index, ApplyChange::NewStat(stat)));
- return Ok(());
- }
- EntryStatus::IntentToAdd => "A",
- };
+fn print_index_entry_status(
+ out: &mut dyn std::io::Write,
+ prefix: &Path,
+ rela_path: &BStr,
+ status: EntryStatus<(), gix::submodule::Status>,
+) -> std::io::Result<()> {
+ let char_storage;
+ let status = match status {
+ EntryStatus::Conflict(conflict) => as_str(conflict),
+ EntryStatus::Change(change) => {
+ char_storage = change_to_char(&change);
+ std::str::from_utf8(std::slice::from_ref(&char_storage)).expect("valid ASCII")
+ }
+ EntryStatus::NeedsUpdate(_stat) => {
+ return Ok(());
+ }
+ EntryStatus::IntentToAdd => "A",
+ };
- let rela_path = gix::path::from_bstr(rela_path);
- let display_path = gix::path::relativize_with_prefix(&rela_path, &self.prefix);
- writeln!(&mut self.out, "{status: >3} {}", display_path.display())
- }
+ let rela_path = gix::path::from_bstr(rela_path);
+ let display_path = gix::path::relativize_with_prefix(&rela_path, prefix);
+ writeln!(out, "{status: >3} {}", display_path.display())
}
fn as_str(c: Conflict) -> &'static str {
@@ -251,7 +217,7 @@ fn as_str(c: Conflict) -> &'static str {
}
}
-fn change_to_char(change: &Change<()>) -> u8 {
+fn change_to_char(change: &Change<(), gix::submodule::Status>) -> u8 {
// Known status letters: https://github.com/git/git/blob/6807fcfedab84bc8cd0fbf721bc13c4e68cda9ae/diff.h#L613
match change {
Change::Removed => b'D',
diff --git a/gitoxide-core/src/repository/submodule.rs b/gitoxide-core/src/repository/submodule.rs
index c8e8c45eaa2..12ef64870e8 100644
--- a/gitoxide-core/src/repository/submodule.rs
+++ b/gitoxide-core/src/repository/submodule.rs
@@ -3,7 +3,12 @@ use gix::{commit::describe::SelectRef, prelude::ObjectIdExt, Repository, Submodu
use crate::OutputFormat;
-pub fn list(repo: Repository, mut out: impl std::io::Write, format: OutputFormat) -> anyhow::Result<()> {
+pub fn list(
+ repo: Repository,
+ mut out: impl std::io::Write,
+ format: OutputFormat,
+ dirty_suffix: Option,
+) -> anyhow::Result<()> {
if format != OutputFormat::Human {
bail!("Only human output is supported for now")
}
@@ -12,12 +17,12 @@ pub fn list(repo: Repository, mut out: impl std::io::Write, format: OutputFormat
return Ok(());
};
for sm in submodules {
- print_sm(sm, &mut out)?;
+ print_sm(sm, dirty_suffix.as_deref(), &mut out)?;
}
Ok(())
}
-fn print_sm(sm: Submodule<'_>, out: &mut impl std::io::Write) -> anyhow::Result<()> {
+fn print_sm(sm: Submodule<'_>, dirty_suffix: Option<&str>, out: &mut impl std::io::Write) -> anyhow::Result<()> {
let _span = gix::trace::coarse!("print_sm", path = ?sm.path());
let state = sm.state()?;
let mut sm_repo = sm.open()?;
@@ -48,7 +53,10 @@ fn print_sm(sm: Submodule<'_>, out: &mut impl std::io::Write) -> anyhow::Result<
repo.head_commit()?
.describe()
.names(SelectRef::AllRefs)
- .format()?
+ .id_as_fallback(true)
+ .try_resolve()?
+ .expect("resolution present if ID can be used as fallback")
+ .format_with_dirty_suffix(dirty_suffix.map(ToOwned::to_owned))?
.to_string()
}
None => {
diff --git a/gix-actor/CHANGELOG.md b/gix-actor/CHANGELOG.md
index 7290079d9b9..103319ef7e1 100644
--- a/gix-actor/CHANGELOG.md
+++ b/gix-actor/CHANGELOG.md
@@ -5,6 +5,100 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.31.2 (2024-05-22)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 2 commits contributed to the release over the course of 8 calendar days.
+ - 65 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Release gix-date v0.8.6 ([`d3588ca`](https://github.com/Byron/gitoxide/commit/d3588ca4fe0364c88e42cdac24ceae548355d99d))
+view details
+
+ * **[#1322](https://github.com/Byron/gitoxide/issues/1322)**
+ - Allow parsing signatures with trailing numbers in offset ([`741e373`](https://github.com/Byron/gitoxide/commit/741e3739ebd4bf48c3ef94b87ccce7602cb7cc2f))
+ * **Uncategorized**
+ - Release gix-actor v0.31.1, gix-object v0.42.1, gix-index v0.31.1, gix-pathspec v0.7.2, gix-dir v0.3.0, gix-status v0.8.0, gix v0.61.0, safety bump 2 crates ([`155cc45`](https://github.com/Byron/gitoxide/commit/155cc45730b259e662d7c4be42a469a3af3750e1))
+ - Prepare changelog prior to release ([`129ba3d`](https://github.com/Byron/gitoxide/commit/129ba3deccc9ada0dc571466458845939502763d))
+ - Merge branch 'improvements-for-cargo' ([`41cd53e`](https://github.com/Byron/gitoxide/commit/41cd53e2af76e35e047aac4eca6324774df4cb50))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+ - Update to `winnow` 0.6 ([`35592c9`](https://github.com/Byron/gitoxide/commit/35592c9aa9665e1d9f554b589614fe59308a5f25))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Merge branch 'btoi' ([`5fc379d`](https://github.com/Byron/gitoxide/commit/5fc379d1dc867d15a50cb086e30beefde2b42d86))
- Refactor ([`c5c69bd`](https://github.com/Byron/gitoxide/commit/c5c69bd355771a6fb3e4f6db0c5f49aa2bf7f42f))
diff --git a/gix-actor/Cargo.toml b/gix-actor/Cargo.toml
index d82e2b35f39..1271a01dce5 100644
--- a/gix-actor/Cargo.toml
+++ b/gix-actor/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-actor"
-version = "0.30.1"
+version = "0.31.2"
description = "A way to identify git actors"
authors = ["Sebastian Thiel "]
repository = "https://github.com/Byron/gitoxide"
@@ -18,9 +18,9 @@ doctest = false
serde = ["dep:serde", "bstr/serde", "gix-date/serde"]
[dependencies]
-gix-features = { version = "^0.38.0", path = "../gix-features", optional = true }
-gix-date = { version = "^0.8.4", path = "../gix-date" }
-gix-utils = { version = "^0.1.10", path = "../gix-utils" }
+gix-features = { version = "^0.38.2", path = "../gix-features", optional = true }
+gix-date = { version = "^0.8.6", path = "../gix-date" }
+gix-utils = { version = "^0.1.11", path = "../gix-utils" }
thiserror = "1.0.38"
bstr = { version = "1.3.0", default-features = false, features = [
diff --git a/gix-actor/src/lib.rs b/gix-actor/src/lib.rs
index e582541cb1a..e7e94770098 100644
--- a/gix-actor/src/lib.rs
+++ b/gix-actor/src/lib.rs
@@ -22,6 +22,7 @@ use gix_date::Time;
mod identity;
///
+#[allow(clippy::empty_docs)]
pub mod signature;
/// A person with name and email.
diff --git a/gix-actor/src/signature/decode.rs b/gix-actor/src/signature/decode.rs
index b19deb510bd..8b31da6b001 100644
--- a/gix-actor/src/signature/decode.rs
+++ b/gix-actor/src/signature/decode.rs
@@ -36,9 +36,14 @@ pub(crate) mod function {
take_while(1..=2, AsChar::is_dec_digit)
.verify_map(|v| to_signed::(v).ok())
.context(StrContext::Expected("MM".into())),
+ take_while(0.., AsChar::is_dec_digit).map(|v: &[u8]| v),
)
- .map(|(time, sign, hours, minutes)| {
- let offset = (hours * 3600 + minutes * 60) * if sign == Sign::Minus { -1 } else { 1 };
+ .map(|(time, sign, hours, minutes, trailing_digits)| {
+ let offset = if trailing_digits.is_empty() {
+ (hours * 3600 + minutes * 60) * if sign == Sign::Minus { -1 } else { 1 }
+ } else {
+ 0
+ };
Time {
seconds: time,
offset,
diff --git a/gix-actor/src/signature/mod.rs b/gix-actor/src/signature/mod.rs
index 057d4293e7d..34a0f7e28f3 100644
--- a/gix-actor/src/signature/mod.rs
+++ b/gix-actor/src/signature/mod.rs
@@ -129,5 +129,6 @@ pub(crate) mod write {
}
///
+#[allow(clippy::empty_docs)]
pub mod decode;
pub use decode::function::decode;
diff --git a/gix-actor/tests/signature/mod.rs b/gix-actor/tests/signature/mod.rs
index 496fb54ae54..55effea170d 100644
--- a/gix-actor/tests/signature/mod.rs
+++ b/gix-actor/tests/signature/mod.rs
@@ -53,7 +53,7 @@ mod write_to {
}
use bstr::ByteSlice;
-use gix_actor::Signature;
+use gix_actor::{Signature, SignatureRef};
#[test]
fn trim() {
@@ -80,3 +80,28 @@ fn round_trip() -> Result<(), Box> {
}
Ok(())
}
+
+#[test]
+fn parse_timestamp_with_trailing_digits() {
+ let signature = gix_actor::SignatureRef::from_bytes::<()>(b"first last 1312735823 +051800")
+ .expect("deal with trailing zeroes in timestamp by discarding it");
+ assert_eq!(
+ signature,
+ SignatureRef {
+ name: "first last".into(),
+ email: "name@example.com".into(),
+ time: gix_actor::date::Time::new(1312735823, 0),
+ }
+ );
+
+ let signature = gix_actor::SignatureRef::from_bytes::<()>(b"first last 1312735823 +0518")
+ .expect("this naturally works as the timestamp does not have trailing zeroes");
+ assert_eq!(
+ signature,
+ SignatureRef {
+ name: "first last".into(),
+ email: "name@example.com".into(),
+ time: gix_actor::date::Time::new(1312735823, 19080),
+ }
+ );
+}
diff --git a/gix-archive/CHANGELOG.md b/gix-archive/CHANGELOG.md
index 2b542729079..0845d84d64d 100644
--- a/gix-archive/CHANGELOG.md
+++ b/gix-archive/CHANGELOG.md
@@ -5,6 +5,114 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.13.1 (2024-05-25)
+
+### Chore
+
+ - version bump dependency zip-2.0.0
+ upstream revoked version zip-1.3.1
+
+### Commit Statistics
+
+
+
+ - 3 commits contributed to the release.
+ - 3 days passed between releases.
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Merge pull request #1379 from belt/main ([`b4ab6f7`](https://github.com/Byron/gitoxide/commit/b4ab6f77596ae54f68743bbd93228dca08cc0440))
+ - Adjust expectations in `gix-archive` ([`67bc66c`](https://github.com/Byron/gitoxide/commit/67bc66c1bb670971211968186ede27d4860f444b))
+ - Version bump dependency zip-2.0.0 ([`7f0a08f`](https://github.com/Byron/gitoxide/commit/7f0a08f31661b917859dd761bf6610a303c1d432))
+view details
+
+ * **Uncategorized**
+ - Release gix-features v0.38.2, gix-actor v0.31.2, gix-validate v0.8.5, gix-object v0.42.2, gix-command v0.3.7, gix-filter v0.11.2, gix-fs v0.11.0, gix-revwalk v0.13.1, gix-traverse v0.39.1, gix-worktree-stream v0.13.0, gix-archive v0.13.0, gix-tempfile v14.0.0, gix-lock v14.0.0, gix-ref v0.44.0, gix-config v0.37.0, gix-prompt v0.8.5, gix-index v0.33.0, gix-worktree v0.34.0, gix-diff v0.44.0, gix-discover v0.32.0, gix-pathspec v0.7.5, gix-dir v0.5.0, gix-macros v0.1.5, gix-mailmap v0.23.1, gix-negotiate v0.13.1, gix-pack v0.51.0, gix-odb v0.61.0, gix-transport v0.42.1, gix-protocol v0.45.1, gix-revision v0.27.1, gix-status v0.10.0, gix-submodule v0.11.0, gix-worktree-state v0.11.0, gix v0.63.0, gitoxide-core v0.38.0, gitoxide v0.36.0, safety bump 19 crates ([`4f98e94`](https://github.com/Byron/gitoxide/commit/4f98e94e0e8b79ed2899b35bef40f3c30b3025b0))
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge branch 'various-fixes' ([`d6cd449`](https://github.com/Byron/gitoxide/commit/d6cd44930fb204b06e2b70fc6965e7705530c47a))
+ - Symlink support for `zip` archives ([`e955770`](https://github.com/Byron/gitoxide/commit/e955770c0b5c06a6c8518a06df4aa0cc3b506f16))
+ - Merge pull request from GHSA-7w47-3wg8-547c ([`79dce79`](https://github.com/Byron/gitoxide/commit/79dce79c62f6072aa2653780d590dc3993dfa401))
+ - Adapt to changes in `gix-worktree` ([`1ca6a3c`](https://github.com/Byron/gitoxide/commit/1ca6a3ce22887c7eb42ec3e0a19f6e1202715745))
+ - Release gix-date v0.8.6 ([`d3588ca`](https://github.com/Byron/gitoxide/commit/d3588ca4fe0364c88e42cdac24ceae548355d99d))
+view details
+
+ * **Uncategorized**
+ - Release gix-trace v0.1.9, gix-utils v0.1.12, gix-packetline-blocking v0.17.4, gix-filter v0.11.1, gix-fs v0.10.2, gix-traverse v0.39.0, gix-worktree-stream v0.12.0, gix-archive v0.12.0, gix-config v0.36.1, gix-url v0.27.3, gix-index v0.32.0, gix-worktree v0.33.0, gix-diff v0.43.0, gix-pathspec v0.7.3, gix-dir v0.4.0, gix-pack v0.50.0, gix-odb v0.60.0, gix-transport v0.42.0, gix-protocol v0.45.0, gix-status v0.9.0, gix-worktree-state v0.10.0, gix v0.62.0, gix-fsck v0.4.0, gitoxide-core v0.37.0, gitoxide v0.35.0, safety bump 14 crates ([`095c673`](https://github.com/Byron/gitoxide/commit/095c6739b2722a8b9af90776b435ef2da454c0e6))
+ - Prepare changelogs prior to release ([`5755271`](https://github.com/Byron/gitoxide/commit/57552717f46f96c35ba4ddc0a64434354ef845e9))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Release gix-path v0.10.5 ([`b8cba96`](https://github.com/Byron/gitoxide/commit/b8cba96ce57f8b6b0067d6a8cf3e37eaf280a238))
view details
+
+ * **Uncategorized**
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Merge branch 'dirwalk' ([`face359`](https://github.com/Byron/gitoxide/commit/face359443ba33e8985ec1525d5ec38b743ea7a9))
- Adjust gitignore files with precious declarations ([`ae86a6a`](https://github.com/Byron/gitoxide/commit/ae86a6a206074b85ff1eba32aea9c8b40c087b17))
diff --git a/gix-attributes/Cargo.toml b/gix-attributes/Cargo.toml
index a8fd3bb6b5d..c259e8961c9 100644
--- a/gix-attributes/Cargo.toml
+++ b/gix-attributes/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-attributes"
-version = "0.22.1"
+version = "0.22.2"
repository = "https://github.com/Byron/gitoxide"
license = "MIT OR Apache-2.0"
description = "A crate of the gitoxide project dealing .gitattributes files"
@@ -17,10 +17,10 @@ doctest = false
serde = ["dep:serde", "bstr/serde", "gix-glob/serde", "kstring/serde"]
[dependencies]
-gix-path = { version = "^0.10.6", path = "../gix-path" }
-gix-quote = { version = "^0.4.11", path = "../gix-quote" }
-gix-glob = { version = "^0.16.1", path = "../gix-glob" }
-gix-trace = { version = "^0.1.7", path = "../gix-trace" }
+gix-path = { version = "^0.10.7", path = "../gix-path" }
+gix-quote = { version = "^0.4.12", path = "../gix-quote" }
+gix-glob = { version = "^0.16.3", path = "../gix-glob" }
+gix-trace = { version = "^0.1.8", path = "../gix-trace" }
bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"]}
smallvec = "1.10.0"
diff --git a/gix-attributes/src/lib.rs b/gix-attributes/src/lib.rs
index 812ffe49a75..4b1090fa9bb 100644
--- a/gix-attributes/src/lib.rs
+++ b/gix-attributes/src/lib.rs
@@ -13,14 +13,18 @@ use kstring::{KString, KStringRef};
mod assignment;
///
+#[allow(clippy::empty_docs)]
pub mod name;
///
+#[allow(clippy::empty_docs)]
pub mod state;
///
+#[allow(clippy::empty_docs)]
pub mod search;
///
+#[allow(clippy::empty_docs)]
pub mod parse;
/// Parse attribute assignments line by line from `bytes`, and fail the operation on error.
diff --git a/gix-attributes/src/search/outcome.rs b/gix-attributes/src/search/outcome.rs
index 41d70e5806c..2a0df7e478a 100644
--- a/gix-attributes/src/search/outcome.rs
+++ b/gix-attributes/src/search/outcome.rs
@@ -26,7 +26,7 @@ impl Outcome {
for (order, macro_attributes) in collection.iter().filter_map(|(_, meta)| {
(!meta.macro_attributes.is_empty()).then_some((meta.id.0, &meta.macro_attributes))
}) {
- self.matches_by_id[order].macro_attributes = macro_attributes.clone()
+ self.matches_by_id[order].macro_attributes.clone_from(macro_attributes)
}
for (name, id) in self.selected.iter_mut().filter(|(_, id)| id.is_none()) {
@@ -88,7 +88,7 @@ impl Outcome {
/// Note that it's safe to call it multiple times, so that it can be called after this instance was used to store a search result.
pub fn copy_into(&self, collection: &MetadataCollection, dest: &mut Self) {
dest.initialize(collection);
- dest.matches_by_id = self.matches_by_id.clone();
+ dest.matches_by_id.clone_from(&self.matches_by_id);
if dest.patterns.len() != self.patterns.len() {
dest.patterns = self.patterns.clone();
}
@@ -325,7 +325,11 @@ impl MetadataCollection {
};
self.assign_order_to_attributes(attrs);
- self.name_to_meta.get_mut(name).expect("just added").macro_attributes = attrs.clone();
+ self.name_to_meta
+ .get_mut(name)
+ .expect("just added")
+ .macro_attributes
+ .clone_from(attrs);
order
}
diff --git a/gix-attributes/tests/fixtures/make_attributes_baseline.sh b/gix-attributes/tests/fixtures/make_attributes_baseline.sh
index ce48ebe1abe..47f109e971d 100755
--- a/gix-attributes/tests/fixtures/make_attributes_baseline.sh
+++ b/gix-attributes/tests/fixtures/make_attributes_baseline.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
mkdir basics;
diff --git a/gix-attributes/tests/search/mod.rs b/gix-attributes/tests/search/mod.rs
index 36e6286c8ed..6ce6f7b3d3d 100644
--- a/gix-attributes/tests/search/mod.rs
+++ b/gix-attributes/tests/search/mod.rs
@@ -307,11 +307,8 @@ mod baseline {
let mut buf = Vec::new();
let mut collection = MetadataCollection::default();
- let group = gix_attributes::Search::new_globals(
- &mut [base.join("user.attributes")].into_iter(),
- &mut buf,
- &mut collection,
- )?;
+ let group =
+ gix_attributes::Search::new_globals([base.join("user.attributes")].into_iter(), &mut buf, &mut collection)?;
Ok((group, collection, base, input))
}
diff --git a/gix-bitmap/CHANGELOG.md b/gix-bitmap/CHANGELOG.md
index a8236c4d264..291a2fe7d5b 100644
--- a/gix-bitmap/CHANGELOG.md
+++ b/gix-bitmap/CHANGELOG.md
@@ -5,22 +5,49 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.2.11 (2024-03-14)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 3 commits contributed to the release over the course of 4 calendar days.
+ - 75 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.3, gix-hash v0.14.1, gix-trace v0.1.6, gix-features v0.37.1, gix-actor v0.29.1, gix-validate v0.8.3, gix-object v0.40.1, gix-path v0.10.3, gix-glob v0.15.1, gix-quote v0.4.10, gix-attributes v0.21.1, gix-command v0.3.2, gix-packetline-blocking v0.17.2, gix-utils v0.1.8, gix-filter v0.8.1, gix-fs v0.9.1, gix-chunk v0.4.7, gix-commitgraph v0.23.1, gix-hashtable v0.5.1, gix-revwalk v0.11.1, gix-traverse v0.36.1, gix-worktree-stream v0.8.1, gix-archive v0.8.1, gix-config-value v0.14.3, gix-tempfile v12.0.1, gix-lock v12.0.1, gix-ref v0.40.1, gix-sec v0.10.3, gix-config v0.33.1, gix-prompt v0.8.2, gix-url v0.26.1, gix-credentials v0.23.1, gix-ignore v0.10.1, gix-bitmap v0.2.10, gix-index v0.28.1, gix-worktree v0.29.1, gix-diff v0.39.1, gix-discover v0.28.1, gix-macros v0.1.3, gix-mailmap v0.21.1, gix-negotiate v0.11.1, gix-pack v0.46.1, gix-odb v0.56.1, gix-pathspec v0.5.1, gix-packetline v0.17.2, gix-transport v0.40.1, gix-protocol v0.43.1, gix-revision v0.25.1, gix-refspec v0.21.1, gix-status v0.4.1, gix-submodule v0.7.1, gix-worktree-state v0.6.1, gix v0.57.1 ([`972241f`](https://github.com/Byron/gitoxide/commit/972241f1904944e8b6e84c6aa1649a49be7a85c3))
- Merge branch 'msrv' ([`8c492d7`](https://github.com/Byron/gitoxide/commit/8c492d7b7e6e5d520b1e3ffeb489eeb88266aa75))
- Change `rust-version` manifest field back to 1.65. ([`3bd09ef`](https://github.com/Byron/gitoxide/commit/3bd09ef120945a9669321ea856db4079a5dab930))
view details
+
+ * **Uncategorized**
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.3, gix-hash v0.14.1, gix-trace v0.1.6, gix-features v0.37.1, gix-actor v0.29.1, gix-validate v0.8.3, gix-object v0.40.1, gix-path v0.10.3, gix-glob v0.15.1, gix-quote v0.4.10, gix-attributes v0.21.1, gix-command v0.3.2, gix-packetline-blocking v0.17.2, gix-utils v0.1.8, gix-filter v0.8.1, gix-fs v0.9.1, gix-chunk v0.4.7, gix-commitgraph v0.23.1, gix-hashtable v0.5.1, gix-revwalk v0.11.1, gix-traverse v0.36.1, gix-worktree-stream v0.8.1, gix-archive v0.8.1, gix-config-value v0.14.3, gix-tempfile v12.0.1, gix-lock v12.0.1, gix-ref v0.40.1, gix-sec v0.10.3, gix-config v0.33.1, gix-prompt v0.8.2, gix-url v0.26.1, gix-credentials v0.23.1, gix-ignore v0.10.1, gix-bitmap v0.2.10, gix-index v0.28.1, gix-worktree v0.29.1, gix-diff v0.39.1, gix-discover v0.28.1, gix-macros v0.1.3, gix-mailmap v0.21.1, gix-negotiate v0.11.1, gix-pack v0.46.1, gix-odb v0.56.1, gix-pathspec v0.5.1, gix-packetline v0.17.2, gix-transport v0.40.1, gix-protocol v0.43.1, gix-revision v0.25.1, gix-refspec v0.21.1, gix-status v0.4.1, gix-submodule v0.7.1, gix-worktree-state v0.6.1, gix v0.57.1 ([`972241f`](https://github.com/Byron/gitoxide/commit/972241f1904944e8b6e84c6aa1649a49be7a85c3))
- Merge branch 'msrv' ([`8c492d7`](https://github.com/Byron/gitoxide/commit/8c492d7b7e6e5d520b1e3ffeb489eeb88266aa75))
- Change `rust-version` manifest field back to 1.65. ([`3bd09ef`](https://github.com/Byron/gitoxide/commit/3bd09ef120945a9669321ea856db4079a5dab930))
view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge pull request #1345 from EliahKagan/shell-scripts ([`fe24c89`](https://github.com/Byron/gitoxide/commit/fe24c89e326670deaa3aaa643276d612d866072e))
+ - Add missing +x bit on scripts that are run and not sourced ([`41bf65a`](https://github.com/Byron/gitoxide/commit/41bf65adef6f7d2cdd28fede262173ec7ba10822))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Merge pull request #1314 from avoidalone/main ([`5722e3a`](https://github.com/Byron/gitoxide/commit/5722e3aeeba5dd44e38a6cdbb70717a45345307e))
+ - Remove repetitive words ([`39879af`](https://github.com/Byron/gitoxide/commit/39879af6eaf2bf4fe159a5c6371c98d516c4febe))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
+
+ * **[#1312](https://github.com/Byron/gitoxide/issues/1312)**
+ - Assure memory maps are created with `MAP_PRIVATE` ([`88061a1`](https://github.com/Byron/gitoxide/commit/88061a176b2f4b5a377a4cff513979ddb1e306a1))
+ * **Uncategorized**
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Merge pull request #1314 from avoidalone/main ([`5722e3a`](https://github.com/Byron/gitoxide/commit/5722e3aeeba5dd44e38a6cdbb70717a45345307e))
+ - Remove repetitive words ([`39879af`](https://github.com/Byron/gitoxide/commit/39879af6eaf2bf4fe159a5c6371c98d516c4febe))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+ - Merge branch 'mmap-mode' ([`9e9b9fe`](https://github.com/Byron/gitoxide/commit/9e9b9fe6f63759d3bf479a8ec2f9dd1fbef87a08))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Merge branch 'dirwalk' ([`face359`](https://github.com/Byron/gitoxide/commit/face359443ba33e8985ec1525d5ec38b743ea7a9))
- Adjust gitignore files with precious declarations ([`ae86a6a`](https://github.com/Byron/gitoxide/commit/ae86a6a206074b85ff1eba32aea9c8b40c087b17))
diff --git a/gix-commitgraph/Cargo.toml b/gix-commitgraph/Cargo.toml
index c1ae1d57edc..f7db2fe6917 100644
--- a/gix-commitgraph/Cargo.toml
+++ b/gix-commitgraph/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-commitgraph"
-version = "0.24.1"
+version = "0.24.2"
repository = "https://github.com/Byron/gitoxide"
documentation = "https://git-scm.com/docs/commit-graph#:~:text=The%20commit-graph%20file%20is%20a%20supplemental%20data%20structure,or%20in%20the%20info%20directory%20of%20an%20alternate."
license = "MIT OR Apache-2.0"
@@ -18,9 +18,9 @@ doctest = false
serde = ["dep:serde", "gix-hash/serde", "bstr/serde"]
[dependencies]
-gix-features = { version = "^0.38.0", path = "../gix-features", features = ["rustsha1"] }
-gix-hash = { version = "^0.14.1", path = "../gix-hash" }
-gix-chunk = { version = "^0.4.7", path = "../gix-chunk" }
+gix-features = { version = "^0.38.1", path = "../gix-features", features = ["rustsha1"] }
+gix-hash = { version = "^0.14.2", path = "../gix-hash" }
+gix-chunk = { version = "^0.4.8", path = "../gix-chunk" }
bstr = { version = "1.3.0", default-features = false, features = ["std"] }
memmap2 = "0.9.0"
diff --git a/gix-commitgraph/src/file/access.rs b/gix-commitgraph/src/file/access.rs
index 57c75ae569c..6ccb98cc322 100644
--- a/gix-commitgraph/src/file/access.rs
+++ b/gix-commitgraph/src/file/access.rs
@@ -1,5 +1,4 @@
use std::{
- convert::TryInto,
fmt::{Debug, Formatter},
path::Path,
};
diff --git a/gix-commitgraph/src/file/commit.rs b/gix-commitgraph/src/file/commit.rs
index 14fe15e8413..db47cfcead9 100644
--- a/gix-commitgraph/src/file/commit.rs
+++ b/gix-commitgraph/src/file/commit.rs
@@ -1,6 +1,5 @@
//! Low-level operations on individual commits.
use std::{
- convert::TryInto,
fmt::{Debug, Formatter},
slice::Chunks,
};
diff --git a/gix-commitgraph/src/file/init.rs b/gix-commitgraph/src/file/init.rs
index 51c2739501f..47dc3616f80 100644
--- a/gix-commitgraph/src/file/init.rs
+++ b/gix-commitgraph/src/file/init.rs
@@ -1,11 +1,5 @@
+use std::path::Path;
use std::path::PathBuf;
-use std::{
- convert::{TryFrom, TryInto},
- path::Path,
-};
-
-use bstr::ByteSlice;
-use memmap2::Mmap;
use crate::{
file::{
@@ -14,6 +8,7 @@ use crate::{
},
File,
};
+use bstr::ByteSlice;
/// The error used in [`File::at()`].
#[derive(thiserror::Error, Debug)]
@@ -246,7 +241,7 @@ impl TryFrom<&Path> for File {
// SAFETY: we have to take the risk of somebody changing the file underneath. Git never writes into the same file.
#[allow(unsafe_code)]
unsafe {
- Mmap::map(&file)
+ memmap2::MmapOptions::new().map_copy_read_only(&file)
}
})
.map_err(|e| Error::Io {
diff --git a/gix-commitgraph/src/init.rs b/gix-commitgraph/src/init.rs
index 0b03ba9462d..a1f98f3d24a 100644
--- a/gix-commitgraph/src/init.rs
+++ b/gix-commitgraph/src/init.rs
@@ -1,5 +1,4 @@
use std::{
- convert::TryFrom,
io::{BufRead, BufReader},
path::{Path, PathBuf},
};
diff --git a/gix-commitgraph/src/lib.rs b/gix-commitgraph/src/lib.rs
index d9f4d36bf2f..5d60b9c2ed4 100644
--- a/gix-commitgraph/src/lib.rs
+++ b/gix-commitgraph/src/lib.rs
@@ -51,6 +51,7 @@ pub fn at(path: impl AsRef) -> Result {
mod access;
pub mod file;
///
+#[allow(clippy::empty_docs)]
pub mod init;
pub mod verify;
diff --git a/gix-commitgraph/src/verify.rs b/gix-commitgraph/src/verify.rs
index 56eb721e6e3..9a37cff83ad 100644
--- a/gix-commitgraph/src/verify.rs
+++ b/gix-commitgraph/src/verify.rs
@@ -2,7 +2,6 @@
use std::{
cmp::{max, min},
collections::BTreeMap,
- convert::TryInto,
path::PathBuf,
};
diff --git a/gix-commitgraph/tests/access/mod.rs b/gix-commitgraph/tests/access/mod.rs
index 12d7c2e6af5..914ef3af4ec 100644
--- a/gix-commitgraph/tests/access/mod.rs
+++ b/gix-commitgraph/tests/access/mod.rs
@@ -47,7 +47,7 @@ fn single_commit_future_64bit_dates_work() {
assert_eq!(
actual.committer_timestamp(),
info.time.seconds.try_into().expect("timestamps in bound"),
- "this is close the the highest representable value in the graph, like year 2500, so we are good for longer than I should care about"
+ "this is close the highest representable value in the graph, like year 2500, so we are good for longer than I should care about"
);
assert_eq!(actual.generation(), 1);
}
diff --git a/gix-commitgraph/tests/commitgraph.rs b/gix-commitgraph/tests/commitgraph.rs
index 94568fe5cfa..3444536ef8a 100644
--- a/gix-commitgraph/tests/commitgraph.rs
+++ b/gix-commitgraph/tests/commitgraph.rs
@@ -1,6 +1,5 @@
use std::{
collections::{HashMap, HashSet},
- convert::{TryFrom, TryInto},
hash::BuildHasher,
io::{BufRead, Cursor},
path::Path,
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/generation_number_overflow.tar.xz b/gix-commitgraph/tests/fixtures/generated-archives/generation_number_overflow.tar.xz
index 3ee3aa982c8..cdf5916afd8 100644
Binary files a/gix-commitgraph/tests/fixtures/generated-archives/generation_number_overflow.tar.xz and b/gix-commitgraph/tests/fixtures/generated-archives/generation_number_overflow.tar.xz differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/octopus_merges.tar.xz b/gix-commitgraph/tests/fixtures/generated-archives/octopus_merges.tar.xz
index a0642ff6c00..159d76d1dd2 100644
Binary files a/gix-commitgraph/tests/fixtures/generated-archives/octopus_merges.tar.xz and b/gix-commitgraph/tests/fixtures/generated-archives/octopus_merges.tar.xz differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/single_commit.tar.xz b/gix-commitgraph/tests/fixtures/generated-archives/single_commit.tar.xz
index 3245729f1f4..43986a0a812 100644
Binary files a/gix-commitgraph/tests/fixtures/generated-archives/single_commit.tar.xz and b/gix-commitgraph/tests/fixtures/generated-archives/single_commit.tar.xz differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/single_commit_huge_dates.tar.xz b/gix-commitgraph/tests/fixtures/generated-archives/single_commit_huge_dates.tar.xz
index 26a0f802867..95657e6f1a8 100644
Binary files a/gix-commitgraph/tests/fixtures/generated-archives/single_commit_huge_dates.tar.xz and b/gix-commitgraph/tests/fixtures/generated-archives/single_commit_huge_dates.tar.xz differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/single_parent.tar.xz b/gix-commitgraph/tests/fixtures/generated-archives/single_parent.tar.xz
index e9e0ee1a197..dbec6da6322 100644
Binary files a/gix-commitgraph/tests/fixtures/generated-archives/single_parent.tar.xz and b/gix-commitgraph/tests/fixtures/generated-archives/single_parent.tar.xz differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/two_parents.tar.xz b/gix-commitgraph/tests/fixtures/generated-archives/two_parents.tar.xz
index 20fc6202c16..98f7748f120 100644
Binary files a/gix-commitgraph/tests/fixtures/generated-archives/two_parents.tar.xz and b/gix-commitgraph/tests/fixtures/generated-archives/two_parents.tar.xz differ
diff --git a/gix-commitgraph/tests/fixtures/generation_number_overflow.sh b/gix-commitgraph/tests/fixtures/generation_number_overflow.sh
index 2592c92d4c9..1bbe2dfdf31 100755
--- a/gix-commitgraph/tests/fixtures/generation_number_overflow.sh
+++ b/gix-commitgraph/tests/fixtures/generation_number_overflow.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
function tick () {
diff --git a/gix-commitgraph/tests/fixtures/octopus_merges.sh b/gix-commitgraph/tests/fixtures/octopus_merges.sh
index 812dfbc7e92..89106361158 100755
--- a/gix-commitgraph/tests/fixtures/octopus_merges.sh
+++ b/gix-commitgraph/tests/fixtures/octopus_merges.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-commitgraph/tests/fixtures/single_commit.sh b/gix-commitgraph/tests/fixtures/single_commit.sh
index 0f450431098..227453b2cd0 100755
--- a/gix-commitgraph/tests/fixtures/single_commit.sh
+++ b/gix-commitgraph/tests/fixtures/single_commit.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
# The goal with this repo is to have the smallest commit-graph file possible, in the hopes that an
diff --git a/gix-commitgraph/tests/fixtures/single_commit_huge_dates.sh b/gix-commitgraph/tests/fixtures/single_commit_huge_dates.sh
index 19ffba26770..28fe6f47f4a 100755
--- a/gix-commitgraph/tests/fixtures/single_commit_huge_dates.sh
+++ b/gix-commitgraph/tests/fixtures/single_commit_huge_dates.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
function setup_repo() {
diff --git a/gix-commitgraph/tests/fixtures/single_parent.sh b/gix-commitgraph/tests/fixtures/single_parent.sh
index 67cf24012f7..5395bb6376a 100755
--- a/gix-commitgraph/tests/fixtures/single_parent.sh
+++ b/gix-commitgraph/tests/fixtures/single_parent.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-commitgraph/tests/fixtures/split_chain.sh b/gix-commitgraph/tests/fixtures/split_chain.sh
index 284f4fc7eb9..4316d5045f0 100755
--- a/gix-commitgraph/tests/fixtures/split_chain.sh
+++ b/gix-commitgraph/tests/fixtures/split_chain.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-commitgraph/tests/fixtures/two_parents.sh b/gix-commitgraph/tests/fixtures/two_parents.sh
index ba4a8174365..aa2fd7dbe92 100755
--- a/gix-commitgraph/tests/fixtures/two_parents.sh
+++ b/gix-commitgraph/tests/fixtures/two_parents.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-config-value/CHANGELOG.md b/gix-config-value/CHANGELOG.md
index 5ee5eb3be87..9499020c402 100644
--- a/gix-config-value/CHANGELOG.md
+++ b/gix-config-value/CHANGELOG.md
@@ -5,6 +5,31 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.14.6 (2024-03-14)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 3 commits contributed to the release over the course of 4 calendar days.
+ - 18 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Merge branch 'dirwalk' ([`face359`](https://github.com/Byron/gitoxide/commit/face359443ba33e8985ec1525d5ec38b743ea7a9))
- Adjust gitignore files with precious declarations ([`ae86a6a`](https://github.com/Byron/gitoxide/commit/ae86a6a206074b85ff1eba32aea9c8b40c087b17))
diff --git a/gix-config-value/Cargo.toml b/gix-config-value/Cargo.toml
index d92c87a8c39..78aaa2d7b88 100644
--- a/gix-config-value/Cargo.toml
+++ b/gix-config-value/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-config-value"
-version = "0.14.5"
+version = "0.14.6"
repository = "https://github.com/Byron/gitoxide"
license = "MIT OR Apache-2.0"
description = "A crate of the gitoxide project providing git-config value parsing"
@@ -17,7 +17,7 @@ doctest = false
serde = ["dep:serde", "bstr/serde"]
[dependencies]
-gix-path = { version = "^0.10.6", path = "../gix-path" }
+gix-path = { version = "^0.10.7", path = "../gix-path" }
thiserror = "1.0.32"
bstr = { version = "1.0.1", default-features = false, features = ["std"] }
diff --git a/gix-config-value/src/boolean.rs b/gix-config-value/src/boolean.rs
index 908e11a300a..ff146e7f17c 100644
--- a/gix-config-value/src/boolean.rs
+++ b/gix-config-value/src/boolean.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, convert::TryFrom, ffi::OsString, fmt::Display};
+use std::{borrow::Cow, ffi::OsString, fmt::Display};
use bstr::{BStr, BString, ByteSlice};
diff --git a/gix-config-value/src/color.rs b/gix-config-value/src/color.rs
index 5cc0b997f40..884a346d37a 100644
--- a/gix-config-value/src/color.rs
+++ b/gix-config-value/src/color.rs
@@ -1,5 +1,5 @@
#![allow(missing_docs)]
-use std::{borrow::Cow, convert::TryFrom, fmt::Display, str::FromStr};
+use std::{borrow::Cow, fmt::Display, str::FromStr};
use bstr::{BStr, BString};
diff --git a/gix-config-value/src/integer.rs b/gix-config-value/src/integer.rs
index 4286a83b5be..4864b4b3e41 100644
--- a/gix-config-value/src/integer.rs
+++ b/gix-config-value/src/integer.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, convert::TryFrom, fmt::Display, str::FromStr};
+use std::{borrow::Cow, fmt::Display, str::FromStr};
use bstr::{BStr, BString};
diff --git a/gix-config-value/src/lib.rs b/gix-config-value/src/lib.rs
index b3be069e328..7dd7e89c9e1 100644
--- a/gix-config-value/src/lib.rs
+++ b/gix-config-value/src/lib.rs
@@ -37,10 +37,13 @@ impl Error {
mod boolean;
///
+#[allow(clippy::empty_docs)]
pub mod color;
///
+#[allow(clippy::empty_docs)]
pub mod integer;
///
+#[allow(clippy::empty_docs)]
pub mod path;
mod types;
diff --git a/gix-config-value/src/path.rs b/gix-config-value/src/path.rs
index 58b5970eecd..23550f7cb16 100644
--- a/gix-config-value/src/path.rs
+++ b/gix-config-value/src/path.rs
@@ -5,6 +5,7 @@ use bstr::BStr;
use crate::Path;
///
+#[allow(clippy::empty_docs)]
pub mod interpolate {
use std::path::PathBuf;
diff --git a/gix-config-value/tests/value/boolean.rs b/gix-config-value/tests/value/boolean.rs
index 8fe8b43f0d4..7af370c8c97 100644
--- a/gix-config-value/tests/value/boolean.rs
+++ b/gix-config-value/tests/value/boolean.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
use gix_config_value::Boolean;
use crate::b;
diff --git a/gix-config-value/tests/value/color.rs b/gix-config-value/tests/value/color.rs
index 18baaba4c92..7ff5b2bd649 100644
--- a/gix-config-value/tests/value/color.rs
+++ b/gix-config-value/tests/value/color.rs
@@ -110,8 +110,6 @@ mod attribute {
}
mod from_git {
- use std::convert::TryFrom;
-
use bstr::BStr;
use gix_config_value::Color;
diff --git a/gix-config-value/tests/value/integer.rs b/gix-config-value/tests/value/integer.rs
index 8a5d8016021..6caa7f3492e 100644
--- a/gix-config-value/tests/value/integer.rs
+++ b/gix-config-value/tests/value/integer.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
use gix_config_value::{integer::Suffix, Integer};
use crate::b;
diff --git a/gix-config/CHANGELOG.md b/gix-config/CHANGELOG.md
index e77fe7a87bc..8ab8dc04880 100644
--- a/gix-config/CHANGELOG.md
+++ b/gix-config/CHANGELOG.md
@@ -5,6 +5,100 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.37.0 (2024-05-22)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 5 commits contributed to the release over the course of 8 calendar days.
+ - 38 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge branch 'various-fixes' ([`d6cd449`](https://github.com/Byron/gitoxide/commit/d6cd44930fb204b06e2b70fc6965e7705530c47a))
+ - Update dependencies ([`cd4de83`](https://github.com/Byron/gitoxide/commit/cd4de8327fc195eb862ab6e138f2315a87374f85))
+ - Merge branch 'status' ([`04ef31e`](https://github.com/Byron/gitoxide/commit/04ef31e9d6f5332d49037a5a4c248ebbb5aaf92b))
+ - Adapt to changes in `gix-pack` ([`bad5b48`](https://github.com/Byron/gitoxide/commit/bad5b48e4f0d865b0b0937f136d9a0041aa88046))
+view details
+
+ * **Uncategorized**
+ - Release gix-trace v0.1.9, gix-utils v0.1.12, gix-packetline-blocking v0.17.4, gix-filter v0.11.1, gix-fs v0.10.2, gix-traverse v0.39.0, gix-worktree-stream v0.12.0, gix-archive v0.12.0, gix-config v0.36.1, gix-url v0.27.3, gix-index v0.32.0, gix-worktree v0.33.0, gix-diff v0.43.0, gix-pathspec v0.7.3, gix-dir v0.4.0, gix-pack v0.50.0, gix-odb v0.60.0, gix-transport v0.42.0, gix-protocol v0.45.0, gix-status v0.9.0, gix-worktree-state v0.10.0, gix v0.62.0, gix-fsck v0.4.0, gitoxide-core v0.37.0, gitoxide v0.35.0, safety bump 14 crates ([`095c673`](https://github.com/Byron/gitoxide/commit/095c6739b2722a8b9af90776b435ef2da454c0e6))
+ - Prepare changelogs prior to release ([`5755271`](https://github.com/Byron/gitoxide/commit/57552717f46f96c35ba4ddc0a64434354ef845e9))
+ - Merge pull request #1341 from szepeviktor/typos ([`55f379b`](https://github.com/Byron/gitoxide/commit/55f379bc47065822d078393d83d30c0835a89782))
+ - Fix typos ([`f72ecce`](https://github.com/Byron/gitoxide/commit/f72ecce45babcad2a0c9b73c79d01ff502907a57))
+ - Merge branch 'add-topo-walk' ([`b590a9d`](https://github.com/Byron/gitoxide/commit/b590a9d2b6a273f76f0320d2b9fe1f679c08f549))
+ - Thanks clippy ([`7f6bee5`](https://github.com/Byron/gitoxide/commit/7f6bee5452ee01638f89a0cec2d4ee2a6f0d0136))
+ - Merge branch 'status' ([`45edd2e`](https://github.com/Byron/gitoxide/commit/45edd2ea66035adf526cb2f617873dcba60a2a9a))
+ - Merge pull request #1337 from blinxen/main ([`52efa90`](https://github.com/Byron/gitoxide/commit/52efa90a2570e55aa266f0b6911a4c1dfcdd0f72))
+ - [gix-config] Run parse::tests::section::size_of_events only on 64 bit architectures ([`0ce06a6`](https://github.com/Byron/gitoxide/commit/0ce06a696d738fdfc151a0ff1ad6e41130ebddd5))
+ - Display path of included configuration file that couldn't be opened. ([`a5168aa`](https://github.com/Byron/gitoxide/commit/a5168aae699dca825cc0c33c0044f5465f20b02e))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Merge pull request #1290 from epage/winnow ([`a663e9f`](https://github.com/Byron/gitoxide/commit/a663e9fcdb5a3aedc9200da77ebae17d5c3e7135))
- Update winnow to 0.6 ([`e175b20`](https://github.com/Byron/gitoxide/commit/e175b20d431faa6859fbcc52f78400e50f91cad1))
@@ -3006,9 +3101,93 @@ This is a maintenance release without functional changes.
- `len`
- `from_env`
- `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
+ - `len`
+ - `from_env`
+ - `open`
- `len`
- `from_env`
- `open`
+- `len`
+- `from_env`
+- `open`
+- `len`
+- `from_env`
+- `open`
+- `len`
+- `from_env`
+- `open`
+- `len`
+- `from_env`
+- `open`
+- `len`
+- `from_env`
+- `open`
+- `len`
+- `from_env`
+- `open`
+- `len`
+- `from_env`
+- `open`
+- `len`
+- `from_env`
+- `open`
+- `len`
+- `from_env`
+- `open`
+- `len`
+- `from_env`
+- `open`
+- `len`
+- `from_env`
+- `open`
+- `len`
+- `from_env`
+- `open`
### Changed
@@ -3021,7 +3200,7 @@ This is a maintenance release without functional changes.
- _None._
-lenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopen
+lenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopenlenfrom_envopen
## v0.1.1 (2021-05-09)
diff --git a/gix-config/Cargo.toml b/gix-config/Cargo.toml
index 1695bd503ff..e3df00b99eb 100644
--- a/gix-config/Cargo.toml
+++ b/gix-config/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-config"
-version = "0.35.0"
+version = "0.37.0"
repository = "https://github.com/Byron/gitoxide"
description = "A git-config file parser and editor from the gitoxide project"
license = "MIT OR Apache-2.0"
@@ -17,12 +17,12 @@ autotests = false
serde = ["dep:serde", "bstr/serde", "gix-sec/serde", "gix-ref/serde", "gix-glob/serde", "gix-config-value/serde"]
[dependencies]
-gix-features = { version = "^0.38.0", path = "../gix-features"}
-gix-config-value = { version = "^0.14.5", path = "../gix-config-value" }
-gix-path = { version = "^0.10.6", path = "../gix-path" }
-gix-sec = { version = "^0.10.5", path = "../gix-sec" }
-gix-ref = { version = "^0.42.0", path = "../gix-ref" }
-gix-glob = { version = "^0.16.1", path = "../gix-glob" }
+gix-features = { version = "^0.38.2", path = "../gix-features"}
+gix-config-value = { version = "^0.14.6", path = "../gix-config-value" }
+gix-path = { version = "^0.10.7", path = "../gix-path" }
+gix-sec = { version = "^0.10.6", path = "../gix-sec" }
+gix-ref = { version = "^0.44.1", path = "../gix-ref" }
+gix-glob = { version = "^0.16.3", path = "../gix-glob" }
winnow = { version = "0.6.0", features = ["simd"] }
memchr = "2"
diff --git a/gix-config/benches/large_config_file.rs b/gix-config/benches/large_config_file.rs
index 51f6e1fd86b..ff42afb6f1c 100644
--- a/gix-config/benches/large_config_file.rs
+++ b/gix-config/benches/large_config_file.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
use criterion::{black_box, criterion_group, criterion_main, Criterion};
use gix_config::{parse::Events, File};
diff --git a/gix-config/src/file/access/comfort.rs b/gix-config/src/file/access/comfort.rs
index 588188608d6..c2a221a4028 100644
--- a/gix-config/src/file/access/comfort.rs
+++ b/gix-config/src/file/access/comfort.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, convert::TryFrom};
+use std::borrow::Cow;
use bstr::BStr;
diff --git a/gix-config/src/file/access/raw.rs b/gix-config/src/file/access/raw.rs
index 1be5efe724b..26aaae39691 100644
--- a/gix-config/src/file/access/raw.rs
+++ b/gix-config/src/file/access/raw.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, collections::HashMap, convert::TryInto};
+use std::{borrow::Cow, collections::HashMap};
use bstr::BStr;
use smallvec::ToSmallVec;
diff --git a/gix-config/src/file/access/read_only.rs b/gix-config/src/file/access/read_only.rs
index 15ed33ad491..96020a681ca 100644
--- a/gix-config/src/file/access/read_only.rs
+++ b/gix-config/src/file/access/read_only.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, convert::TryFrom};
+use std::borrow::Cow;
use bstr::{BStr, ByteSlice};
use gix_features::threading::OwnShared;
diff --git a/gix-config/src/file/impls.rs b/gix-config/src/file/impls.rs
index c26df5fb81a..d6ac2b76a8f 100644
--- a/gix-config/src/file/impls.rs
+++ b/gix-config/src/file/impls.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, convert::TryFrom, fmt::Display, str::FromStr};
+use std::{borrow::Cow, fmt::Display, str::FromStr};
use bstr::{BStr, BString, ByteVec};
@@ -42,7 +42,7 @@ impl<'a> TryFrom<&'a BStr> for File<'a> {
impl From> for BString {
fn from(c: File<'_>) -> Self {
- c.into()
+ c.to_bstring()
}
}
diff --git a/gix-config/src/file/includes/mod.rs b/gix-config/src/file/includes/mod.rs
index 8fd92725fba..98a68482558 100644
--- a/gix-config/src/file/includes/mod.rs
+++ b/gix-config/src/file/includes/mod.rs
@@ -99,7 +99,14 @@ fn append_followed_includes_recursively(
}
buf.clear();
- std::io::copy(&mut std::fs::File::open(&config_path)?, buf)?;
+ std::io::copy(
+ &mut std::fs::File::open(&config_path).map_err(|err| Error::Io {
+ source: err,
+ path: config_path.to_owned(),
+ })?,
+ buf,
+ )
+ .map_err(Error::CopyBuffer)?;
let config_meta = Metadata {
path: Some(config_path),
trust: meta.trust,
diff --git a/gix-config/src/file/includes/types.rs b/gix-config/src/file/includes/types.rs
index 64306bd9ca0..85e3a35db89 100644
--- a/gix-config/src/file/includes/types.rs
+++ b/gix-config/src/file/includes/types.rs
@@ -1,11 +1,14 @@
use crate::{parse, path::interpolate};
+use std::path::PathBuf;
/// The error returned when following includes.
#[derive(Debug, thiserror::Error)]
#[allow(missing_docs)]
pub enum Error {
- #[error(transparent)]
- Io(#[from] std::io::Error),
+ #[error("Failed to copy configuration file into buffer")]
+ CopyBuffer(#[source] std::io::Error),
+ #[error("Could not read included configuration file at '{}'", path.display())]
+ Io { path: PathBuf, source: std::io::Error },
#[error(transparent)]
Parse(#[from] parse::Error),
#[error(transparent)]
@@ -115,6 +118,7 @@ impl Default for Options<'_> {
}
///
+#[allow(clippy::empty_docs)]
pub mod conditional {
/// Options to handle conditional includes like `includeIf..path`.
#[derive(Clone, Copy, Default)]
diff --git a/gix-config/src/file/init/comfort.rs b/gix-config/src/file/init/comfort.rs
index 904dde9f74d..235a02d61d8 100644
--- a/gix-config/src/file/init/comfort.rs
+++ b/gix-config/src/file/init/comfort.rs
@@ -141,6 +141,7 @@ impl File<'static> {
}
///
+#[allow(clippy::empty_docs)]
pub mod from_git_dir {
use crate::file::init;
diff --git a/gix-config/src/file/init/mod.rs b/gix-config/src/file/init/mod.rs
index 90fa70cbcf9..1076011fcc6 100644
--- a/gix-config/src/file/init/mod.rs
+++ b/gix-config/src/file/init/mod.rs
@@ -10,8 +10,10 @@ pub use types::{Error, Options};
mod comfort;
///
+#[allow(clippy::empty_docs)]
pub mod from_env;
///
+#[allow(clippy::empty_docs)]
pub mod from_paths;
impl<'a> File<'a> {
diff --git a/gix-config/src/file/mod.rs b/gix-config/src/file/mod.rs
index e99c6eb94d9..8611ad0c7e1 100644
--- a/gix-config/src/file/mod.rs
+++ b/gix-config/src/file/mod.rs
@@ -13,19 +13,23 @@ mod mutable;
pub use mutable::{multi_value::MultiValueMut, section::SectionMut, value::ValueMut};
///
+#[allow(clippy::empty_docs)]
pub mod init;
mod access;
mod impls;
///
+#[allow(clippy::empty_docs)]
pub mod includes;
mod meta;
mod util;
///
+#[allow(clippy::empty_docs)]
pub mod section;
///
+#[allow(clippy::empty_docs)]
pub mod rename_section {
/// The error returned by [`File::rename_section(…)`][crate::File::rename_section()].
#[derive(Debug, thiserror::Error)]
@@ -39,6 +43,7 @@ pub mod rename_section {
}
///
+#[allow(clippy::empty_docs)]
pub mod set_raw_value {
/// The error returned by [`File::set_raw_value(…)`][crate::File::set_raw_value()].
#[derive(Debug, thiserror::Error)]
diff --git a/gix-config/src/file/section/mod.rs b/gix-config/src/file/section/mod.rs
index f07a145e3d4..1dd4bd15ad3 100644
--- a/gix-config/src/file/section/mod.rs
+++ b/gix-config/src/file/section/mod.rs
@@ -75,7 +75,7 @@ impl<'a> Section<'a> {
/// Stream ourselves to the given `out`, in order to reproduce this section mostly losslessly
/// as it was parsed.
pub fn write_to(&self, mut out: &mut dyn std::io::Write) -> std::io::Result<()> {
- self.header.write_to(&mut out)?;
+ self.header.write_to(&mut *out)?;
if self.body.0.is_empty() {
return Ok(());
diff --git a/gix-config/src/file/tests.rs b/gix-config/src/file/tests.rs
index 58f16ec1547..adb11e5a291 100644
--- a/gix-config/src/file/tests.rs
+++ b/gix-config/src/file/tests.rs
@@ -6,7 +6,7 @@ use crate::{
};
mod try_from {
- use std::{borrow::Cow, collections::HashMap, convert::TryFrom};
+ use std::{borrow::Cow, collections::HashMap};
use super::{bodies, headers};
use crate::{
diff --git a/gix-config/src/file/util.rs b/gix-config/src/file/util.rs
index 5c60f1fd5a0..78bc4736f63 100644
--- a/gix-config/src/file/util.rs
+++ b/gix-config/src/file/util.rs
@@ -118,8 +118,7 @@ impl<'event> File<'event> {
&'a self,
section_name: &'a str,
subsection_name: Option<&BStr>,
- ) -> Result + ExactSizeIterator + DoubleEndedIterator + '_, lookup::existing::Error>
- {
+ ) -> Result + DoubleEndedIterator + '_, lookup::existing::Error> {
let section_name = section::Name::from_str_unchecked(section_name);
let section_ids = self
.section_lookup_tree
diff --git a/gix-config/src/file/write.rs b/gix-config/src/file/write.rs
index 772054f9529..f08f5db57a4 100644
--- a/gix-config/src/file/write.rs
+++ b/gix-config/src/file/write.rs
@@ -18,7 +18,7 @@ impl File<'_> {
pub fn write_to_filter(
&self,
mut out: &mut dyn std::io::Write,
- mut filter: &mut dyn FnMut(&Section<'_>) -> bool,
+ filter: &mut dyn FnMut(&Section<'_>) -> bool,
) -> std::io::Result<()> {
let nl = self.detect_newline_style();
@@ -27,7 +27,8 @@ impl File<'_> {
event.write_to(&mut out)?;
}
- if !ends_with_newline(self.frontmatter_events.as_ref(), nl, true) && self.sections.values().any(&mut filter)
+ if !ends_with_newline(self.frontmatter_events.as_ref(), nl, true)
+ && self.sections.values().any(&mut *filter)
{
out.write_all(nl)?;
}
diff --git a/gix-config/src/lib.rs b/gix-config/src/lib.rs
index a51f6ec0ba1..76c485d0650 100644
--- a/gix-config/src/lib.rs
+++ b/gix-config/src/lib.rs
@@ -40,9 +40,11 @@
pub mod file;
///
+#[allow(clippy::empty_docs)]
pub mod lookup;
pub mod parse;
///
+#[allow(clippy::empty_docs)]
pub mod value;
pub use gix_config_value::{color, integer, path, Boolean, Color, Integer, Path};
@@ -52,6 +54,7 @@ pub use traits::Key;
mod types;
pub use types::{File, Source};
///
+#[allow(clippy::empty_docs)]
pub mod source;
#[cfg(test)]
diff --git a/gix-config/src/lookup.rs b/gix-config/src/lookup.rs
index 7814978125d..25d8d9d1751 100644
--- a/gix-config/src/lookup.rs
+++ b/gix-config/src/lookup.rs
@@ -9,6 +9,7 @@ pub enum Error {
}
///
+#[allow(clippy::empty_docs)]
pub mod existing {
/// The error when looking up a value that doesn't exist, for example via [`File::value()`][crate::File::value()].
#[derive(Debug, thiserror::Error)]
diff --git a/gix-config/src/parse/comment.rs b/gix-config/src/parse/comment.rs
index 6d4bb15ffb5..6d7ec145b65 100644
--- a/gix-config/src/parse/comment.rs
+++ b/gix-config/src/parse/comment.rs
@@ -39,7 +39,7 @@ impl Display for Comment<'_> {
impl From> for BString {
fn from(c: Comment<'_>) -> Self {
- c.into()
+ c.to_bstring()
}
}
diff --git a/gix-config/src/parse/event.rs b/gix-config/src/parse/event.rs
index f528e2077d6..653a0c67751 100644
--- a/gix-config/src/parse/event.rs
+++ b/gix-config/src/parse/event.rs
@@ -33,7 +33,7 @@ impl Event<'_> {
/// Stream ourselves to the given `out`, in order to reproduce this event mostly losslessly
/// as it was parsed.
- pub fn write_to(&self, mut out: &mut dyn std::io::Write) -> std::io::Result<()> {
+ pub fn write_to(&self, out: &mut dyn std::io::Write) -> std::io::Result<()> {
match self {
Self::ValueNotDone(e) => {
out.write_all(e.as_ref())?;
@@ -42,8 +42,8 @@ impl Event<'_> {
Self::Whitespace(e) | Self::Newline(e) | Self::Value(e) | Self::ValueDone(e) => out.write_all(e.as_ref()),
Self::KeyValueSeparator => out.write_all(b"="),
Self::SectionKey(k) => out.write_all(k.0.as_ref()),
- Self::SectionHeader(h) => h.write_to(&mut out),
- Self::Comment(c) => c.write_to(&mut out),
+ Self::SectionHeader(h) => h.write_to(out),
+ Self::Comment(c) => c.write_to(out),
}
}
@@ -72,7 +72,7 @@ impl Display for Event<'_> {
impl From> for BString {
fn from(event: Event<'_>) -> Self {
- event.into()
+ event.to_bstring()
}
}
diff --git a/gix-config/src/parse/events.rs b/gix-config/src/parse/events.rs
index d742bafe04c..feda7a7ca6c 100644
--- a/gix-config/src/parse/events.rs
+++ b/gix-config/src/parse/events.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
use smallvec::SmallVec;
use crate::{
@@ -30,26 +28,26 @@ pub type FrontMatterEvents<'a> = SmallVec<[Event<'a>; 8]>;
///
/// For concrete examples, some notable differences are:
/// - `git-config` sections permit subsections via either a quoted string
-/// (`[some-section "subsection"]`) or via the deprecated dot notation
-/// (`[some-section.subsection]`). Successful parsing these section names is not
-/// well defined in typical `.ini` parsers. This parser will handle these cases
-/// perfectly.
+/// (`[some-section "subsection"]`) or via the deprecated dot notation
+/// (`[some-section.subsection]`). Successful parsing these section names is not
+/// well defined in typical `.ini` parsers. This parser will handle these cases
+/// perfectly.
/// - Comment markers are not strictly defined either. This parser will always
-/// and only handle a semicolon or octothorpe (also known as a hash or number
-/// sign).
+/// and only handle a semicolon or octothorpe (also known as a hash or number
+/// sign).
/// - Global properties may be allowed in `.ini` parsers, but is strictly
-/// disallowed by this parser.
+/// disallowed by this parser.
/// - Only `\t`, `\n`, `\b` `\\` are valid escape characters.
/// - Quoted and semi-quoted values will be parsed (but quotes will be included
-/// in event outputs). An example of a semi-quoted value is `5"hello world"`,
-/// which should be interpreted as `5hello world` after
-/// [normalization][crate::value::normalize()].
+/// in event outputs). An example of a semi-quoted value is `5"hello world"`,
+/// which should be interpreted as `5hello world` after
+/// [normalization][crate::value::normalize()].
/// - Line continuations via a `\` character is supported (inside or outside of quotes)
/// - Whitespace handling similarly follows the `git-config` specification as
-/// closely as possible, where excess whitespace after a non-quoted value are
-/// trimmed, and line continuations onto a new line with excess spaces are kept.
+/// closely as possible, where excess whitespace after a non-quoted value are
+/// trimmed, and line continuations onto a new line with excess spaces are kept.
/// - Only equal signs (optionally padded by spaces) are valid name/value
-/// delimiters.
+/// delimiters.
///
/// Note that things such as case-sensitivity or duplicate sections are
/// _not_ handled. This parser is a low level _syntactic_ interpreter
@@ -64,8 +62,8 @@ pub type FrontMatterEvents<'a> = SmallVec<[Event<'a>; 8]>;
/// # Trait Implementations
///
/// - This struct does _not_ implement [`FromStr`] due to lifetime
-/// constraints implied on the required `from_str` method. Instead, it provides
-/// [`From<&'_ str>`].
+/// constraints implied on the required `from_str` method. Instead, it provides
+/// [`From<&'_ str>`].
///
/// # Idioms
///
diff --git a/gix-config/src/parse/mod.rs b/gix-config/src/parse/mod.rs
index 5127c9b6f44..3f30ad7f078 100644
--- a/gix-config/src/parse/mod.rs
+++ b/gix-config/src/parse/mod.rs
@@ -23,6 +23,7 @@ pub use events_type::{Events, FrontMatterEvents};
mod comment;
mod error;
///
+#[allow(clippy::empty_docs)]
pub mod section;
#[cfg(test)]
diff --git a/gix-config/src/parse/nom/mod.rs b/gix-config/src/parse/nom/mod.rs
index 4e8670d0209..adbeb4ab860 100644
--- a/gix-config/src/parse/nom/mod.rs
+++ b/gix-config/src/parse/nom/mod.rs
@@ -190,10 +190,10 @@ fn subsection_unescaped<'i>(i: &mut &'i [u8]) -> PResult<&'i [u8], NomError<&'i
}
fn subsection_escaped_char<'i>(i: &mut &'i [u8]) -> PResult<&'i [u8], NomError<&'i [u8]>> {
- preceded('\\', one_of(is_subsection_escapeable_char).recognize()).parse_next(i)
+ preceded('\\', one_of(is_subsection_escapable_char).recognize()).parse_next(i)
}
-fn is_subsection_escapeable_char(c: u8) -> bool {
+fn is_subsection_escapable_char(c: u8) -> bool {
c != b'\n'
}
diff --git a/gix-config/src/parse/section/header.rs b/gix-config/src/parse/section/header.rs
index ad1288f3fe0..5f4e382c90a 100644
--- a/gix-config/src/parse/section/header.rs
+++ b/gix-config/src/parse/section/header.rs
@@ -145,7 +145,7 @@ impl Display for Header<'_> {
impl From> for BString {
fn from(header: Header<'_>) -> Self {
- header.into()
+ header.to_bstring()
}
}
diff --git a/gix-config/src/parse/section/mod.rs b/gix-config/src/parse/section/mod.rs
index fade4fa147f..5c4489ea670 100644
--- a/gix-config/src/parse/section/mod.rs
+++ b/gix-config/src/parse/section/mod.rs
@@ -5,6 +5,7 @@ use bstr::BStr;
use crate::parse::{Event, Section};
///
+#[allow(clippy::empty_docs)]
pub mod header;
pub(crate) mod unvalidated;
@@ -48,6 +49,7 @@ mod types {
macro_rules! generate_case_insensitive {
($name:ident, $module:ident, $err_doc:literal, $validate:ident, $cow_inner_type:ty, $comment:literal) => {
///
+ #[allow(clippy::empty_docs)]
pub mod $module {
/// The error returned when `TryFrom` is invoked to create an instance.
#[derive(Debug, thiserror::Error, Copy, Clone)]
diff --git a/gix-config/src/parse/tests.rs b/gix-config/src/parse/tests.rs
index edb5dee6ee3..e2fa8b3bb83 100644
--- a/gix-config/src/parse/tests.rs
+++ b/gix-config/src/parse/tests.rs
@@ -5,6 +5,7 @@ mod section {
use std::borrow::Cow;
#[test]
+ #[cfg(target_pointer_width = "64")]
fn size_of_events() {
assert_eq!(
std::mem::size_of::>(),
@@ -109,7 +110,7 @@ pub(crate) mod util {
//! This module is only included for tests, and contains common unit test helper
//! functions.
- use std::{borrow::Cow, convert::TryFrom};
+ use std::borrow::Cow;
use crate::parse::{section, Comment, Event};
diff --git a/gix-config/tests/Cargo.toml b/gix-config/tests/Cargo.toml
index 992589ad820..0448769115c 100644
--- a/gix-config/tests/Cargo.toml
+++ b/gix-config/tests/Cargo.toml
@@ -19,13 +19,13 @@ name = "mem"
path = "mem.rs"
[dev-dependencies]
-gix-config = { path = ".."}
-gix-testtools = { path = "../../tests/tools"}
+gix-config = { path = ".." }
+gix-testtools = { path = "../../tests/tools" }
gix = { path = "../../gix", default-features = false }
gix-ref = { path = "../../gix-ref" }
gix-path = { path = "../../gix-path" }
gix-sec = { path = "../../gix-sec" }
-serial_test = { version = "2.0.0", default-features = false }
+serial_test = { version = "3.1.0", default-features = false }
bstr = { version = "1.3.0", default-features = false, features = ["std"] }
bytesize = "1.3.0"
diff --git a/gix-config/tests/file/access/mutate.rs b/gix-config/tests/file/access/mutate.rs
index 0788a3a31a4..48826593f6c 100644
--- a/gix-config/tests/file/access/mutate.rs
+++ b/gix-config/tests/file/access/mutate.rs
@@ -1,6 +1,4 @@
mod remove_section {
- use std::convert::TryFrom;
-
#[test]
fn removal_of_all_sections_programmatically_with_sections_and_ids_by_name() {
let mut file = gix_config::File::try_from("[core] \na = b\nb=c\n\n[core \"name\"]\nd = 1\ne = 2").unwrap();
@@ -47,7 +45,7 @@ mod remove_section {
}
}
mod rename_section {
- use std::{borrow::Cow, convert::TryFrom};
+ use std::borrow::Cow;
use gix_config::{file::rename_section, parse::section};
diff --git a/gix-config/tests/file/access/raw/raw_multi_value.rs b/gix-config/tests/file/access/raw/raw_multi_value.rs
index ffdd955e82f..a0f1015a13e 100644
--- a/gix-config/tests/file/access/raw/raw_multi_value.rs
+++ b/gix-config/tests/file/access/raw/raw_multi_value.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
use gix_config::{lookup, File};
use crate::file::cow_str;
diff --git a/gix-config/tests/file/access/raw/raw_value.rs b/gix-config/tests/file/access/raw/raw_value.rs
index 371df391ef1..2501de6db39 100644
--- a/gix-config/tests/file/access/raw/raw_value.rs
+++ b/gix-config/tests/file/access/raw/raw_value.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
use gix_config::{lookup, File};
#[test]
diff --git a/gix-config/tests/file/access/read_only.rs b/gix-config/tests/file/access/read_only.rs
index 2fd71a5e6c0..2d8d9d0fd3b 100644
--- a/gix-config/tests/file/access/read_only.rs
+++ b/gix-config/tests/file/access/read_only.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, convert::TryFrom};
+use std::borrow::Cow;
use bstr::BStr;
use gix_config::{
diff --git a/gix-config/tests/file/impls/mod.rs b/gix-config/tests/file/impls/mod.rs
index 885f326e1bb..5247d2ea7a2 100644
--- a/gix-config/tests/file/impls/mod.rs
+++ b/gix-config/tests/file/impls/mod.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
use gix_config::File;
#[test]
diff --git a/gix-config/tests/file/init/from_paths/includes/conditional/onbranch.rs b/gix-config/tests/file/init/from_paths/includes/conditional/onbranch.rs
index f2dbeb280dc..c6c2c7b2ffb 100644
--- a/gix-config/tests/file/init/from_paths/includes/conditional/onbranch.rs
+++ b/gix-config/tests/file/init/from_paths/includes/conditional/onbranch.rs
@@ -1,7 +1,4 @@
-use std::{
- convert::{TryFrom, TryInto},
- fs,
-};
+use std::fs;
use bstr::{BString, ByteSlice};
use gix_config::file::{
diff --git a/gix-config/tests/file/mutable/section.rs b/gix-config/tests/file/mutable/section.rs
index 17ef1df586b..6ee00b30c87 100644
--- a/gix-config/tests/file/mutable/section.rs
+++ b/gix-config/tests/file/mutable/section.rs
@@ -90,8 +90,6 @@ mod pop {
}
mod set {
- use std::convert::TryInto;
-
use super::multi_value_section;
#[test]
@@ -121,8 +119,6 @@ mod set {
}
mod push {
- use std::convert::{TryFrom, TryInto};
-
use gix_config::parse::section::Key;
use crate::file::cow_str;
@@ -230,7 +226,7 @@ mod push_with_comment {
}
mod set_leading_whitespace {
- use std::{borrow::Cow, convert::TryFrom};
+ use std::borrow::Cow;
use bstr::BString;
use gix_config::parse::section::Key;
diff --git a/gix-config/tests/file/write.rs b/gix-config/tests/file/write.rs
index 53b82cec079..99fce2d3aa1 100644
--- a/gix-config/tests/file/write.rs
+++ b/gix-config/tests/file/write.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
use bstr::ByteVec;
use gix_config::file::{init, Metadata};
diff --git a/gix-config/tests/fixtures/config_with_worktree_extension.sh b/gix-config/tests/fixtures/config_with_worktree_extension.sh
index a3a5fe076de..31e6760a55e 100755
--- a/gix-config/tests/fixtures/config_with_worktree_extension.sh
+++ b/gix-config/tests/fixtures/config_with_worktree_extension.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q main-worktree
diff --git a/gix-config/tests/fixtures/generated-archives/config_with_worktree_extension.tar.xz b/gix-config/tests/fixtures/generated-archives/config_with_worktree_extension.tar.xz
index d9b03338679..55ed10a225c 100644
Binary files a/gix-config/tests/fixtures/generated-archives/config_with_worktree_extension.tar.xz and b/gix-config/tests/fixtures/generated-archives/config_with_worktree_extension.tar.xz differ
diff --git a/gix-config/tests/fixtures/make_config_repo.sh b/gix-config/tests/fixtures/make_config_repo.sh
index d4d3deb49d9..1d9b877f541 100755
--- a/gix-config/tests/fixtures/make_config_repo.sh
+++ b/gix-config/tests/fixtures/make_config_repo.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-config/tests/mem.rs b/gix-config/tests/mem.rs
index d8ceb761697..0ae0a1b829a 100644
--- a/gix-config/tests/mem.rs
+++ b/gix-config/tests/mem.rs
@@ -4,7 +4,7 @@ use std::alloc;
use std::time::Instant;
#[global_allocator]
-static ALLOCATOR: Cap = Cap::new(alloc::System, usize::max_value());
+static ALLOCATOR: Cap = Cap::new(alloc::System, usize::MAX);
#[test]
fn usage() {
diff --git a/gix-config/tests/parse/from_bytes.rs b/gix-config/tests/parse/from_bytes.rs
index df58531ba01..736ddfedca0 100644
--- a/gix-config/tests/parse/from_bytes.rs
+++ b/gix-config/tests/parse/from_bytes.rs
@@ -1,5 +1,3 @@
-use gix_config::parse::Events;
-
use super::*;
#[test]
diff --git a/gix-config/tests/parse/mod.rs b/gix-config/tests/parse/mod.rs
index 8219c985c61..4ce6d1a2f84 100644
--- a/gix-config/tests/parse/mod.rs
+++ b/gix-config/tests/parse/mod.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, convert::TryFrom};
+use std::borrow::Cow;
use gix_config::parse::{Event, Events, Section};
diff --git a/gix-config/tests/parse/section.rs b/gix-config/tests/parse/section.rs
index 872052e9031..afdff7d9350 100644
--- a/gix-config/tests/parse/section.rs
+++ b/gix-config/tests/parse/section.rs
@@ -70,8 +70,6 @@ mod header {
}
}
mod name {
- use std::convert::TryFrom;
-
use gix_config::parse::section::Name;
#[test]
@@ -90,7 +88,7 @@ mod name {
}
mod key {
- use std::{cmp::Ordering, convert::TryFrom};
+ use std::cmp::Ordering;
use gix_config::parse::section::Key;
diff --git a/gix-credentials/CHANGELOG.md b/gix-credentials/CHANGELOG.md
index 8fb3daa97cb..8bb0eeb1d8e 100644
--- a/gix-credentials/CHANGELOG.md
+++ b/gix-credentials/CHANGELOG.md
@@ -5,6 +5,31 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.24.2 (2024-03-14)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 3 commits contributed to the release over the course of 4 calendar days.
+ - 18 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Release gix-command v0.3.4 ([`8a62fb5`](https://github.com/Byron/gitoxide/commit/8a62fb57f7751d3d57273d9430517487e555f999))
- Release gix-path v0.10.5 ([`b8cba96`](https://github.com/Byron/gitoxide/commit/b8cba96ce57f8b6b0067d6a8cf3e37eaf280a238))
diff --git a/gix-credentials/Cargo.toml b/gix-credentials/Cargo.toml
index c58976912be..bb170e0e4d7 100644
--- a/gix-credentials/Cargo.toml
+++ b/gix-credentials/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-credentials"
-version = "0.24.1"
+version = "0.24.2"
repository = "https://github.com/Byron/gitoxide"
license = "MIT OR Apache-2.0"
description = "A crate of the gitoxide project to interact with git credentials helpers"
@@ -17,13 +17,13 @@ doctest = false
serde = ["dep:serde", "bstr/serde", "gix-sec/serde"]
[dependencies]
-gix-sec = { version = "^0.10.5", path = "../gix-sec" }
-gix-url = { version = "^0.27.1", path = "../gix-url" }
-gix-path = { version = "^0.10.6", path = "../gix-path" }
-gix-command = { version = "^0.3.5", path = "../gix-command" }
-gix-config-value = { version = "^0.14.5", path = "../gix-config-value" }
-gix-prompt = { version = "^0.8.3", path = "../gix-prompt" }
-gix-trace = { version = "^0.1.7", path = "../gix-trace" }
+gix-sec = { version = "^0.10.6", path = "../gix-sec" }
+gix-url = { version = "^0.27.2", path = "../gix-url" }
+gix-path = { version = "^0.10.7", path = "../gix-path" }
+gix-command = { version = "^0.3.6", path = "../gix-command" }
+gix-config-value = { version = "^0.14.6", path = "../gix-config-value" }
+gix-prompt = { version = "^0.8.4", path = "../gix-prompt" }
+gix-trace = { version = "^0.1.8", path = "../gix-trace" }
thiserror = "1.0.32"
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
diff --git a/gix-credentials/examples/git-credential-lite.rs b/gix-credentials/examples/git-credential-lite.rs
index c4e40c29177..c91dec18d3e 100644
--- a/gix-credentials/examples/git-credential-lite.rs
+++ b/gix-credentials/examples/git-credential-lite.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
/// Run like this `echo url=https://example.com | cargo run --example git-credential-light -- fill`
pub fn main() -> Result<(), gix_credentials::program::main::Error> {
gix_credentials::program::main(
diff --git a/gix-credentials/examples/invoke-git-credential.rs b/gix-credentials/examples/invoke-git-credential.rs
index cba3f5f706f..5d4f780f7aa 100644
--- a/gix-credentials/examples/invoke-git-credential.rs
+++ b/gix-credentials/examples/invoke-git-credential.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
/// Invokes `git credential` with the passed url as argument and prints obtained credentials.
pub fn main() -> Result<(), Box> {
let out = gix_credentials::builtin(gix_credentials::helper::Action::get_for_url(
diff --git a/gix-credentials/src/helper/mod.rs b/gix-credentials/src/helper/mod.rs
index 107d6db7a16..015ca0aaf9f 100644
--- a/gix-credentials/src/helper/mod.rs
+++ b/gix-credentials/src/helper/mod.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
use bstr::{BStr, BString};
use crate::{protocol, protocol::Context, Program};
diff --git a/gix-credentials/src/lib.rs b/gix-credentials/src/lib.rs
index 4e3e21d99a3..89e72e53d96 100644
--- a/gix-credentials/src/lib.rs
+++ b/gix-credentials/src/lib.rs
@@ -21,12 +21,15 @@ pub struct Program {
}
///
+#[allow(clippy::empty_docs)]
pub mod helper;
///
+#[allow(clippy::empty_docs)]
pub mod program;
///
+#[allow(clippy::empty_docs)]
pub mod protocol;
/// Call the `git credential` helper program performing the given `action`, which reads all context from the git configuration
diff --git a/gix-credentials/src/program/main.rs b/gix-credentials/src/program/main.rs
index b3417f92372..34f4163a01e 100644
--- a/gix-credentials/src/program/main.rs
+++ b/gix-credentials/src/program/main.rs
@@ -1,4 +1,4 @@
-use std::{convert::TryFrom, ffi::OsString};
+use std::ffi::OsString;
use bstr::BString;
@@ -60,7 +60,7 @@ pub enum Error {
}
pub(crate) mod function {
- use std::{convert::TryInto, ffi::OsString};
+ use std::ffi::OsString;
use crate::{
program::main::{Action, Error},
diff --git a/gix-credentials/src/program/mod.rs b/gix-credentials/src/program/mod.rs
index b7b1150d3dd..213c0272128 100644
--- a/gix-credentials/src/program/mod.rs
+++ b/gix-credentials/src/program/mod.rs
@@ -144,5 +144,6 @@ impl Program {
}
///
+#[allow(clippy::empty_docs)]
pub mod main;
pub use main::function::main;
diff --git a/gix-credentials/src/protocol/context/serde.rs b/gix-credentials/src/protocol/context/serde.rs
index 0f3b4b02487..76d1673a776 100644
--- a/gix-credentials/src/protocol/context/serde.rs
+++ b/gix-credentials/src/protocol/context/serde.rs
@@ -49,9 +49,8 @@ mod write {
}
///
+#[allow(clippy::empty_docs)]
pub mod decode {
- use std::convert::TryFrom;
-
use bstr::{BString, ByteSlice};
use crate::protocol::{context, context::serde::validate, Context};
diff --git a/gix-credentials/src/protocol/mod.rs b/gix-credentials/src/protocol/mod.rs
index ec168ffb3fc..2386af8fe98 100644
--- a/gix-credentials/src/protocol/mod.rs
+++ b/gix-credentials/src/protocol/mod.rs
@@ -83,4 +83,5 @@ pub fn helper_outcome_to_result(outcome: Option, action: helper
}
///
+#[allow(clippy::empty_docs)]
pub mod context;
diff --git a/gix-credentials/tests/fixtures/all-but-credentials.sh b/gix-credentials/tests/fixtures/all-but-credentials.sh
index 0610a71b025..934d3a0f0a7 100755
--- a/gix-credentials/tests/fixtures/all-but-credentials.sh
+++ b/gix-credentials/tests/fixtures/all-but-credentials.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
echo protocol=ftp
echo host=example.com:8080
diff --git a/gix-credentials/tests/fixtures/custom-helper.sh b/gix-credentials/tests/fixtures/custom-helper.sh
index 55d6b2f944c..340a760019b 100755
--- a/gix-credentials/tests/fixtures/custom-helper.sh
+++ b/gix-credentials/tests/fixtures/custom-helper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu
test "$1" = get && \
diff --git a/gix-credentials/tests/fixtures/fail.sh b/gix-credentials/tests/fixtures/fail.sh
index 84b6391bcf2..c738efcae1a 100755
--- a/gix-credentials/tests/fixtures/fail.sh
+++ b/gix-credentials/tests/fixtures/fail.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
exit 42
diff --git a/gix-credentials/tests/fixtures/last-pass.sh b/gix-credentials/tests/fixtures/last-pass.sh
index 2f03f898667..fd533e5c984 100755
--- a/gix-credentials/tests/fixtures/last-pass.sh
+++ b/gix-credentials/tests/fixtures/last-pass.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu
echo username=user
diff --git a/gix-credentials/tests/fixtures/password.sh b/gix-credentials/tests/fixtures/password.sh
index f75c4bc029a..c39db67618b 100755
--- a/gix-credentials/tests/fixtures/password.sh
+++ b/gix-credentials/tests/fixtures/password.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
echo password=pass
diff --git a/gix-credentials/tests/fixtures/reflect.sh b/gix-credentials/tests/fixtures/reflect.sh
index e4079b793fd..e74fb85b88f 100755
--- a/gix-credentials/tests/fixtures/reflect.sh
+++ b/gix-credentials/tests/fixtures/reflect.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
cat
diff --git a/gix-credentials/tests/fixtures/url.sh b/gix-credentials/tests/fixtures/url.sh
index 1eb585859e2..09900e4dbc9 100755
--- a/gix-credentials/tests/fixtures/url.sh
+++ b/gix-credentials/tests/fixtures/url.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
echo protocol=ftp
echo host=github.com
diff --git a/gix-credentials/tests/fixtures/username.sh b/gix-credentials/tests/fixtures/username.sh
index f2bab6c287e..50877450981 100755
--- a/gix-credentials/tests/fixtures/username.sh
+++ b/gix-credentials/tests/fixtures/username.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
echo username=user
diff --git a/gix-credentials/tests/helper/cascade.rs b/gix-credentials/tests/helper/cascade.rs
index f97a64dcb4e..32ffaaa7edb 100644
--- a/gix-credentials/tests/helper/cascade.rs
+++ b/gix-credentials/tests/helper/cascade.rs
@@ -1,6 +1,4 @@
mod invoke {
- use std::convert::TryInto;
-
use bstr::{ByteSlice, ByteVec};
use gix_credentials::{
helper::{Action, Cascade},
diff --git a/gix-date/CHANGELOG.md b/gix-date/CHANGELOG.md
index 288123841ec..f813af9bad4 100644
--- a/gix-date/CHANGELOG.md
+++ b/gix-date/CHANGELOG.md
@@ -5,6 +5,65 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.8.6 (2024-05-14)
+
+### Bug Fixes
+
+ - assure writing invalid dates doesn't panic.
+
+### Other
+
+ - make clear that `Time::seconds` is UTC.
+
+### Commit Statistics
+
+
+
+ - 4 commits contributed to the release over the course of 24 calendar days.
+ - 60 days passed between releases.
+ - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 1 unique issue was worked on: [#1367](https://github.com/Byron/gitoxide/issues/1367)
+
+### Commit Details
+
+
+
+view details
+
+ * **[#1367](https://github.com/Byron/gitoxide/issues/1367)**
+ - Assure writing invalid dates doesn't panic. ([`3448fd9`](https://github.com/Byron/gitoxide/commit/3448fd9cc0edc93d7a5b511fd4ec0a8e84b87e51))
+ * **Uncategorized**
+ - Merge branch 'status' ([`04ef31e`](https://github.com/Byron/gitoxide/commit/04ef31e9d6f5332d49037a5a4c248ebbb5aaf92b))
+ - Merge branch 'status' ([`68fd5b3`](https://github.com/Byron/gitoxide/commit/68fd5b34e1214d5c2cc7d00dd06e19ee86c00c66))
+ - Make clear that `Time::seconds` is UTC. ([`8d610ab`](https://github.com/Byron/gitoxide/commit/8d610ab8de7d3f62116632de6975f00c845dc842))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Merge branch 'dirwalk' ([`face359`](https://github.com/Byron/gitoxide/commit/face359443ba33e8985ec1525d5ec38b743ea7a9))
- Adjust gitignore files with precious declarations ([`ae86a6a`](https://github.com/Byron/gitoxide/commit/ae86a6a206074b85ff1eba32aea9c8b40c087b17))
diff --git a/gix-date/Cargo.toml b/gix-date/Cargo.toml
index 9a086475bf6..f739e75b416 100644
--- a/gix-date/Cargo.toml
+++ b/gix-date/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-date"
-version = "0.8.4"
+version = "0.8.6"
repository = "https://github.com/Byron/gitoxide"
license = "MIT OR Apache-2.0"
description = "A crate of the gitoxide project parsing dates the way git does"
diff --git a/gix-date/src/lib.rs b/gix-date/src/lib.rs
index 0ada471473f..34ab8a93c93 100644
--- a/gix-date/src/lib.rs
+++ b/gix-date/src/lib.rs
@@ -11,9 +11,11 @@
#![forbid(unsafe_code)]
///
+#[allow(clippy::empty_docs)]
pub mod time;
///
+#[allow(clippy::empty_docs)]
pub mod parse;
pub use parse::function::parse;
@@ -21,11 +23,11 @@ pub use parse::function::parse;
#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct Time {
- /// time in seconds since epoch.
+ /// The seconds that passed since UNIX epoch. This makes it UTC, or `+0000`.
pub seconds: SecondsSinceUnixEpoch,
- /// time offset in seconds, may be negative to match the `sign` field.
+ /// The time's offset in seconds, which may be negative to match the `sign` field.
pub offset: OffsetInSeconds,
- /// the sign of `offset`, used to encode `-0000` which would otherwise loose sign information.
+ /// the sign of `offset`, used to encode `-0000` which would otherwise lose sign information.
pub sign: time::Sign,
}
diff --git a/gix-date/src/parse.rs b/gix-date/src/parse.rs
index 323292cba4c..da0691271b2 100644
--- a/gix-date/src/parse.rs
+++ b/gix-date/src/parse.rs
@@ -86,7 +86,7 @@ pub(crate) mod function {
}
mod relative {
- use std::{convert::TryInto, str::FromStr, time::SystemTime};
+ use std::{str::FromStr, time::SystemTime};
use time::{Duration, OffsetDateTime};
diff --git a/gix-date/src/time/mod.rs b/gix-date/src/time/mod.rs
index 22c4e42f0a6..e2e1ff77afd 100644
--- a/gix-date/src/time/mod.rs
+++ b/gix-date/src/time/mod.rs
@@ -29,6 +29,7 @@ pub enum Format<'a> {
}
///
+#[allow(clippy::empty_docs)]
pub mod format;
mod init;
mod write;
diff --git a/gix-date/src/time/write.rs b/gix-date/src/time/write.rs
index efc02cc1e3a..5489dd3871d 100644
--- a/gix-date/src/time/write.rs
+++ b/gix-date/src/time/write.rs
@@ -5,6 +5,10 @@ use crate::{time::Sign, Time};
/// Serialization with standard `git` format
impl Time {
/// Serialize this instance into memory, similar to what [`write_to()`][Self::write_to()] would do with arbitrary `Write` implementations.
+ ///
+ /// # Panics
+ ///
+ /// If the underlying call fails as this instance can't be represented, typically due to an invalid offset.
pub fn to_bstring(&self) -> BString {
let mut buf = Vec::with_capacity(64);
self.write_to(&mut buf).expect("write to memory cannot fail");
@@ -13,6 +17,18 @@ impl Time {
/// Serialize this instance to `out` in a format suitable for use in header fields of serialized git commits or tags.
pub fn write_to(&self, out: &mut dyn std::io::Write) -> std::io::Result<()> {
+ const SECONDS_PER_HOUR: u32 = 60 * 60;
+ let offset = self.offset.unsigned_abs();
+ let hours = offset / SECONDS_PER_HOUR;
+ let minutes = (offset - (hours * SECONDS_PER_HOUR)) / 60;
+
+ if hours > 99 {
+ return Err(std::io::Error::new(
+ std::io::ErrorKind::Other,
+ "Cannot represent offsets larger than +-9900",
+ ));
+ }
+
let mut itoa = itoa::Buffer::new();
out.write_all(itoa.format(self.seconds).as_bytes())?;
out.write_all(b" ")?;
@@ -23,12 +39,6 @@ impl Time {
const ZERO: &[u8; 1] = b"0";
- const SECONDS_PER_HOUR: u32 = 60 * 60;
- let offset = self.offset.unsigned_abs();
- let hours = offset / SECONDS_PER_HOUR;
- assert!(hours < 25, "offset is more than a day: {hours}");
- let minutes = (offset - (hours * SECONDS_PER_HOUR)) / 60;
-
if hours < 10 {
out.write_all(ZERO)?;
}
diff --git a/gix-date/tests/fixtures/generate_git_date_baseline.sh b/gix-date/tests/fixtures/generate_git_date_baseline.sh
index e5e34d99341..45d5217b6a9 100755
--- a/gix-date/tests/fixtures/generate_git_date_baseline.sh
+++ b/gix-date/tests/fixtures/generate_git_date_baseline.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init;
diff --git a/gix-date/tests/fixtures/generated-archives/generate_git_date_baseline.tar.xz b/gix-date/tests/fixtures/generated-archives/generate_git_date_baseline.tar.xz
index 951ea223c37..1ac61488236 100644
Binary files a/gix-date/tests/fixtures/generated-archives/generate_git_date_baseline.tar.xz and b/gix-date/tests/fixtures/generated-archives/generate_git_date_baseline.tar.xz differ
diff --git a/gix-date/tests/time/mod.rs b/gix-date/tests/time/mod.rs
index 0fb4befd058..82f1f37a81e 100644
--- a/gix-date/tests/time/mod.rs
+++ b/gix-date/tests/time/mod.rs
@@ -1,5 +1,4 @@
-use bstr::ByteSlice;
-use gix_date::{time::Sign, SecondsSinceUnixEpoch, Time};
+use gix_date::Time;
mod baseline;
mod format;
@@ -32,57 +31,114 @@ fn is_set() {
.is_set());
}
-#[test]
-fn write_to() -> Result<(), Box> {
- for (time, expected) in [
- (
- Time {
- seconds: SecondsSinceUnixEpoch::MAX,
- offset: 0,
- sign: Sign::Minus,
- },
- "9223372036854775807 -0000",
- ),
- (
- Time {
- seconds: SecondsSinceUnixEpoch::MIN,
- offset: 0,
- sign: Sign::Minus,
- },
- "-9223372036854775808 -0000",
- ),
- (
- Time {
- seconds: 500,
- offset: 9000,
- sign: Sign::Plus,
- },
- "500 +0230",
- ),
- (
- Time {
- seconds: 189009009,
- offset: -36000,
- sign: Sign::Minus,
- },
- "189009009 -1000",
- ),
- (
- Time {
- seconds: 0,
- offset: 0,
- sign: Sign::Minus,
- },
- "0 -0000",
- ),
- ] {
- let mut output = Vec::new();
- time.write_to(&mut output)?;
- assert_eq!(output.as_bstr(), expected);
- assert_eq!(time.size(), output.len());
+mod write_to {
+ use bstr::ByteSlice;
+ use gix_date::time::Sign;
+ use gix_date::{SecondsSinceUnixEpoch, Time};
+
+ #[test]
+ fn invalid() {
+ let time = Time {
+ seconds: 0,
+ offset: (100 * 60 * 60) + 30 * 60,
+ sign: Sign::Plus,
+ };
+ let err = time.write_to(&mut Vec::new()).unwrap_err();
+ assert_eq!(err.to_string(), "Cannot represent offsets larger than +-9900");
+ }
- let actual = gix_date::parse(&output.as_bstr().to_string(), None).expect("round-trippable");
- assert_eq!(time, actual);
+ #[test]
+ fn valid_roundtrips() -> Result<(), Box> {
+ for (time, expected) in [
+ (
+ Time {
+ seconds: SecondsSinceUnixEpoch::MAX,
+ offset: 0,
+ sign: Sign::Minus,
+ },
+ "9223372036854775807 -0000",
+ ),
+ (
+ Time {
+ seconds: SecondsSinceUnixEpoch::MIN,
+ offset: 0,
+ sign: Sign::Minus,
+ },
+ "-9223372036854775808 -0000",
+ ),
+ (
+ Time {
+ seconds: 500,
+ offset: 9000,
+ sign: Sign::Plus,
+ },
+ "500 +0230",
+ ),
+ (
+ Time {
+ seconds: 189009009,
+ offset: -36000,
+ sign: Sign::Minus,
+ },
+ "189009009 -1000",
+ ),
+ (
+ Time {
+ seconds: 0,
+ offset: 0,
+ sign: Sign::Minus,
+ },
+ "0 -0000",
+ ),
+ (
+ Time {
+ seconds: 0,
+ offset: -24 * 60 * 60,
+ sign: Sign::Minus,
+ },
+ "0 -2400",
+ ),
+ (
+ Time {
+ seconds: 0,
+ offset: 24 * 60 * 60,
+ sign: Sign::Plus,
+ },
+ "0 +2400",
+ ),
+ (
+ Time {
+ seconds: 0,
+ offset: (25 * 60 * 60) + 30 * 60,
+ sign: Sign::Plus,
+ },
+ "0 +2530",
+ ),
+ (
+ Time {
+ seconds: 0,
+ offset: (-25 * 60 * 60) - 30 * 60,
+ sign: Sign::Minus,
+ },
+ "0 -2530",
+ ),
+ (
+ Time {
+ seconds: 0,
+ offset: (99 * 60 * 60) + 59 * 60,
+ sign: Sign::Plus,
+ },
+ "0 +9959",
+ ),
+ ] {
+ let mut output = Vec::new();
+ time.write_to(&mut output)?;
+ assert_eq!(output.as_bstr(), expected);
+ assert_eq!(time.size(), output.len());
+
+ let actual = gix_date::parse(&output.as_bstr().to_string(), None).expect("round-trippable");
+ assert_eq!(time, actual);
+ }
+ Ok(())
}
- Ok(())
}
diff --git a/gix-date/tests/time/parse.rs b/gix-date/tests/time/parse.rs
index 5b23fe1077a..8b96cb16ed2 100644
--- a/gix-date/tests/time/parse.rs
+++ b/gix-date/tests/time/parse.rs
@@ -91,6 +91,7 @@ fn bad_raw() {
"123456 +060",
"123456 -060",
"123456 +06000",
+ "123456 +10030",
"123456 06000",
"123456 0600",
"123456 +0600 extra",
@@ -101,6 +102,26 @@ fn bad_raw() {
}
}
+#[test]
+fn double_negation_in_offset() {
+ let actual = gix_date::parse("1288373970 --700", None).unwrap();
+ assert_eq!(
+ actual,
+ gix_date::Time {
+ seconds: 1288373970,
+ offset: 25200,
+ sign: Sign::Minus,
+ },
+ "double-negation stays negative, and is parseable."
+ );
+
+ assert_eq!(
+ actual.to_bstring(),
+ "1288373970 -0700",
+ "serialization corrects the issue"
+ );
+}
+
#[test]
fn git_default() {
assert_eq!(
diff --git a/gix-diff/CHANGELOG.md b/gix-diff/CHANGELOG.md
index 18d8800830d..e0d8d389a10 100644
--- a/gix-diff/CHANGELOG.md
+++ b/gix-diff/CHANGELOG.md
@@ -5,6 +5,105 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.44.0 (2024-05-22)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 8 commits contributed to the release over the course of 38 calendar days.
+ - 38 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge branch 'various-fixes' ([`d6cd449`](https://github.com/Byron/gitoxide/commit/d6cd44930fb204b06e2b70fc6965e7705530c47a))
+ - Merge pull request from GHSA-7w47-3wg8-547c ([`79dce79`](https://github.com/Byron/gitoxide/commit/79dce79c62f6072aa2653780d590dc3993dfa401))
+ - Adapt to changes in `gix-worktree` ([`1ca6a3c`](https://github.com/Byron/gitoxide/commit/1ca6a3ce22887c7eb42ec3e0a19f6e1202715745))
+ - Merge branch 'cargo-fixes' ([`977346e`](https://github.com/Byron/gitoxide/commit/977346ee61de6207c66f3de003db6e8c722fb81c))
+ - Release gix-index v0.32.1, gix-pathspec v0.7.4, gix-worktree v0.33.1, gix-dir v0.4.1 ([`54ac559`](https://github.com/Byron/gitoxide/commit/54ac55946bb04635cd74582a1ce2e4bee70f2e60))
+ - Merge pull request #1345 from EliahKagan/shell-scripts ([`fe24c89`](https://github.com/Byron/gitoxide/commit/fe24c89e326670deaa3aaa643276d612d866072e))
+ - Add missing +x bit on scripts that are run and not sourced ([`41bf65a`](https://github.com/Byron/gitoxide/commit/41bf65adef6f7d2cdd28fede262173ec7ba10822))
+view details
+
+ * **Uncategorized**
+ - Release gix-trace v0.1.9, gix-utils v0.1.12, gix-packetline-blocking v0.17.4, gix-filter v0.11.1, gix-fs v0.10.2, gix-traverse v0.39.0, gix-worktree-stream v0.12.0, gix-archive v0.12.0, gix-config v0.36.1, gix-url v0.27.3, gix-index v0.32.0, gix-worktree v0.33.0, gix-diff v0.43.0, gix-pathspec v0.7.3, gix-dir v0.4.0, gix-pack v0.50.0, gix-odb v0.60.0, gix-transport v0.42.0, gix-protocol v0.45.0, gix-status v0.9.0, gix-worktree-state v0.10.0, gix v0.62.0, gix-fsck v0.4.0, gitoxide-core v0.37.0, gitoxide v0.35.0, safety bump 14 crates ([`095c673`](https://github.com/Byron/gitoxide/commit/095c6739b2722a8b9af90776b435ef2da454c0e6))
+ - Prepare changelogs prior to release ([`5755271`](https://github.com/Byron/gitoxide/commit/57552717f46f96c35ba4ddc0a64434354ef845e9))
+ - Revert a typo ([`9680e57`](https://github.com/Byron/gitoxide/commit/9680e57952d8d6389c77bde6fa8de34592aa09a8))
+ - Fix typos ([`f72ecce`](https://github.com/Byron/gitoxide/commit/f72ecce45babcad2a0c9b73c79d01ff502907a57))
+ - Merge branch 'add-topo-walk' ([`b590a9d`](https://github.com/Byron/gitoxide/commit/b590a9d2b6a273f76f0320d2b9fe1f679c08f549))
+ - Adapt to changes in `gix-traverse` ([`1cfeb11`](https://github.com/Byron/gitoxide/commit/1cfeb11f1fe9ad9c7b9084840ed7f5c5877f2f9a))
+ - Make `topo` more similar to `Ancestors`, but also rename `Ancestors` to `Simple` ([`2a9c178`](https://github.com/Byron/gitoxide/commit/2a9c178326b7f13ba6bc1f89fc2b9d9facbecf48))
+ - Adapt to changes in `gix-traverse` ([`6154bf3`](https://github.com/Byron/gitoxide/commit/6154bf3a346d69f9749271d50e4f3aacdcbad4d0))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+ - Add index-to-worktree status with rename tracking ([`80a6cb8`](https://github.com/Byron/gitoxide/commit/80a6cb80fdb3a49c3461d286d62baf68755aa733))
+ - Provide more source information when emitting rewrites. ([`e20b6b1`](https://github.com/Byron/gitoxide/commit/e20b6b1b9e767a07c5bc135c45cf7dccc878b99c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Thanks clippy ([`13d5602`](https://github.com/Byron/gitoxide/commit/13d5602faa58aa6f520ebc6003ed54bc9c844f2b))
- Merge branch 'tempfile-permissions' ([`7b44c7f`](https://github.com/Byron/gitoxide/commit/7b44c7ff1dc0b8875214d2673c7f52948cf04ff0))
diff --git a/gix-diff/Cargo.toml b/gix-diff/Cargo.toml
index 1e1f8757580..b669d3b6354 100644
--- a/gix-diff/Cargo.toml
+++ b/gix-diff/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-diff"
-version = "0.41.0"
+version = "0.44.0"
repository = "https://github.com/Byron/gitoxide"
license = "MIT OR Apache-2.0"
description = "Calculate differences between various git objects"
@@ -23,15 +23,15 @@ wasm = ["dep:getrandom"]
doctest = false
[dependencies]
-gix-hash = { version = "^0.14.1", path = "../gix-hash" }
-gix-object = { version = "^0.41.1", path = "../gix-object" }
-gix-filter = { version = "^0.10.0", path = "../gix-filter", optional = true }
-gix-worktree = { version = "^0.31.0", path = "../gix-worktree", default-features = false, features = ["attributes"], optional = true }
-gix-command = { version = "^0.3.5", path = "../gix-command", optional = true }
-gix-path = { version = "^0.10.6", path = "../gix-path", optional = true }
-gix-fs = { version = "^0.10.0", path = "../gix-fs", optional = true }
-gix-tempfile = { version = "^13.0.0", path = "../gix-tempfile", optional = true }
-gix-trace = { version = "^0.1.7", path = "../gix-trace", optional = true }
+gix-hash = { version = "^0.14.2", path = "../gix-hash" }
+gix-object = { version = "^0.42.2", path = "../gix-object" }
+gix-filter = { version = "^0.11.2", path = "../gix-filter", optional = true }
+gix-worktree = { version = "^0.34.0", path = "../gix-worktree", default-features = false, features = ["attributes"], optional = true }
+gix-command = { version = "^0.3.7", path = "../gix-command", optional = true }
+gix-path = { version = "^0.10.7", path = "../gix-path", optional = true }
+gix-fs = { version = "^0.11.1", path = "../gix-fs", optional = true }
+gix-tempfile = { version = "^14.0.0", path = "../gix-tempfile", optional = true }
+gix-trace = { version = "^0.1.9", path = "../gix-trace", optional = true }
thiserror = "1.0.32"
imara-diff = { version = "0.1.3", optional = true }
diff --git a/gix-diff/src/blob/mod.rs b/gix-diff/src/blob/mod.rs
index 0c76c2d918c..9af819c9877 100644
--- a/gix-diff/src/blob/mod.rs
+++ b/gix-diff/src/blob/mod.rs
@@ -6,9 +6,11 @@ use bstr::BString;
pub use imara_diff::*;
///
+#[allow(clippy::empty_docs)]
pub mod pipeline;
///
+#[allow(clippy::empty_docs)]
pub mod platform;
/// Information about the diff performed to detect similarity.
diff --git a/gix-diff/src/blob/pipeline.rs b/gix-diff/src/blob/pipeline.rs
index 45018218426..f67de77a14c 100644
--- a/gix-diff/src/blob/pipeline.rs
+++ b/gix-diff/src/blob/pipeline.rs
@@ -111,6 +111,7 @@ impl Mode {
}
///
+#[allow(clippy::empty_docs)]
pub mod convert_to_diffable {
use std::collections::TryReserveError;
diff --git a/gix-diff/src/blob/platform.rs b/gix-diff/src/blob/platform.rs
index 1c2d8fa0180..41b4cc928ea 100644
--- a/gix-diff/src/blob/platform.rs
+++ b/gix-diff/src/blob/platform.rs
@@ -90,6 +90,7 @@ pub struct Resource<'a> {
}
///
+#[allow(clippy::empty_docs)]
pub mod resource {
use crate::blob::{
pipeline,
@@ -150,6 +151,7 @@ pub mod resource {
}
///
+#[allow(clippy::empty_docs)]
pub mod set_resource {
use bstr::BString;
@@ -179,6 +181,7 @@ pub mod set_resource {
}
///
+#[allow(clippy::empty_docs)]
pub mod prepare_diff {
use bstr::BStr;
@@ -245,6 +248,7 @@ pub mod prepare_diff {
}
///
+#[allow(clippy::empty_docs)]
pub mod prepare_diff_command {
use std::ops::{Deref, DerefMut};
@@ -579,14 +583,14 @@ impl Platform {
if self.diff_cache.contains_key(storage) {
return Ok(());
}
- let entry = self
- .attr_stack
- .at_entry(rela_path, Some(false), objects)
- .map_err(|err| set_resource::Error::Attributes {
- source: err,
- kind,
- rela_path: rela_path.to_owned(),
- })?;
+ let entry =
+ self.attr_stack
+ .at_entry(rela_path, None, objects)
+ .map_err(|err| set_resource::Error::Attributes {
+ source: err,
+ kind,
+ rela_path: rela_path.to_owned(),
+ })?;
let mut buf = Vec::new();
let out = self.filter.convert_to_diffable(
&id,
diff --git a/gix-diff/src/lib.rs b/gix-diff/src/lib.rs
index 1fe8d2e6bb4..ac528ccb2be 100644
--- a/gix-diff/src/lib.rs
+++ b/gix-diff/src/lib.rs
@@ -44,6 +44,7 @@ pub struct Rewrites {
pub mod rewrites;
///
+#[allow(clippy::empty_docs)]
pub mod tree;
///
diff --git a/gix-diff/src/rewrites/tracker.rs b/gix-diff/src/rewrites/tracker.rs
index 4caefcd34d4..7a255c456a1 100644
--- a/gix-diff/src/rewrites/tracker.rs
+++ b/gix-diff/src/rewrites/tracker.rs
@@ -83,7 +83,7 @@ pub mod visit {
/// The source of a rewrite, rename or copy.
#[derive(Debug, Clone, PartialEq, PartialOrd)]
- pub struct Source<'a> {
+ pub struct Source<'a, T> {
/// The kind of entry.
pub entry_mode: EntryMode,
/// The hash of the state of the source as seen in the object database.
@@ -92,6 +92,8 @@ pub mod visit {
pub kind: SourceKind,
/// The repository-relative location of this entry.
pub location: &'a BStr,
+ /// The change that was registered as source.
+ pub change: &'a T,
/// If this is a rewrite, indicate how many lines would need to change to turn this source into the destination.
pub diff: Option,
}
@@ -116,6 +118,7 @@ pub mod visit {
}
///
+#[allow(clippy::empty_docs)]
pub mod emit {
/// The error returned by [Tracker::emit()](super::Tracker::emit()).
#[derive(Debug, thiserror::Error)]
@@ -193,7 +196,7 @@ impl Tracker {
/// will panic if `change` is not a modification, and it's valid to not call `push` at all.
pub fn emit(
&mut self,
- mut cb: impl FnMut(visit::Destination<'_, T>, Option>) -> crate::tree::visit::Action,
+ mut cb: impl FnMut(visit::Destination<'_, T>, Option>) -> crate::tree::visit::Action,
diff_cache: &mut crate::blob::Platform,
objects: &impl gix_object::FindObjectOrHeader,
mut push_source_tree: PushSourceTreeFn,
@@ -283,7 +286,7 @@ impl Tracker {
fn match_pairs_of_kind(
&mut self,
kind: visit::SourceKind,
- cb: &mut impl FnMut(visit::Destination<'_, T>, Option>) -> crate::tree::visit::Action,
+ cb: &mut impl FnMut(visit::Destination<'_, T>, Option>) -> crate::tree::visit::Action,
percentage: Option,
out: &mut Outcome,
diff_cache: &mut crate::blob::Platform,
@@ -326,7 +329,7 @@ impl Tracker {
fn match_pairs(
&mut self,
- cb: &mut impl FnMut(visit::Destination<'_, T>, Option>) -> crate::tree::visit::Action,
+ cb: &mut impl FnMut(visit::Destination<'_, T>, Option>) -> crate::tree::visit::Action,
percentage: Option,
kind: visit::SourceKind,
stats: &mut Outcome,
@@ -360,6 +363,7 @@ impl Tracker {
id,
kind,
location,
+ change: &src.change,
diff,
},
src_idx,
@@ -371,11 +375,15 @@ impl Tracker {
let location = dest.location(&self.path_backing);
let change = dest.change.clone();
let dest = visit::Destination { change, location };
+ let src_idx = src.as_ref().map(|t| t.1);
+ let res = cb(dest, src.map(|t| t.0));
+
self.items[dest_idx].emitted = true;
- if let Some(src_idx) = src.as_ref().map(|t| t.1) {
+ if let Some(src_idx) = src_idx {
self.items[src_idx].emitted = true;
}
- if cb(dest, src.map(|t| t.0)) == crate::tree::visit::Action::Cancel {
+
+ if res == crate::tree::visit::Action::Cancel {
return Ok(crate::tree::visit::Action::Cancel);
}
}
diff --git a/gix-diff/src/tree/mod.rs b/gix-diff/src/tree/mod.rs
index 77e125e910e..0c87e203806 100644
--- a/gix-diff/src/tree/mod.rs
+++ b/gix-diff/src/tree/mod.rs
@@ -34,9 +34,11 @@ where
}
///
+#[allow(clippy::empty_docs)]
pub mod changes;
///
+#[allow(clippy::empty_docs)]
pub mod visit;
#[doc(inline)]
pub use visit::Visit;
diff --git a/gix-diff/tests/Cargo.toml b/gix-diff/tests/Cargo.toml
index e63c3d5a320..695508cf1aa 100644
--- a/gix-diff/tests/Cargo.toml
+++ b/gix-diff/tests/Cargo.toml
@@ -25,3 +25,4 @@ gix-filter = { path = "../../gix-filter" }
gix-traverse = { path = "../../gix-traverse" }
gix-testtools = { path = "../../tests/tools" }
shell-words = "1"
+pretty_assertions = "1.4.0"
diff --git a/gix-diff/tests/blob/pipeline.rs b/gix-diff/tests/blob/pipeline.rs
index fb1ef355715..f4cfeba5d1b 100644
--- a/gix-diff/tests/blob/pipeline.rs
+++ b/gix-diff/tests/blob/pipeline.rs
@@ -507,7 +507,7 @@ pub(crate) mod convert_to_diffable {
assert_eq!(out.data, Some(pipeline::Data::Binary { size: 11 }));
assert_eq!(buf.len(), 0, "buffers are cleared even if we read them");
- let platform = attributes.at_entry("c", Some(false), &gix_object::find::Never)?;
+ let platform = attributes.at_entry("c", None, &gix_object::find::Never)?;
let id = db.insert("b");
let out = filter.convert_to_diffable(
@@ -589,7 +589,7 @@ pub(crate) mod convert_to_diffable {
let mut db = ObjectDb::default();
let null = gix_hash::Kind::Sha1.null();
let mut buf = Vec::new();
- let platform = attributes.at_entry("a", Some(false), &gix_object::find::Never)?;
+ let platform = attributes.at_entry("a", None, &gix_object::find::Never)?;
let worktree_modes = [
pipeline::Mode::ToWorktreeAndBinaryToText,
pipeline::Mode::ToGitUnlessBinaryToTextIsPresent,
@@ -672,7 +672,7 @@ pub(crate) mod convert_to_diffable {
"no filter was applied in this mode, also when using the ODB"
);
- let platform = attributes.at_entry("missing", Some(false), &gix_object::find::Never)?;
+ let platform = attributes.at_entry("missing", None, &gix_object::find::Never)?;
for mode in all_modes {
buf.push(1);
let out = filter.convert_to_diffable(
@@ -731,7 +731,7 @@ pub(crate) mod convert_to_diffable {
);
}
- let platform = attributes.at_entry("b", Some(false), &gix_object::find::Never)?;
+ let platform = attributes.at_entry("b", None, &gix_object::find::Never)?;
for mode in all_modes {
buf.push(1);
let out = filter.convert_to_diffable(
@@ -781,7 +781,7 @@ pub(crate) mod convert_to_diffable {
assert_eq!(buf.len(), 0, "it's always cleared before any potential use");
}
- let platform = attributes.at_entry("c", Some(false), &gix_object::find::Never)?;
+ let platform = attributes.at_entry("c", None, &gix_object::find::Never)?;
for mode in worktree_modes {
let out = filter.convert_to_diffable(
&null,
@@ -827,7 +827,7 @@ pub(crate) mod convert_to_diffable {
);
}
- let platform = attributes.at_entry("unset", Some(false), &gix_object::find::Never)?;
+ let platform = attributes.at_entry("unset", None, &gix_object::find::Never)?;
for mode in all_modes {
let out = filter.convert_to_diffable(
&null,
@@ -879,7 +879,7 @@ pub(crate) mod convert_to_diffable {
assert_eq!(buf.len(), 0);
}
- let platform = attributes.at_entry("d", Some(false), &gix_object::find::Never)?;
+ let platform = attributes.at_entry("d", None, &gix_object::find::Never)?;
let id = db.insert("d-in-db");
for mode in worktree_modes {
let out = filter.convert_to_diffable(
@@ -923,7 +923,7 @@ pub(crate) mod convert_to_diffable {
);
}
- let platform = attributes.at_entry("e-no-attr", Some(false), &gix_object::find::Never)?;
+ let platform = attributes.at_entry("e-no-attr", None, &gix_object::find::Never)?;
let out = filter.convert_to_diffable(
&null,
EntryKind::Blob,
diff --git a/gix-diff/tests/fixtures/generated-archives/make_blob_repo.tar.xz b/gix-diff/tests/fixtures/generated-archives/make_blob_repo.tar.xz
index 1287c33ce4b..085dac5c3f7 100644
Binary files a/gix-diff/tests/fixtures/generated-archives/make_blob_repo.tar.xz and b/gix-diff/tests/fixtures/generated-archives/make_blob_repo.tar.xz differ
diff --git a/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar.xz b/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar.xz
index 18e3c75e651..2602d5df03c 100644
Binary files a/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar.xz and b/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar.xz differ
diff --git a/gix-diff/tests/fixtures/make_blob_repo.sh b/gix-diff/tests/fixtures/make_blob_repo.sh
old mode 100644
new mode 100755
index ac0079a68af..666a274efd8
--- a/gix-diff/tests/fixtures/make_blob_repo.sh
+++ b/gix-diff/tests/fixtures/make_blob_repo.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-diff/tests/fixtures/make_diff_repo.sh b/gix-diff/tests/fixtures/make_diff_repo.sh
index 7ae9ccab22a..64955c3bfe1 100755
--- a/gix-diff/tests/fixtures/make_diff_repo.sh
+++ b/gix-diff/tests/fixtures/make_diff_repo.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
diff --git a/gix-diff/tests/rewrites/mod.rs b/gix-diff/tests/rewrites/mod.rs
index be44ef39eda..ddcb12dfc86 100644
--- a/gix-diff/tests/rewrites/mod.rs
+++ b/gix-diff/tests/rewrites/mod.rs
@@ -4,7 +4,7 @@ use gix_object::tree::{EntryKind, EntryMode};
mod tracker;
-#[derive(Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
pub struct Change {
id: ObjectId,
kind: ChangeKind,
diff --git a/gix-diff/tests/rewrites/tracker.rs b/gix-diff/tests/rewrites/tracker.rs
index f522fbec312..9b3f4f5a928 100644
--- a/gix-diff/tests/rewrites/tracker.rs
+++ b/gix-diff/tests/rewrites/tracker.rs
@@ -12,6 +12,7 @@ use gix_diff::{
Rewrites,
};
use gix_object::tree::EntryKind;
+use pretty_assertions::assert_eq;
use crate::{
hex_to_id,
@@ -51,6 +52,7 @@ fn rename_by_id() -> crate::Result {
id: NULL_ID,
kind: SourceKind::Rename,
location: "b".into(),
+ change: &Change::deletion(),
diff: None,
}
);
@@ -146,11 +148,16 @@ fn copy_by_id() -> crate::Result {
let out = util::assert_emit_with_objects(
&mut track,
|dst, src| {
+ let id = hex_to_id("2e65efe2a145dda7ee51d1741299f848e5bf752e");
let source_a = Source {
entry_mode: EntryKind::Blob.into(),
- id: hex_to_id("2e65efe2a145dda7ee51d1741299f848e5bf752e"),
+ id,
kind: SourceKind::Copy,
location: "a".into(),
+ change: &Change {
+ id,
+ ..Change::modification()
+ },
diff: None,
};
match calls {
@@ -219,6 +226,10 @@ fn copy_by_id_search_in_all_sources() -> crate::Result {
id: content_id,
kind: SourceKind::Copy,
location: "a-src".into(),
+ change: &Change {
+ id: content_id,
+ ..Change::modification()
+ },
diff: None,
};
match calls {
@@ -289,11 +300,16 @@ fn copy_by_50_percent_similarity() -> crate::Result {
let out = util::assert_emit_with_objects(
&mut track,
|dst, src| {
+ let id = hex_to_id("78981922613b2afb6025042ff6bd878ac1994e85");
let source_a = Source {
entry_mode: EntryKind::Blob.into(),
- id: hex_to_id("78981922613b2afb6025042ff6bd878ac1994e85"),
+ id,
kind: SourceKind::Copy,
location: "a".into(),
+ change: &Change {
+ id,
+ ..Change::modification()
+ },
diff: Some(DiffLineStats {
removals: 0,
insertions: 1,
@@ -459,13 +475,18 @@ fn rename_by_50_percent_similarity() -> crate::Result {
|dst, src| {
match calls {
0 => {
+ let id = hex_to_id("66a52ee7a1d803dc57859c3e95ac9dcdc87c0164");
assert_eq!(
src.unwrap(),
Source {
entry_mode: EntryKind::Blob.into(),
- id: hex_to_id("66a52ee7a1d803dc57859c3e95ac9dcdc87c0164"),
+ id,
kind: SourceKind::Rename,
location: "a".into(),
+ change: &Change {
+ id,
+ ..Change::deletion()
+ },
diff: Some(DiffLineStats {
removals: 1,
insertions: 1,
@@ -532,7 +553,7 @@ fn add_only() -> crate::Result {
let out = util::assert_emit(&mut track, |dst, src| {
assert!(!called);
called = true;
- assert_eq!(src, None, "there is just a single deletion, no pair");
+ assert!(src.is_none(), "there is just a single deletion, no pair");
assert_eq!(dst.location, "a");
assert_eq!(dst.change.kind, ChangeKind::Addition);
Action::Continue
@@ -569,14 +590,14 @@ mod util {
pub fn assert_emit(
tracker: &mut rewrites::Tracker,
- cb: impl FnMut(Destination<'_, Change>, Option>) -> Action,
+ cb: impl FnMut(Destination<'_, Change>, Option>) -> Action,
) -> rewrites::Outcome {
assert_emit_with_objects(tracker, cb, gix_object::find::Never)
}
pub fn assert_emit_with_objects(
tracker: &mut rewrites::Tracker,
- cb: impl FnMut(Destination<'_, Change>, Option>) -> Action,
+ cb: impl FnMut(Destination<'_, Change>, Option>) -> Action,
objects: impl gix_object::FindObjectOrHeader,
) -> rewrites::Outcome {
assert_emit_with_objects_and_sources(tracker, cb, objects, None)
@@ -584,7 +605,7 @@ mod util {
pub fn assert_emit_with_objects_and_sources<'a>(
tracker: &mut rewrites::Tracker,
- cb: impl FnMut(Destination<'_, Change>, Option>) -> Action,
+ cb: impl FnMut(Destination<'_, Change>, Option>) -> Action,
objects: impl gix_object::FindObjectOrHeader,
sources: impl IntoIterator- ,
) -> rewrites::Outcome {
diff --git a/gix-diff/tests/tree/mod.rs b/gix-diff/tests/tree/mod.rs
index 7df8f64c7c9..85fcbe6170c 100644
--- a/gix-diff/tests/tree/mod.rs
+++ b/gix-diff/tests/tree/mod.rs
@@ -129,11 +129,10 @@ mod changes {
}
fn all_commits(db: &gix_odb::Handle) -> HashMap {
- use gix_traverse::commit;
let mut buf = Vec::new();
let head = head_of(db);
- commit::Ancestors::new(Some(head), commit::ancestors::State::default(), &db)
+ gix_traverse::commit::Simple::new(Some(head), &db)
.collect::, _>>()
.expect("valid iteration")
.into_iter()
diff --git a/gix-dir/CHANGELOG.md b/gix-dir/CHANGELOG.md
index f6284a65f34..8a4be8c37da 100644
--- a/gix-dir/CHANGELOG.md
+++ b/gix-dir/CHANGELOG.md
@@ -5,6 +5,173 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.5.0 (2024-05-22)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 8 commits contributed to the release over the course of 33 calendar days.
+ - 33 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+
view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge branch 'various-fixes' ([`d6cd449`](https://github.com/Byron/gitoxide/commit/d6cd44930fb204b06e2b70fc6965e7705530c47a))
+ - Merge pull request from GHSA-7w47-3wg8-547c ([`79dce79`](https://github.com/Byron/gitoxide/commit/79dce79c62f6072aa2653780d590dc3993dfa401))
+ - Address review comments ([`fcc3b69`](https://github.com/Byron/gitoxide/commit/fcc3b69867db1628f6a44d0e0dad8f7417f566bc))
+ - Adapt to changes in `gix-worktree` ([`1ca6a3c`](https://github.com/Byron/gitoxide/commit/1ca6a3ce22887c7eb42ec3e0a19f6e1202715745))
+ - Merge branch 'status' ([`68fd5b3`](https://github.com/Byron/gitoxide/commit/68fd5b34e1214d5c2cc7d00dd06e19ee86c00c66))
+ - Cleanup path classificaiton after fixes in `gix-pathspec` ([`44a2e00`](https://github.com/Byron/gitoxide/commit/44a2e005ea8241d026ae542dd4a71cfb6cfd8308))
+ - Merge branch 'cargo-fixes' ([`977346e`](https://github.com/Byron/gitoxide/commit/977346ee61de6207c66f3de003db6e8c722fb81c))
+view details
+
+ * **Uncategorized**
+ - Release gix-index v0.32.1, gix-pathspec v0.7.4, gix-worktree v0.33.1, gix-dir v0.4.1 ([`54ac559`](https://github.com/Byron/gitoxide/commit/54ac55946bb04635cd74582a1ce2e4bee70f2e60))
+ - Prepare changelog prior to `gix-dir` patch release ([`6ca6fa6`](https://github.com/Byron/gitoxide/commit/6ca6fa69b5c21c8d8e9e07e21558e98201504cda))
+ - Assure worktree-roots aren't pruned with pathspecs that are never meant for them. ([`7f2f3ff`](https://github.com/Byron/gitoxide/commit/7f2f3ff8adbecd631c2b4513995d6c94b21742eb))
+ - Merge pull request #1345 from EliahKagan/shell-scripts ([`fe24c89`](https://github.com/Byron/gitoxide/commit/fe24c89e326670deaa3aaa643276d612d866072e))
+ - Add missing +x bit on scripts that are run and not sourced ([`41bf65a`](https://github.com/Byron/gitoxide/commit/41bf65adef6f7d2cdd28fede262173ec7ba10822))
+view details
+
+ * **Uncategorized**
+ - Release gix-trace v0.1.9, gix-utils v0.1.12, gix-packetline-blocking v0.17.4, gix-filter v0.11.1, gix-fs v0.10.2, gix-traverse v0.39.0, gix-worktree-stream v0.12.0, gix-archive v0.12.0, gix-config v0.36.1, gix-url v0.27.3, gix-index v0.32.0, gix-worktree v0.33.0, gix-diff v0.43.0, gix-pathspec v0.7.3, gix-dir v0.4.0, gix-pack v0.50.0, gix-odb v0.60.0, gix-transport v0.42.0, gix-protocol v0.45.0, gix-status v0.9.0, gix-worktree-state v0.10.0, gix v0.62.0, gix-fsck v0.4.0, gitoxide-core v0.37.0, gitoxide v0.35.0, safety bump 14 crates ([`095c673`](https://github.com/Byron/gitoxide/commit/095c6739b2722a8b9af90776b435ef2da454c0e6))
+ - Prepare changelogs prior to release ([`5755271`](https://github.com/Byron/gitoxide/commit/57552717f46f96c35ba4ddc0a64434354ef845e9))
+ - Merge pull request #1341 from szepeviktor/typos ([`55f379b`](https://github.com/Byron/gitoxide/commit/55f379bc47065822d078393d83d30c0835a89782))
+ - Fix typos ([`f72ecce`](https://github.com/Byron/gitoxide/commit/f72ecce45babcad2a0c9b73c79d01ff502907a57))
+ - Merge pull request #1334 from EliahKagan/nonstandard-worktree ([`37732fb`](https://github.com/Byron/gitoxide/commit/37732fb13efdff5a1b8a836943e9e575196724b5))
+ - Let nonstandard worktree fixtures work even if Git < 2.37.2 ([`01d6be9`](https://github.com/Byron/gitoxide/commit/01d6be997fced8695b60d0dc206f87e542037a8d))
+view details
+
+ * **Uncategorized**
+ - Release gix-actor v0.31.1, gix-object v0.42.1, gix-index v0.31.1, gix-pathspec v0.7.2, gix-dir v0.3.0, gix-status v0.8.0, gix v0.61.0, safety bump 2 crates ([`155cc45`](https://github.com/Byron/gitoxide/commit/155cc45730b259e662d7c4be42a469a3af3750e1))
+ - Prepare changelog prior to release ([`129ba3d`](https://github.com/Byron/gitoxide/commit/129ba3deccc9ada0dc571466458845939502763d))
+ - Merge branch 'improvements-for-cargo' ([`41cd53e`](https://github.com/Byron/gitoxide/commit/41cd53e2af76e35e047aac4eca6324774df4cb50))
+ - Allow directory walk to be interrupted with `should_interrupt` flag. ([`35b74e7`](https://github.com/Byron/gitoxide/commit/35b74e7992a5a732b5ae8dbdc264479a91b1d60d))
+ - Allow traversals to start from a symlink that points to a directory ([`e7e91cf`](https://github.com/Byron/gitoxide/commit/e7e91cfaed6d40a773a65fc077b99d2e26bb28f5))
+ - Assure symlinks to directories are ignored with `dir/` declarations in `.gitignore`. ([`cd0c8af`](https://github.com/Byron/gitoxide/commit/cd0c8af78fd7a4f06e33ec2ce06b094b5a490877))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Keep lower-bound of `thiserror` low in `gix-dir` ([`917634f`](https://github.com/Byron/gitoxide/commit/917634fa694a1e91d37f6407e57ae96b3b0aec4b))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+ - Make it possible to use a submodule root for a full walk. ([`434f543`](https://github.com/Byron/gitoxide/commit/434f5434d7242f7f3d6b595f767195c51a3acd86))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Merge branch 'status' ([`d53504a`](https://github.com/Byron/gitoxide/commit/d53504a1fad41cec7b6ca2a4abb7f185d8941e3f))
- Make it even harder to remove your own CWD ([`4d5767c`](https://github.com/Byron/gitoxide/commit/4d5767cd394d755104aa7f0c1ed5b8e01bf74b12))
diff --git a/gix-dir/Cargo.toml b/gix-dir/Cargo.toml
index aa532d5f654..5ed3425ad32 100644
--- a/gix-dir/Cargo.toml
+++ b/gix-dir/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-dir"
-version = "0.1.0"
+version = "0.5.0"
repository = "https://github.com/Byron/gitoxide"
license = "MIT OR Apache-2.0"
description = "A crate of the gitoxide project dealing with directory walks"
@@ -12,19 +12,19 @@ rust-version = "1.65"
doctest = false
[dependencies]
-gix-trace = { version = "^0.1.7", path = "../gix-trace" }
-gix-index = { version = "^0.30.0", path = "../gix-index" }
-gix-discover = { version = "^0.30.0", path = "../gix-discover" }
-gix-fs = { version = "^0.10.0", path = "../gix-fs" }
-gix-path = { version = "^0.10.6", path = "../gix-path" }
-gix-pathspec = { version = "^0.7.0", path = "../gix-pathspec" }
-gix-worktree = { version = "^0.31.0", path = "../gix-worktree", default-features = false }
-gix-object = { version = "^0.41.1", path = "../gix-object" }
-gix-ignore = { version = "^0.11.1", path = "../gix-ignore" }
-gix-utils = { version = "^0.1.10", path = "../gix-utils", features = ["bstr"] }
+gix-trace = { version = "^0.1.9", path = "../gix-trace" }
+gix-index = { version = "^0.33.0", path = "../gix-index" }
+gix-discover = { version = "^0.32.0", path = "../gix-discover" }
+gix-fs = { version = "^0.11.1", path = "../gix-fs" }
+gix-path = { version = "^0.10.7", path = "../gix-path" }
+gix-pathspec = { version = "^0.7.5", path = "../gix-pathspec" }
+gix-worktree = { version = "^0.34.0", path = "../gix-worktree", default-features = false }
+gix-object = { version = "^0.42.2", path = "../gix-object" }
+gix-ignore = { version = "^0.11.2", path = "../gix-ignore" }
+gix-utils = { version = "^0.1.12", path = "../gix-utils", features = ["bstr"] }
bstr = { version = "1.5.0", default-features = false }
-thiserror = "1.0.56"
+thiserror = "1.0.34"
[dev-dependencies]
gix-testtools = { path = "../tests/tools" }
diff --git a/gix-dir/src/entry.rs b/gix-dir/src/entry.rs
index 81c6fae5204..4bfc02e02a4 100644
--- a/gix-dir/src/entry.rs
+++ b/gix-dir/src/entry.rs
@@ -168,6 +168,9 @@ impl Status {
/// This implements the default rules of `git status`, which is good for a minimal traversal through
/// tracked and non-ignored portions of a worktree.
/// `for_deletion` is used to determine if recursion into a directory is allowed even though it otherwise wouldn't be.
+ /// If `worktree_root_is_repository` is `true`, then this status is part of the root of an iteration, and the corresponding
+ /// worktree root is a repository itself. This typically happens for submodules. In this case, recursion rules are relaxed
+ /// to allow traversing submodule worktrees.
///
/// Use `pathspec_match` to determine if a pathspec matches in any way, affecting the decision to recurse.
pub fn can_recurse(
@@ -175,8 +178,15 @@ impl Status {
file_type: Option,
pathspec_match: Option,
for_deletion: Option,
+ worktree_root_is_repository: bool,
) -> bool {
- let is_dir_on_disk = file_type.map_or(false, |ft| ft.is_recursable_dir());
+ let is_dir_on_disk = file_type.map_or(false, |ft| {
+ if worktree_root_is_repository {
+ ft.is_dir()
+ } else {
+ ft.is_recursable_dir()
+ }
+ });
if !is_dir_on_disk {
return false;
}
diff --git a/gix-dir/src/lib.rs b/gix-dir/src/lib.rs
index fffe2d46eb4..79565773bd2 100644
--- a/gix-dir/src/lib.rs
+++ b/gix-dir/src/lib.rs
@@ -59,8 +59,10 @@ pub struct Entry {
}
///
+#[allow(clippy::empty_docs)]
pub mod entry;
///
+#[allow(clippy::empty_docs)]
pub mod walk;
pub use walk::function::walk;
diff --git a/gix-dir/src/walk/classify.rs b/gix-dir/src/walk/classify.rs
index 4b89911d3d1..9fb2b54a5a6 100644
--- a/gix-dir/src/walk/classify.rs
+++ b/gix-dir/src/walk/classify.rs
@@ -4,8 +4,7 @@ use std::borrow::Cow;
use crate::entry::PathspecMatch;
use crate::walk::{Context, Error, ForDeletionMode, Options};
use bstr::{BStr, BString, ByteSlice};
-use std::ffi::OsStr;
-use std::path::{Component, Path, PathBuf};
+use std::path::{Path, PathBuf};
/// Classify the `worktree_relative_root` path and return the first `PathKind` that indicates that
/// it isn't a directory, leaving `buf` with the path matching the returned `PathKind`,
@@ -16,20 +15,18 @@ pub fn root(
worktree_relative_root: &Path,
options: Options,
ctx: &mut Context<'_>,
-) -> Result {
+) -> Result<(Outcome, bool), Error> {
buf.clear();
let mut last_length = None;
let mut path_buf = worktree_root.to_owned();
// These initial values kick in if worktree_relative_root.is_empty();
- let mut out = None;
- for component in worktree_relative_root
- .components()
- .chain(if worktree_relative_root.as_os_str().is_empty() {
- Some(Component::Normal(OsStr::new("")))
- } else {
- None
- })
- {
+ let file_kind = path_buf.symlink_metadata().map(|m| m.file_type().into()).ok();
+ let mut out = path(&mut path_buf, buf, 0, file_kind, || None, options, ctx)?;
+ let worktree_root_is_repository = out
+ .disk_kind
+ .map_or(false, |kind| matches!(kind, entry::Kind::Repository));
+
+ for component in worktree_relative_root.components() {
if last_length.is_some() {
buf.push(b'/');
}
@@ -37,7 +34,7 @@ pub fn root(
buf.extend_from_slice(gix_path::os_str_into_bstr(component.as_os_str()).expect("no illformed UTF8"));
let file_kind = path_buf.symlink_metadata().map(|m| m.file_type().into()).ok();
- let res = path(
+ out = path(
&mut path_buf,
buf,
last_length.map(|l| l + 1 /* slash */).unwrap_or_default(),
@@ -46,16 +43,17 @@ pub fn root(
options,
ctx,
)?;
- out = Some(res);
- if !res
- .status
- .can_recurse(res.disk_kind, res.pathspec_match, options.for_deletion)
- {
+ if !out.status.can_recurse(
+ out.disk_kind,
+ out.pathspec_match,
+ options.for_deletion,
+ worktree_root_is_repository,
+ ) {
break;
}
last_length = Some(buf.len());
}
- Ok(out.expect("One iteration of the loop at least"))
+ Ok((out, worktree_root_is_repository))
}
/// The product of [`path()`] calls.
#[derive(Debug, Copy, Clone)]
@@ -136,6 +134,7 @@ pub fn path(
emit_ignored,
for_deletion,
classify_untracked_bare_repositories,
+ symlinks_to_directories_are_ignored_like_directories,
..
}: Options,
ctx: &mut Context<'_>,
@@ -162,7 +161,11 @@ pub fn path(
.as_mut()
.map_or(Ok(None), |stack| {
stack
- .at_entry(rela_path.as_bstr(), disk_kind.map(|ft| ft.is_dir()), ctx.objects)
+ .at_entry(
+ rela_path.as_bstr(),
+ disk_kind.map(|ft| is_dir_to_mode(ft.is_dir())),
+ ctx.objects,
+ )
.map(|platform| platform.excluded_kind())
})
.map_err(Error::ExcludesAccess)?
@@ -173,10 +176,9 @@ pub fn path(
out.property = entry::Property::DotGit.into();
return Ok(out);
}
- let pathspec_could_match = rela_path.is_empty()
- || ctx
- .pathspec
- .can_match_relative_path(rela_path.as_bstr(), disk_kind.map(|ft| ft.is_dir()));
+ let pathspec_could_match = ctx
+ .pathspec
+ .can_match_relative_path(rela_path.as_bstr(), disk_kind.map(|ft| ft.is_dir()));
if !pathspec_could_match {
return Ok(out.with_status(entry::Status::Pruned));
}
@@ -201,6 +203,15 @@ pub fn path(
.pattern_matching_relative_path(rela_path.as_bstr(), kind.map(|ft| ft.is_dir()), ctx.pathspec_attributes)
.map(Into::into);
+ let is_dir = if symlinks_to_directories_are_ignored_like_directories
+ && ctx.excludes.is_some()
+ && kind.map_or(false, |ft| ft == entry::Kind::Symlink)
+ {
+ path.metadata().ok().map(|md| is_dir_to_mode(md.is_dir()))
+ } else {
+ kind.map(|ft| is_dir_to_mode(ft.is_dir()))
+ };
+
let mut maybe_upgrade_to_repository = |current_kind, find_harder: bool| {
if recurse_repositories {
return current_kind;
@@ -241,13 +252,13 @@ pub fn path(
return Ok(out.with_status(status).with_kind(kind, index_kind));
}
- debug_assert!(maybe_status.is_none(), "It only communicates a single stae right now");
+ debug_assert!(maybe_status.is_none(), "It only communicates a single state right now");
if let Some(excluded) = ctx
.excludes
.as_mut()
.map_or(Ok(None), |stack| {
stack
- .at_entry(rela_path.as_bstr(), kind.map(|ft| ft.is_dir()), ctx.objects)
+ .at_entry(rela_path.as_bstr(), is_dir, ctx.objects)
.map(|platform| platform.excluded_kind())
})
.map_err(Error::ExcludesAccess)?
@@ -401,3 +412,11 @@ fn is_eq(lhs: &BStr, rhs: impl AsRef, ignore_case: bool) -> bool {
lhs == rhs.as_ref()
}
}
+
+fn is_dir_to_mode(is_dir: bool) -> gix_index::entry::Mode {
+ if is_dir {
+ gix_index::entry::Mode::DIR
+ } else {
+ gix_index::entry::Mode::FILE
+ }
+}
diff --git a/gix-dir/src/walk/function.rs b/gix-dir/src/walk/function.rs
index a7ec42f7a3d..f49623d9b0e 100644
--- a/gix-dir/src/walk/function.rs
+++ b/gix-dir/src/walk/function.rs
@@ -60,15 +60,30 @@ pub fn walk(
let (mut current, worktree_root_relative) = assure_no_symlink_in_root(worktree_root, &root)?;
let mut out = Outcome::default();
let mut buf = BString::default();
- let root_info = classify::root(
+ let (root_info, worktree_root_is_repository) = classify::root(
worktree_root,
&mut buf,
worktree_root_relative.as_ref(),
options,
&mut ctx,
)?;
- if !can_recurse(buf.as_bstr(), root_info, options.for_deletion, delegate) {
- if buf.is_empty() && !matches!(root_info.disk_kind, Some(entry::Kind::Directory { .. })) {
+
+ let can_recurse = can_recurse(
+ buf.as_bstr(),
+ if root == worktree_root && root_info.disk_kind == Some(entry::Kind::Symlink) && current.is_dir() {
+ classify::Outcome {
+ disk_kind: Some(entry::Kind::Directory),
+ ..root_info
+ }
+ } else {
+ root_info
+ },
+ options.for_deletion,
+ worktree_root_is_repository,
+ delegate,
+ );
+ if !can_recurse {
+ if buf.is_empty() && !root_info.disk_kind.map_or(false, |kind| kind.is_dir()) {
return Err(Error::WorktreeRootIsFile { root: root.to_owned() });
}
if options.precompose_unicode {
@@ -141,12 +156,18 @@ pub(super) fn can_recurse(
rela_path: &BStr,
info: classify::Outcome,
for_deletion: Option,
+ worktree_root_is_repository: bool,
delegate: &mut dyn Delegate,
) -> bool {
- if info.disk_kind.map_or(true, |k| !k.is_dir()) {
+ let is_dir = info.disk_kind.map_or(false, |k| k.is_dir());
+ if !is_dir {
return false;
}
- delegate.can_recurse(EntryRef::from_outcome(Cow::Borrowed(rela_path), info), for_deletion)
+ delegate.can_recurse(
+ EntryRef::from_outcome(Cow::Borrowed(rela_path), info),
+ for_deletion,
+ worktree_root_is_repository,
+ )
}
/// Possibly emit an entry to `for_each` in case the provided information makes that possible.
diff --git a/gix-dir/src/walk/mod.rs b/gix-dir/src/walk/mod.rs
index 3f593c40d9b..15573a0003e 100644
--- a/gix-dir/src/walk/mod.rs
+++ b/gix-dir/src/walk/mod.rs
@@ -1,6 +1,7 @@
use crate::{entry, EntryRef};
use bstr::BStr;
use std::path::PathBuf;
+use std::sync::atomic::AtomicBool;
/// A type returned by the [`Delegate::emit()`] as passed to [`walk()`](function::walk()).
#[derive(Debug, Copy, Clone, Eq, PartialEq)]
@@ -69,12 +70,24 @@ pub trait Delegate {
/// Use `for_deletion` to specify if the seen entries should ultimately be deleted, which may affect the decision
/// of whether to resource or not.
///
+ /// If `worktree_root_is_repository` is `true`, then this status is part of the root of an iteration, and the corresponding
+ /// worktree root is a repository itself. This typically happens for submodules. In this case, recursion rules are relaxed
+ /// to allow traversing submodule worktrees.
+ ///
/// Note that this method will see all directories, even though not all of them may end up being [emitted](Self::emit()).
/// If this method returns `false`, the `entry` will always be emitted.
- fn can_recurse(&mut self, entry: EntryRef<'_>, for_deletion: Option) -> bool {
- entry
- .status
- .can_recurse(entry.disk_kind, entry.pathspec_match, for_deletion)
+ fn can_recurse(
+ &mut self,
+ entry: EntryRef<'_>,
+ for_deletion: Option,
+ worktree_root_is_repository: bool,
+ ) -> bool {
+ entry.status.can_recurse(
+ entry.disk_kind,
+ entry.pathspec_match,
+ for_deletion,
+ worktree_root_is_repository,
+ )
}
}
@@ -85,7 +98,7 @@ pub trait Delegate {
pub enum EmissionMode {
/// Emit each entry as it matches exactly, without doing any kind of simplification.
///
- /// Emissions in this mode are happening as they occour, without any buffering or ordering.
+ /// Emissions in this mode are happening as they occur, without any buffering or ordering.
#[default]
Matching,
/// Emit only a containing directory if all of its entries are of the same type.
@@ -171,10 +184,22 @@ pub struct Options {
pub emit_empty_directories: bool,
/// If `None`, no entries inside of collapsed directories are emitted. Otherwise, act as specified by `Some(mode)`.
pub emit_collapsed: Option,
+ /// This is a `libgit2` compatibility flag, and if enabled, symlinks that point to directories will be considered a directory
+ /// when checking for exclusion.
+ ///
+ /// This is relevant if `src2` points to `src`, and is excluded with `src2/`. If `false`, `src2` will not be excluded,
+ /// if `true` it will be excluded as the symlink is considered a directory.
+ ///
+ /// In other words, for Git compatibility this flag should be `false`, the default, for `git2` compatibility it should be `true`.
+ pub symlinks_to_directories_are_ignored_like_directories: bool,
}
/// All information that is required to perform a dirwalk, and classify paths properly.
pub struct Context<'a> {
+ /// If not `None`, it will be checked before entering any directory to trigger early interruption.
+ ///
+ /// If this flag is `true` at any point in the iteration, it will abort with an error.
+ pub should_interrupt: Option<&'a AtomicBool>,
/// The `git_dir` of the parent repository, after a call to [`gix_path::realpath()`].
///
/// It's used to help us differentiate our own `.git` directory from nested unrelated repositories,
@@ -190,7 +215,7 @@ pub struct Context<'a> {
/// ### Important
///
/// The index must have been validated so that each entry that is considered up-to-date will have the [gix_index::entry::Flags::UPTODATE] flag
- /// set. Otherwise the index entry is not considered and a disk-access may occour which is costly.
+ /// set. Otherwise the index entry is not considered and a disk-access may occur which is costly.
pub index: &'a gix_index::State,
/// A utility to lookup index entries faster, and deal with ignore-case handling.
///
@@ -249,6 +274,8 @@ pub struct Outcome {
#[derive(Debug, thiserror::Error)]
#[allow(missing_docs)]
pub enum Error {
+ #[error("Interrupted")]
+ Interrupted,
#[error("Worktree root at '{}' is not a directory", root.display())]
WorktreeRootIsFile { root: PathBuf },
#[error("Traversal root '{}' contains relative path components and could not be normalized", root.display())]
diff --git a/gix-dir/src/walk/readdir.rs b/gix-dir/src/walk/readdir.rs
index 05bc5a93301..0618822a652 100644
--- a/gix-dir/src/walk/readdir.rs
+++ b/gix-dir/src/walk/readdir.rs
@@ -1,6 +1,7 @@
use bstr::{BStr, BString, ByteSlice};
use std::borrow::Cow;
use std::path::{Path, PathBuf};
+use std::sync::atomic::Ordering;
use crate::entry::{PathspecMatch, Status};
use crate::walk::function::{can_recurse, emit_entry};
@@ -23,6 +24,9 @@ pub(super) fn recursive(
out: &mut Outcome,
state: &mut State,
) -> Result<(Action, bool), Error> {
+ if ctx.should_interrupt.map_or(false, |flag| flag.load(Ordering::Relaxed)) {
+ return Err(Error::Interrupted);
+ }
out.read_dir_calls += 1;
let entries = gix_fs::read_dir(current, opts.precompose_unicode).map_err(|err| Error::ReadDir {
path: current.to_owned(),
@@ -63,7 +67,13 @@ pub(super) fn recursive(
ctx,
)?;
- if can_recurse(current_bstr.as_bstr(), info, opts.for_deletion, delegate) {
+ if can_recurse(
+ current_bstr.as_bstr(),
+ info,
+ opts.for_deletion,
+ false, /* is root */
+ delegate,
+ ) {
let subdir_may_collapse = state.may_collapse(current);
let (action, subdir_prevent_collapse) = recursive(
subdir_may_collapse,
diff --git a/gix-dir/tests/fixtures/many-symlinks.sh b/gix-dir/tests/fixtures/many-symlinks.sh
old mode 100644
new mode 100755
index f38abf74d18..fdebe1021a7
--- a/gix-dir/tests/fixtures/many-symlinks.sh
+++ b/gix-dir/tests/fixtures/many-symlinks.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
# Note that symlink creation fails on Windows for some reason,
@@ -17,3 +17,29 @@ git init immediate-breakout-symlink
(cd immediate-breakout-symlink
ln -s .. breakout
)
+
+git init excluded-symlinks-to-dir
+(cd excluded-symlinks-to-dir
+ cat <.gitignore
+src1
+src2/
+file1
+file2/
+ignored
+ignored-must-be-dir/
+EOF
+ git add .gitignore && git commit -m "init"
+
+ mkdir src
+ >src/file
+
+ mkdir ignored-must-be-dir ignored
+ touch ignored-must-be-dir/file ignored/file
+
+ ln -s src src1
+ ln -s src src2
+ ln -s src/file file1
+ ln -s src/file file2
+)
+
+ln -s excluded-symlinks-to-dir worktree-root-is-symlink
\ No newline at end of file
diff --git a/gix-dir/tests/fixtures/many.sh b/gix-dir/tests/fixtures/many.sh
old mode 100644
new mode 100755
index 0c17c4d3a3b..96b87022798
--- a/gix-dir/tests/fixtures/many.sh
+++ b/gix-dir/tests/fixtures/many.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
# Nothing here may use symlinks so these fixtures can be used on windows as well.
@@ -29,6 +29,13 @@ git init dir-with-tracked-file
git commit -m "init"
)
+git init repo-with-submodule
+(cd repo-with-submodule
+ git submodule add ../dir-with-tracked-file submodule
+ git commit -m "add submodule"
+ touch submodule/untracked
+)
+
git init ignored-dir
(cd ignored-dir
mkdir dir
@@ -103,24 +110,22 @@ git clone dir-with-tracked-file with-submodule
git init nonstandard-worktree
(cd nonstandard-worktree
mkdir dir-with-dot-git
- mv .git dir-with-dot-git
-
- git -C dir-with-dot-git config core.worktree "$PWD"
touch dir-with-dot-git/inside
touch seemingly-outside
- git -C dir-with-dot-git add inside ../seemingly-outside
+ git add dir-with-dot-git/inside seemingly-outside
+ mv .git dir-with-dot-git
+ git -C dir-with-dot-git config core.worktree "$PWD"
git -C dir-with-dot-git commit -m "init"
)
git init nonstandard-worktree-untracked
(cd nonstandard-worktree-untracked
mkdir dir-with-dot-git
- mv .git dir-with-dot-git
-
- git -C dir-with-dot-git config core.worktree "$PWD"
touch dir-with-dot-git/inside
touch seemingly-outside
- git -C dir-with-dot-git add inside ../seemingly-outside
+ git add dir-with-dot-git/inside seemingly-outside
+ mv .git dir-with-dot-git
+ git -C dir-with-dot-git config core.worktree "$PWD"
git -C dir-with-dot-git commit -m "init"
rm dir-with-dot-git/.git/index
diff --git a/gix-dir/tests/walk/mod.rs b/gix-dir/tests/walk/mod.rs
index 823bf360370..dc880059856 100644
--- a/gix-dir/tests/walk/mod.rs
+++ b/gix-dir/tests/walk/mod.rs
@@ -1,5 +1,6 @@
use gix_dir::{walk, EntryRef};
use pretty_assertions::assert_eq;
+use std::sync::atomic::AtomicBool;
use crate::walk_utils::{
collect, collect_filtered, collect_filtered_with_cwd, entry, entry_dirstat, entry_nokind, entry_nomatch, entryps,
@@ -16,6 +17,81 @@ use gix_dir::walk::EmissionMode::*;
use gix_dir::walk::ForDeletionMode;
use gix_ignore::Kind::*;
+#[test]
+#[cfg_attr(windows, ignore = "symlinks the way they are organized don't yet work on windows")]
+fn symlink_to_dir_can_be_excluded() -> crate::Result {
+ let root = fixture_in("many-symlinks", "excluded-symlinks-to-dir");
+ let ((out, _root), entries) = collect(&root, None, |keep, ctx| {
+ walk(
+ &root,
+ ctx,
+ gix_dir::walk::Options {
+ emit_ignored: Some(Matching),
+ ..options()
+ },
+ keep,
+ )
+ });
+ assert_eq!(
+ out,
+ walk::Outcome {
+ read_dir_calls: 2,
+ returned_entries: entries.len(),
+ seen_entries: 9,
+ }
+ );
+
+ assert_eq!(
+ entries,
+ &[
+ entry("file1", Ignored(Expendable), Symlink),
+ entry("file2", Untracked, Symlink),
+ entry("ignored", Ignored(Expendable), Directory),
+ entry("ignored-must-be-dir", Ignored(Expendable), Directory),
+ entry("src/file", Untracked, File),
+ entry("src1", Ignored(Expendable), Symlink),
+ entry("src2", Untracked, Symlink), /* marked as src2/ in .gitignore */
+ ],
+ "by default, symlinks are counted as files only, even if they point to a directory, when handled by the exclude machinery"
+ );
+
+ let ((out, _root), entries) = collect(&root, None, |keep, ctx| {
+ walk(
+ &root,
+ ctx,
+ gix_dir::walk::Options {
+ emit_ignored: Some(Matching),
+ symlinks_to_directories_are_ignored_like_directories: true,
+ ..options()
+ },
+ keep,
+ )
+ });
+ assert_eq!(
+ out,
+ walk::Outcome {
+ read_dir_calls: 2,
+ returned_entries: entries.len(),
+ seen_entries: 9,
+ }
+ );
+
+ assert_eq!(
+ entries,
+ &[
+ entry("file1", Ignored(Expendable), Symlink),
+ entry("file2", Untracked, Symlink),
+ entry("ignored", Ignored(Expendable), Directory),
+ entry("ignored-must-be-dir", Ignored(Expendable), Directory),
+ entry("src/file", Untracked, File),
+ entry("src1", Ignored(Expendable), Symlink),
+ entry("src2", Ignored(Expendable), Symlink), /* marked as src2/ in .gitignore */
+ ],
+ "with libgit2 compatibility enabled, symlinks to directories are treated like a directory, not symlink"
+ );
+ Ok(())
+}
+
#[test]
#[cfg_attr(windows, ignore = "symlinks the way they are organized don't yet work on windows")]
fn root_may_not_lead_through_symlinks() -> crate::Result {
@@ -43,6 +119,57 @@ fn root_may_not_lead_through_symlinks() -> crate::Result {
Ok(())
}
+#[test]
+#[cfg_attr(windows, ignore = "symlinks the way they are organized don't yet work on windows")]
+fn root_may_be_a_symlink_if_it_is_the_worktree() -> crate::Result {
+ let root = fixture_in("many-symlinks", "worktree-root-is-symlink");
+ let ((_out, _root), entries) = collect(&root, None, |keep, ctx| {
+ walk(
+ &root,
+ ctx,
+ gix_dir::walk::Options {
+ emit_ignored: Some(Matching),
+ symlinks_to_directories_are_ignored_like_directories: true,
+ ..options()
+ },
+ keep,
+ )
+ });
+
+ assert_eq!(
+ entries,
+ &[
+ entry("file1", Ignored(Expendable), Symlink),
+ entry("file2", Untracked, Symlink),
+ entry("ignored", Ignored(Expendable), Directory),
+ entry("ignored-must-be-dir", Ignored(Expendable), Directory),
+ entry("src/file", Untracked, File),
+ entry("src1", Ignored(Expendable), Symlink),
+ entry("src2", Ignored(Expendable), Symlink), /* marked as src2/ in .gitignore */
+ ],
+ "it traversed the directory normally - without this capability, symlinked repos can't be traversed"
+ );
+ Ok(())
+}
+
+#[test]
+fn should_interrupt_works_even_in_empty_directories() {
+ let root = fixture("empty");
+ let should_interrupt = AtomicBool::new(true);
+ let err = try_collect_filtered_opts_collect(
+ &root,
+ None,
+ |keep, ctx| walk(&root, ctx, gix_dir::walk::Options { ..options() }, keep),
+ None::<&str>,
+ Options {
+ should_interrupt: Some(&should_interrupt),
+ ..Default::default()
+ },
+ )
+ .unwrap_err();
+ assert!(matches!(err, gix_dir::walk::Error::Interrupted));
+}
+
#[test]
fn empty_root() -> crate::Result {
let root = fixture("empty");
@@ -1478,7 +1605,7 @@ fn expendable_and_precious_in_ignored_dir_with_pathspec() -> crate::Result {
"with pathspec, we match what's inside and expect to have all the lowest-level paths that have 'ignored' in them.\
It seems strange that 'precious' isn't precious, while 'all-precious' is. However, the ignore-search is special
as it goes backward through directories (using directory-declarations), and aborts if it matched. Thus it finds
- that '$/all-precious/' matched, but in the other cases it maches 'ignored/'.
+ that '$/all-precious/' matched, but in the other cases it matches 'ignored/'.
'other' gets folded and inherits, just like before.
Also, look how the ignore-state overrides the prune-default for DotGit kinds, to have more finegrained classification."
);
@@ -2625,12 +2752,136 @@ fn root_may_not_go_through_dot_git() -> crate::Result {
e.0.pathspec_match = expected_pathspec;
e
}],
- "no traversal happened as root passes though .git"
+ "{dir}: no traversal happened as root passes though .git"
);
}
Ok(())
}
+#[test]
+fn root_at_submodule_repository_allows_walk() -> crate::Result {
+ let root = fixture("repo-with-submodule");
+ let troot = root.join("submodule");
+ let ((out, _root), entries) = try_collect_filtered_opts_collect_with_root(
+ &troot,
+ None,
+ Some(&troot),
+ |keep, ctx| {
+ walk(
+ &troot,
+ ctx,
+ walk::Options {
+ emit_tracked: true,
+ emit_untracked: Matching,
+ ..options()
+ },
+ keep,
+ )
+ },
+ None::<&str>,
+ Options::git_dir("../.git/modules/submodule"),
+ )?;
+
+ assert_eq!(
+ out,
+ walk::Outcome {
+ read_dir_calls: 2,
+ returned_entries: entries.len(),
+ seen_entries: 3,
+ }
+ );
+
+ assert_eq!(
+ entries,
+ [entry("dir/file", Tracked, File), entry("untracked", Untracked, File)],
+ "this is a special case to allow walking submodules specifically, like a normal repository"
+ );
+ Ok(())
+}
+
+#[test]
+fn root_in_submodule_repository_allows_walk() -> crate::Result {
+ let root = fixture("repo-with-submodule");
+ let troot = root.join("submodule");
+ let ((out, _root), entries) = try_collect_filtered_opts_collect_with_root(
+ &troot,
+ None,
+ Some(&troot.join("dir")),
+ |keep, ctx| {
+ walk(
+ &troot,
+ ctx,
+ walk::Options {
+ emit_tracked: true,
+ emit_untracked: Matching,
+ ..options()
+ },
+ keep,
+ )
+ },
+ None::<&str>,
+ Options::git_dir("../.git/modules/submodule"),
+ )?;
+
+ assert_eq!(
+ out,
+ walk::Outcome {
+ read_dir_calls: 1,
+ returned_entries: entries.len(),
+ seen_entries: 1,
+ }
+ );
+
+ assert_eq!(
+ entries,
+ [entry("dir/file", Tracked, File)],
+ "it's also working if the traversal root is inside the subdmodule"
+ );
+ Ok(())
+}
+
+#[test]
+fn root_in_submodule_from_superproject_repository_allows_walk() -> crate::Result {
+ let root = fixture("repo-with-submodule");
+ let troot = root.join("submodule").join("dir");
+ let ((out, _root), entries) = try_collect_filtered_opts_collect_with_root(
+ &root,
+ None,
+ Some(&troot),
+ |keep, ctx| {
+ walk(
+ &troot,
+ ctx,
+ walk::Options {
+ emit_tracked: true,
+ emit_untracked: Matching,
+ ..options()
+ },
+ keep,
+ )
+ },
+ None::<&str>,
+ Default::default(),
+ )?;
+
+ assert_eq!(
+ out,
+ walk::Outcome {
+ read_dir_calls: 1,
+ returned_entries: entries.len(),
+ seen_entries: 1,
+ }
+ );
+
+ assert_eq!(
+ entries,
+ [entry("file", Untracked, File)],
+ "there is no index that has 'file' in it (it's 'dir/file'), hence it's untracked.\
+ But the traversal is possible, even though it might not make the most sense."
+ );
+ Ok(())
+}
+
#[test]
fn root_enters_directory_with_dot_git_in_reconfigured_worktree_tracked() -> crate::Result {
let root = fixture("nonstandard-worktree");
@@ -2797,7 +3048,8 @@ fn root_may_not_go_through_submodule() -> crate::Result {
assert_eq!(
entries,
[entry("submodule", Tracked, Repository)],
- "it refuses to start traversal in a submodule, thus it ends in the directory that is the submodule"
+ "it refuses to start traversal in a submodule, thus it ends in the directory that is the submodule, \
+ if the root is another repository"
);
Ok(())
}
@@ -3705,7 +3957,7 @@ fn root_cannot_pass_through_case_altered_capital_dot_git_if_case_insensitive() -
e.0.pathspec_match = expected_pathspec;
e
}],
- "no traversal happened as root passes though .git, it compares in a case-insensitive fashion"
+ "{dir}: no traversal happened as root passes though .git, it compares in a case-insensitive fashion"
);
}
diff --git a/gix-dir/tests/walk_utils/mod.rs b/gix-dir/tests/walk_utils/mod.rs
index 13ffcb36851..ee279d4d857 100644
--- a/gix-dir/tests/walk_utils/mod.rs
+++ b/gix-dir/tests/walk_utils/mod.rs
@@ -2,6 +2,7 @@ use bstr::BStr;
use gix_dir::{entry, walk, Entry};
use gix_testtools::scripted_fixture_read_only;
use std::path::{Path, PathBuf};
+use std::sync::atomic::AtomicBool;
pub fn fixture_in(filename: &str, name: &str) -> PathBuf {
let root = scripted_fixture_read_only(format!("{filename}.sh")).expect("script works");
@@ -31,6 +32,7 @@ pub fn options_emit_all() -> walk::Options {
emit_untracked: walk::EmissionMode::Matching,
emit_empty_directories: true,
emit_collapsed: None,
+ symlinks_to_directories_are_ignored_like_directories: false,
}
}
@@ -268,7 +270,11 @@ pub fn try_collect_filtered_opts(
cb: impl FnOnce(&mut dyn walk::Delegate, walk::Context) -> Result<(walk::Outcome, PathBuf), walk::Error>,
patterns: impl IntoIterator- >,
delegate: &mut dyn gix_dir::walk::Delegate,
- Options { fresh_index, git_dir }: Options<'_>,
+ Options {
+ fresh_index,
+ git_dir,
+ should_interrupt,
+ }: Options<'_>,
) -> Result<(walk::Outcome, PathBuf), walk::Error> {
let git_dir = worktree_root.join(git_dir.unwrap_or(".git"));
let mut index = std::fs::read(git_dir.join("index")).ok().map_or_else(
@@ -342,6 +348,7 @@ pub fn try_collect_filtered_opts(
excludes: Some(&mut stack),
objects: &gix_object::find::Never,
explicit_traversal_root,
+ should_interrupt,
},
)
}
@@ -349,6 +356,7 @@ pub fn try_collect_filtered_opts(
pub struct Options<'a> {
pub fresh_index: bool,
pub git_dir: Option<&'a str>,
+ pub should_interrupt: Option<&'a AtomicBool>,
}
impl<'a> Options<'a> {
@@ -365,6 +373,7 @@ impl<'a> Default for Options<'a> {
Options {
fresh_index: true,
git_dir: None,
+ should_interrupt: None,
}
}
}
diff --git a/gix-discover/CHANGELOG.md b/gix-discover/CHANGELOG.md
index ef446d78bae..5725e035b5d 100644
--- a/gix-discover/CHANGELOG.md
+++ b/gix-discover/CHANGELOG.md
@@ -5,6 +5,59 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.32.0 (2024-05-22)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 5 commits contributed to the release.
+ - 68 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+
view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge branch 'various-fixes' ([`d6cd449`](https://github.com/Byron/gitoxide/commit/d6cd44930fb204b06e2b70fc6965e7705530c47a))
+ - Update dependencies ([`cd4de83`](https://github.com/Byron/gitoxide/commit/cd4de8327fc195eb862ab6e138f2315a87374f85))
+ - Merge pull request from GHSA-7w47-3wg8-547c ([`79dce79`](https://github.com/Byron/gitoxide/commit/79dce79c62f6072aa2653780d590dc3993dfa401))
+ - Adapt to changes in `gix-ref` ([`d2ae9d5`](https://github.com/Byron/gitoxide/commit/d2ae9d5f11be9f2561f6799d88804d0d8eae33ef))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Merge branch 'tempfile-permissions' ([`7b44c7f`](https://github.com/Byron/gitoxide/commit/7b44c7ff1dc0b8875214d2673c7f52948cf04ff0))
- Release gix-tempfile v13.1.0, gix-lock v13.1.0, safety bump 12 crates ([`8430442`](https://github.com/Byron/gitoxide/commit/84304427dfe4d170c7732161b126961719f70059))
diff --git a/gix-discover/Cargo.toml b/gix-discover/Cargo.toml
index b5c93867bde..f5902cafa49 100644
--- a/gix-discover/Cargo.toml
+++ b/gix-discover/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-discover"
-version = "0.30.0"
+version = "0.32.0"
repository = "https://github.com/Byron/gitoxide"
license = "MIT OR Apache-2.0"
description = "Discover git repositories and check if a directory is a git repository"
@@ -13,11 +13,11 @@ rust-version = "1.65"
doctest = false
[dependencies]
-gix-sec = { version = "^0.10.5", path = "../gix-sec" }
-gix-path = { version = "^0.10.6", path = "../gix-path" }
-gix-ref = { version = "^0.42.0", path = "../gix-ref" }
-gix-hash = { version = "^0.14.1", path = "../gix-hash" }
-gix-fs = { version = "^0.10.0", path = "../gix-fs" }
+gix-sec = { version = "^0.10.6", path = "../gix-sec" }
+gix-path = { version = "^0.10.7", path = "../gix-path" }
+gix-ref = { version = "^0.44.1", path = "../gix-ref" }
+gix-hash = { version = "^0.14.2", path = "../gix-hash" }
+gix-fs = { version = "^0.11.1", path = "../gix-fs" }
bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] }
thiserror = "1.0.26"
@@ -27,11 +27,11 @@ dunce = "1.0.3"
[dev-dependencies]
gix-testtools = { path = "../tests/tools" }
-serial_test = { version = "2.0.0", default-features = false }
+serial_test = { version = "3.1.0", default-features = false }
is_ci = "1.1.1"
[target.'cfg(target_os = "macos")'.dev-dependencies]
-defer = "0.1.0"
+defer = "0.2.1"
[target.'cfg(any(unix, windows))'.dev-dependencies]
tempfile = "3.2.0"
diff --git a/gix-discover/src/is.rs b/gix-discover/src/is.rs
index 055a68e67cd..c0172ef9a06 100644
--- a/gix-discover/src/is.rs
+++ b/gix-discover/src/is.rs
@@ -172,13 +172,7 @@ pub(crate) fn git_with_metadata(
// We expect to be able to parse any ref-hash, so we shouldn't have to know the repos hash here.
// With ref-table, the has is probably stored as part of the ref-db itself, so we can handle it from there.
// In other words, it's important not to fail on detached heads here because we guessed the hash kind wrongly.
- let object_hash_should_not_matter_here = gix_hash::Kind::Sha1;
- let refs = gix_ref::file::Store::at(
- dot_git.as_ref().into(),
- gix_ref::store::WriteReflog::Normal,
- object_hash_should_not_matter_here,
- false,
- );
+ let refs = gix_ref::file::Store::at(dot_git.as_ref().into(), Default::default());
let head = refs.find_loose("HEAD")?;
if head.name.as_bstr() != "HEAD" {
return Err(crate::is_git::Error::MisplacedHead {
diff --git a/gix-discover/src/lib.rs b/gix-discover/src/lib.rs
index a035c5cf6bb..d86fa0e1f75 100644
--- a/gix-discover/src/lib.rs
+++ b/gix-discover/src/lib.rs
@@ -11,9 +11,11 @@ pub const DOT_GIT_DIR: &str = ".git";
pub const MODULES: &str = "modules";
///
+#[allow(clippy::empty_docs)]
pub mod repository;
///
+#[allow(clippy::empty_docs)]
pub mod is_git {
use std::path::PathBuf;
@@ -46,11 +48,14 @@ mod is;
pub use is::{bare as is_bare, git as is_git, submodule_git_dir as is_submodule_git_dir};
///
+#[allow(clippy::empty_docs)]
pub mod upwards;
pub use upwards::function::{discover as upwards, discover_opts as upwards_opts};
///
+#[allow(clippy::empty_docs)]
pub mod path;
///
+#[allow(clippy::empty_docs)]
pub mod parse;
diff --git a/gix-discover/src/parse.rs b/gix-discover/src/parse.rs
index 58971832755..7ff11fb7da2 100644
--- a/gix-discover/src/parse.rs
+++ b/gix-discover/src/parse.rs
@@ -3,6 +3,7 @@ use std::path::PathBuf;
use bstr::ByteSlice;
///
+#[allow(clippy::empty_docs)]
pub mod gitdir {
use bstr::BString;
diff --git a/gix-discover/src/path.rs b/gix-discover/src/path.rs
index f1e446f15d2..2eb841b3d79 100644
--- a/gix-discover/src/path.rs
+++ b/gix-discover/src/path.rs
@@ -3,6 +3,7 @@ use std::{io::Read, path::PathBuf};
use crate::DOT_GIT_DIR;
///
+#[allow(clippy::empty_docs)]
pub mod from_gitdir_file {
/// The error returned by [`from_gitdir_file()`][crate::path::from_gitdir_file()].
#[derive(Debug, thiserror::Error)]
diff --git a/gix-discover/tests/fixtures/generated-archives/make_exfat_repo_darwin.tar.xz b/gix-discover/tests/fixtures/generated-archives/make_exfat_repo_darwin.tar.xz
index dfb904ef920..9f70a620482 100644
Binary files a/gix-discover/tests/fixtures/generated-archives/make_exfat_repo_darwin.tar.xz and b/gix-discover/tests/fixtures/generated-archives/make_exfat_repo_darwin.tar.xz differ
diff --git a/gix-discover/tests/fixtures/generated-archives/make_submodules.tar.xz b/gix-discover/tests/fixtures/generated-archives/make_submodules.tar.xz
index ef8b87c68dc..98f4c73ea35 100644
Binary files a/gix-discover/tests/fixtures/generated-archives/make_submodules.tar.xz and b/gix-discover/tests/fixtures/generated-archives/make_submodules.tar.xz differ
diff --git a/gix-discover/tests/fixtures/make_basic_repo.sh b/gix-discover/tests/fixtures/make_basic_repo.sh
index bdc1be08e30..b0c79baf404 100755
--- a/gix-discover/tests/fixtures/make_basic_repo.sh
+++ b/gix-discover/tests/fixtures/make_basic_repo.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-discover/tests/fixtures/make_exfat_repo_darwin.sh b/gix-discover/tests/fixtures/make_exfat_repo_darwin.sh
index 88709300044..322aad35197 100755
--- a/gix-discover/tests/fixtures/make_exfat_repo_darwin.sh
+++ b/gix-discover/tests/fixtures/make_exfat_repo_darwin.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
[[ $(uname) == Darwin ]] || exit 1
diff --git a/gix-discover/tests/fixtures/make_submodules.sh b/gix-discover/tests/fixtures/make_submodules.sh
index 24e28a5ec3c..9994d6d50e1 100755
--- a/gix-discover/tests/fixtures/make_submodules.sh
+++ b/gix-discover/tests/fixtures/make_submodules.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q module1
diff --git a/gix-discover/tests/path/mod.rs b/gix-discover/tests/path/mod.rs
index b047810bbbd..b0bac5468fa 100644
--- a/gix-discover/tests/path/mod.rs
+++ b/gix-discover/tests/path/mod.rs
@@ -4,7 +4,7 @@ mod from_git_dir_file {
path::{Path, PathBuf},
};
- use gix_testtools::{tempfile, tempfile::NamedTempFile};
+ use gix_testtools::tempfile::NamedTempFile;
#[cfg(not(windows))]
#[test]
diff --git a/gix-features/CHANGELOG.md b/gix-features/CHANGELOG.md
index f02d099fc13..594c18be054 100644
--- a/gix-features/CHANGELOG.md
+++ b/gix-features/CHANGELOG.md
@@ -5,6 +5,61 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.38.2 (2024-05-22)
+
+### Bug Fixes
+
+ - assure high-speed SHA1 assembly is only used in not on Windows
+
+### Commit Statistics
+
+
+
+ - 4 commits contributed to the release over the course of 1 calendar day.
+ - 68 days passed between releases.
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
+ - 1 unique issue was worked on: [#917](https://github.com/Byron/gitoxide/issues/917)
+
+### Commit Details
+
+
+
+view details
+
+ * **[#917](https://github.com/Byron/gitoxide/issues/917)**
+ - Assure high-speed SHA1 assembly is only used in not on Windows ([`2683235`](https://github.com/Byron/gitoxide/commit/268323587faeada1abdd7f933d616af3165a37cf))
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge branch 'various-fixes' ([`d6cd449`](https://github.com/Byron/gitoxide/commit/d6cd44930fb204b06e2b70fc6965e7705530c47a))
+ - Merge pull request from GHSA-7w47-3wg8-547c ([`79dce79`](https://github.com/Byron/gitoxide/commit/79dce79c62f6072aa2653780d590dc3993dfa401))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-utils v0.1.9, gix-features v0.38.0, gix-actor v0.30.0, gix-object v0.41.0, gix-path v0.10.4, gix-glob v0.16.0, gix-attributes v0.22.0, gix-command v0.3.3, gix-packetline-blocking v0.17.3, gix-filter v0.9.0, gix-fs v0.10.0, gix-commitgraph v0.24.0, gix-revwalk v0.12.0, gix-traverse v0.37.0, gix-worktree-stream v0.9.0, gix-archive v0.9.0, gix-config-value v0.14.4, gix-tempfile v13.0.0, gix-lock v13.0.0, gix-ref v0.41.0, gix-sec v0.10.4, gix-config v0.34.0, gix-url v0.27.0, gix-credentials v0.24.0, gix-ignore v0.11.0, gix-index v0.29.0, gix-worktree v0.30.0, gix-diff v0.40.0, gix-discover v0.29.0, gix-mailmap v0.22.0, gix-negotiate v0.12.0, gix-pack v0.47.0, gix-odb v0.57.0, gix-pathspec v0.6.0, gix-packetline v0.17.3, gix-transport v0.41.0, gix-protocol v0.44.0, gix-revision v0.26.0, gix-refspec v0.22.0, gix-status v0.5.0, gix-submodule v0.8.0, gix-worktree-state v0.7.0, gix v0.58.0, safety bump 39 crates ([`eb6aa8f`](https://github.com/Byron/gitoxide/commit/eb6aa8f502314f886fc4ea3d52ab220763968208))
- Prepare changelogs prior to release ([`6a2e0be`](https://github.com/Byron/gitoxide/commit/6a2e0bebfdf012dc2ed0ff2604086081f2a0f96d))
- Merge branch 'dirwalk' ([`5d176fc`](https://github.com/Byron/gitoxide/commit/5d176fc5ab82bfc7c194b4d929e73da9659ae8b8))
- Add `fs::read_dir::DirEntry` with precompose_unicode support. ([`24d081a`](https://github.com/Byron/gitoxide/commit/24d081a0861cca1f3fa657297ad58a937b2d903d))
@@ -70,12 +126,12 @@ A maintenance release without user-facing changes.
### Chore
- - change `rust-version` manifest field back to 1.65.
- They didn't actually need to be higher to work, and changing them
- unecessarily can break downstream CI.
-
- Let's keep this value as low as possible, and only increase it when
- more recent features are actually used.
+- change `rust-version` manifest field back to 1.65.
+ They didn't actually need to be higher to work, and changing them
+ unecessarily can break downstream CI.
+
+ Let's keep this value as low as possible, and only increase it when
+ more recent features are actually used.
### Commit Statistics
@@ -103,8 +159,8 @@ A maintenance release without user-facing changes.
### Chore
- - upgrade MSRV to v1.70
- Our MSRV follows the one of `helix`, which in turn follows Firefox.
+- upgrade MSRV to v1.70
+ Our MSRV follows the one of `helix`, which in turn follows Firefox.
### Commit Statistics
@@ -257,9 +313,9 @@ A maintenance release without user-facing changes.
### Chore (BREAKING)
- - update to the latest `prodash`
- It makes proper usage of `Progress` types easier and allows them to be used
- as `dyn` traits as well.
+- update to the latest `prodash`
+ It makes proper usage of `Progress` types easier and allows them to be used
+ as `dyn` traits as well.
### New Features (BREAKING)
@@ -419,7 +475,7 @@ A maintenance release without user-facing changes.
### Chore
- - Add `clippy::redundant-closure-for-method-calls` lint
+- Add `clippy::redundant-closure-for-method-calls` lint
### New Features
@@ -621,10 +677,10 @@ A maintenance release without any user-facing changes.
### Chore
- - replace `quick-error` with `thiserror`
- This increases the compile time of the crate alone if there is no proc-macro
- in the dependency tree, but will ever so slightly improve compile times for `gix`
- as a whole.
+- replace `quick-error` with `thiserror`
+ This increases the compile time of the crate alone if there is no proc-macro
+ in the dependency tree, but will ever so slightly improve compile times for `gix`
+ as a whole.
### New Features
@@ -742,7 +798,7 @@ A maintenance release without any user-facing changes.
### Chore (BREAKING)
- - upgrade to prodash v23
+- upgrade to prodash v23
### Changed (BREAKING)
@@ -775,8 +831,8 @@ A maintenance release without any user-facing changes.
### Other
- - try-join with static typing works, but…
- …seems like a lot of effort. Probably not worth continuing here
+- try-join with static typing works, but…
+ …seems like a lot of effort. Probably not worth continuing here
### Bug Fixes
@@ -791,8 +847,8 @@ A maintenance release without any user-facing changes.
### Chore
- - uniformize deny attributes
- - update sha-1 dependency to 0.10
+- uniformize deny attributes
+- update sha-1 dependency to 0.10
### New Features
@@ -1432,7 +1488,7 @@ A maintenance release without user-facing changes.
### Chore (BREAKING)
- - upgrade to prodash v23
+- upgrade to prodash v23
## 0.25.1 (2022-12-26)
@@ -1533,7 +1589,7 @@ A maintenance release without breaking changes.
### Chore
- - uniformize deny attributes
+- uniformize deny attributes
### New Features
@@ -1643,7 +1699,7 @@ A maintenance release thanks to upgrade to `prodash` 18.
### Chore
- - update sha-1 dependency to 0.10
+- update sha-1 dependency to 0.10
## 0.19.0 (2022-01-19)
@@ -1651,7 +1707,7 @@ A maintenance release thanks to upgrade to `prodash` 18.
### Chore
- - update sha-1 dependency to 0.10
+- update sha-1 dependency to 0.10
### New Features
@@ -1749,6 +1805,6 @@ This release contains no functional changes.
### Other
- - try-join with static typing works, but…
- …seems like a lot of effort. Probably not worth continuing here
+- try-join with static typing works, but…
+ …seems like a lot of effort. Probably not worth continuing here
diff --git a/gix-features/Cargo.toml b/gix-features/Cargo.toml
index af18eecaac2..2b0d532bdb2 100644
--- a/gix-features/Cargo.toml
+++ b/gix-features/Cargo.toml
@@ -2,7 +2,7 @@
name = "gix-features"
description = "A crate to integrate various capabilities using compile-time feature flags"
repository = "https://github.com/Byron/gitoxide"
-version = "0.38.0"
+version = "0.38.2"
authors = ["Sebastian Thiel "]
license = "MIT OR Apache-2.0"
edition = "2021"
@@ -25,7 +25,7 @@ progress-unit-human-numbers = ["prodash?/unit-human"]
progress-unit-bytes = ["dep:bytesize", "prodash?/unit-bytes"]
## If set, walkdir iterators will be multi-threaded.
-fs-walkdir-parallel = [ "dep:jwalk", "dep:gix-utils" ]
+fs-walkdir-parallel = ["dep:jwalk", "dep:gix-utils"]
## Provide utilities suitable for working with the `std::fs::read_dir()`.
fs-read-dir = ["dep:gix-utils"]
@@ -34,10 +34,10 @@ fs-read-dir = ["dep:gix-utils"]
##
## Note that this may have overhead as well, thus instrumentations should be used stategically, only providing coarse tracing by default and adding details
## only where needed while marking them with the appropriate level.
-tracing = [ "gix-trace/tracing" ]
+tracing = ["gix-trace/tracing"]
## If enabled, detailed tracing is also emitted, which can greatly increase insights but at a cost.
-tracing-detail = [ "gix-trace/tracing-detail" ]
+tracing-detail = ["gix-trace/tracing-detail"]
## Use scoped threads and channels to parallelize common workloads on multiple objects. If enabled, it is used everywhere
## where it makes sense.
@@ -45,7 +45,7 @@ tracing-detail = [ "gix-trace/tracing-detail" ]
## The `threading` module will contain thread-safe primitives for shared ownership and mutation, otherwise these will be their single threaded counterparts.
## This way, single-threaded applications don't have to pay for threaded primitives.
parallel = ["dep:crossbeam-channel",
- "dep:parking_lot"]
+ "dep:parking_lot"]
## If enabled, OnceCell will be made available for interior mutability either in sync or unsync forms.
once_cell = ["dep:once_cell"]
## Makes facilities of the `walkdir` crate partially available.
@@ -117,11 +117,11 @@ path = "tests/pipe.rs"
required-features = ["io-pipe"]
[dependencies]
-gix-hash = { version = "^0.14.1", path = "../gix-hash" }
-gix-trace = { version = "^0.1.7", path = "../gix-trace" }
+gix-hash = { version = "^0.14.2", path = "../gix-hash" }
+gix-trace = { version = "^0.1.8", path = "../gix-trace" }
# for walkdir
-gix-utils = { version = "^0.1.9", path = "../gix-utils", optional = true }
+gix-utils = { version = "^0.1.11", path = "../gix-utils", optional = true }
# 'parallel' feature
crossbeam-channel = { version = "0.5.0", optional = true }
@@ -159,7 +159,7 @@ bstr = { version = "1.3.0", default-features = false }
# Assembly doesn't yet compile on MSVC on windows, but does on GNU, see https://github.com/RustCrypto/asm-hashes/issues/17
# At this time, only aarch64, x86 and x86_64 are supported.
-[target.'cfg(all(any(target_arch = "aarch64", target_arch = "x86", target_arch = "x86_64"), not(target_env = "msvc")))'.dependencies]
+[target.'cfg(all(any(target_arch = "aarch64", target_arch = "x86", target_arch = "x86_64"), not(target_os = "windows")))'.dependencies]
sha1 = { version = "0.10.0", optional = true, features = ["asm"] }
[package.metadata.docs.rs]
diff --git a/gix-features/src/fs.rs b/gix-features/src/fs.rs
index 6f9d2191d67..97f40c367f9 100644
--- a/gix-features/src/fs.rs
+++ b/gix-features/src/fs.rs
@@ -116,6 +116,7 @@ mod walkdir_precompose {
}
///
+#[allow(clippy::empty_docs)]
#[cfg(feature = "fs-read-dir")]
pub mod read_dir {
use std::borrow::Cow;
@@ -142,6 +143,7 @@ pub mod read_dir {
}
///
+#[allow(clippy::empty_docs)]
#[cfg(feature = "fs-walkdir-parallel")]
pub mod walkdir {
use std::borrow::Cow;
@@ -263,6 +265,7 @@ pub mod walkdir {
}
///
+#[allow(clippy::empty_docs)]
#[cfg(all(feature = "walkdir", not(feature = "fs-walkdir-parallel")))]
pub mod walkdir {
use std::borrow::Cow;
diff --git a/gix-features/src/lib.rs b/gix-features/src/lib.rs
index 18342b1d92e..a5674d28206 100644
--- a/gix-features/src/lib.rs
+++ b/gix-features/src/lib.rs
@@ -15,8 +15,10 @@
#![deny(missing_docs, rust_2018_idioms, unsafe_code)]
///
+#[allow(clippy::empty_docs)]
pub mod cache;
///
+#[allow(clippy::empty_docs)]
pub mod decode;
pub mod fs;
pub mod hash;
@@ -30,10 +32,12 @@ pub mod threading;
pub use gix_trace as trace;
///
+#[allow(clippy::empty_docs)]
#[cfg(feature = "zlib")]
pub mod zlib;
///
+#[allow(clippy::empty_docs)]
pub mod iter {
/// An iterator over chunks of input, producing `Vec- ` with a size of `size`, with the last chunk being the remainder and thus
/// potentially smaller than `size`.
diff --git a/gix-features/src/parallel/mod.rs b/gix-features/src/parallel/mod.rs
index 5a0a4b5890d..a3000c86c31 100644
--- a/gix-features/src/parallel/mod.rs
+++ b/gix-features/src/parallel/mod.rs
@@ -174,5 +174,6 @@ where
}
///
+#[allow(clippy::empty_docs)]
pub mod reduce;
pub use reduce::Reduce;
diff --git a/gix-features/src/zlib/mod.rs b/gix-features/src/zlib/mod.rs
index f55660075eb..cc977b4faa8 100644
--- a/gix-features/src/zlib/mod.rs
+++ b/gix-features/src/zlib/mod.rs
@@ -49,4 +49,5 @@ impl Inflate {
}
///
+#[allow(clippy::empty_docs)]
pub mod stream;
diff --git a/gix-features/src/zlib/stream/mod.rs b/gix-features/src/zlib/stream/mod.rs
index 7fb239d3644..c944412e093 100644
--- a/gix-features/src/zlib/stream/mod.rs
+++ b/gix-features/src/zlib/stream/mod.rs
@@ -1,4 +1,6 @@
///
+#[allow(clippy::empty_docs)]
pub mod deflate;
///
+#[allow(clippy::empty_docs)]
pub mod inflate;
diff --git a/gix-filter/CHANGELOG.md b/gix-filter/CHANGELOG.md
index 13c34b266bb..26edbad856a 100644
--- a/gix-filter/CHANGELOG.md
+++ b/gix-filter/CHANGELOG.md
@@ -5,6 +5,85 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.11.2 (2024-05-22)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 5 commits contributed to the release over the course of 3 calendar days.
+ - 38 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+
view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge branch 'various-fixes' ([`d6cd449`](https://github.com/Byron/gitoxide/commit/d6cd44930fb204b06e2b70fc6965e7705530c47a))
+ - Update dependencies ([`cd4de83`](https://github.com/Byron/gitoxide/commit/cd4de8327fc195eb862ab6e138f2315a87374f85))
+ - Merge pull request from GHSA-7w47-3wg8-547c ([`79dce79`](https://github.com/Byron/gitoxide/commit/79dce79c62f6072aa2653780d590dc3993dfa401))
+ - Adapt to changes in `gix-worktree` ([`1ca6a3c`](https://github.com/Byron/gitoxide/commit/1ca6a3ce22887c7eb42ec3e0a19f6e1202715745))
+view details
+
+ * **Uncategorized**
+ - Release gix-trace v0.1.9, gix-utils v0.1.12, gix-packetline-blocking v0.17.4, gix-filter v0.11.1, gix-fs v0.10.2, gix-traverse v0.39.0, gix-worktree-stream v0.12.0, gix-archive v0.12.0, gix-config v0.36.1, gix-url v0.27.3, gix-index v0.32.0, gix-worktree v0.33.0, gix-diff v0.43.0, gix-pathspec v0.7.3, gix-dir v0.4.0, gix-pack v0.50.0, gix-odb v0.60.0, gix-transport v0.42.0, gix-protocol v0.45.0, gix-status v0.9.0, gix-worktree-state v0.10.0, gix v0.62.0, gix-fsck v0.4.0, gitoxide-core v0.37.0, gitoxide v0.35.0, safety bump 14 crates ([`095c673`](https://github.com/Byron/gitoxide/commit/095c6739b2722a8b9af90776b435ef2da454c0e6))
+ - Prepare changelogs prior to release ([`5755271`](https://github.com/Byron/gitoxide/commit/57552717f46f96c35ba4ddc0a64434354ef845e9))
+ - Merge pull request #1341 from szepeviktor/typos ([`55f379b`](https://github.com/Byron/gitoxide/commit/55f379bc47065822d078393d83d30c0835a89782))
+ - Fix typos ([`f72ecce`](https://github.com/Byron/gitoxide/commit/f72ecce45babcad2a0c9b73c79d01ff502907a57))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Merge branch 'entryoom' ([`684fa5c`](https://github.com/Byron/gitoxide/commit/684fa5caf82fc38dd238361d6482e77901ca0265))
- Allow buffer operations to fail gracefully on out-of-memory. ([`fc68140`](https://github.com/Byron/gitoxide/commit/fc6814024215441a9cea331f81a823a360d3f622))
@@ -69,12 +149,12 @@ A maintenance release without user-facing changes.
### Chore
- - change `rust-version` manifest field back to 1.65.
- They didn't actually need to be higher to work, and changing them
- unecessarily can break downstream CI.
-
- Let's keep this value as low as possible, and only increase it when
- more recent features are actually used.
+- change `rust-version` manifest field back to 1.65.
+ They didn't actually need to be higher to work, and changing them
+ unecessarily can break downstream CI.
+
+ Let's keep this value as low as possible, and only increase it when
+ more recent features are actually used.
### Commit Statistics
@@ -102,8 +182,8 @@ A maintenance release without user-facing changes.
### Chore
- - upgrade MSRV to v1.70
- Our MSRV follows the one of `helix`, which in turn follows Firefox.
+- upgrade MSRV to v1.70
+ Our MSRV follows the one of `helix`, which in turn follows Firefox.
### Commit Statistics
@@ -326,7 +406,7 @@ A maintenance release without user-facing changes.
### Chore
- - don't call crate 'WIP' in manifest anymore.
+- don't call crate 'WIP' in manifest anymore.
### Commit Statistics
@@ -471,8 +551,8 @@ An empty crate without any content to reserve the name for the gitoxide project.
### Chore
- - uniformize deny attributes
- - remove default link to cargo doc everywhere
+- uniformize deny attributes
+- remove default link to cargo doc everywhere
### Commit Statistics
diff --git a/gix-filter/Cargo.toml b/gix-filter/Cargo.toml
index 928066b5889..95e411243f4 100644
--- a/gix-filter/Cargo.toml
+++ b/gix-filter/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-filter"
-version = "0.10.0"
+version = "0.11.2"
repository = "https://github.com/Byron/gitoxide"
license = "MIT OR Apache-2.0"
description = "A crate of the gitoxide project implementing git filters"
@@ -13,15 +13,15 @@ include = ["src/**/*", "LICENSE-*"]
doctest = false
[dependencies]
-gix-hash = { version = "^0.14.1", path = "../gix-hash" }
-gix-trace = { version = "^0.1.7", path = "../gix-trace" }
-gix-object = { version = "^0.41.1", path = "../gix-object" }
-gix-command = { version = "^0.3.5", path = "../gix-command" }
-gix-quote = { version = "^0.4.11", path = "../gix-quote" }
-gix-utils = { version = "^0.1.10", path = "../gix-utils" }
-gix-path = { version = "^0.10.6", path = "../gix-path" }
-gix-packetline = { package = "gix-packetline-blocking", version = "^0.17.3", path = "../gix-packetline-blocking" }
-gix-attributes = { version = "^0.22.1", path = "../gix-attributes" }
+gix-hash = { version = "^0.14.2", path = "../gix-hash" }
+gix-trace = { version = "^0.1.9", path = "../gix-trace" }
+gix-object = { version = "^0.42.2", path = "../gix-object" }
+gix-command = { version = "^0.3.7", path = "../gix-command" }
+gix-quote = { version = "^0.4.12", path = "../gix-quote" }
+gix-utils = { version = "^0.1.12", path = "../gix-utils" }
+gix-path = { version = "^0.10.7", path = "../gix-path" }
+gix-packetline = { package = "gix-packetline-blocking", version = "^0.17.4", path = "../gix-packetline-blocking" }
+gix-attributes = { version = "^0.22.2", path = "../gix-attributes" }
encoding_rs = "0.8.32"
bstr = { version = "1.5.0", default-features = false, features = ["std"] }
@@ -30,6 +30,6 @@ smallvec = "1.10.0"
[dev-dependencies]
-serial_test = { version = "2.0.0", default-features = false }
+serial_test = { version = "3.1.0", default-features = false }
gix-testtools = { path = "../tests/tools" }
gix-worktree = { path = "../gix-worktree", default-features = false, features = ["attributes"] }
diff --git a/gix-filter/src/driver/delayed.rs b/gix-filter/src/driver/delayed.rs
index 4599ac61098..434afb38c81 100644
--- a/gix-filter/src/driver/delayed.rs
+++ b/gix-filter/src/driver/delayed.rs
@@ -6,6 +6,7 @@ use crate::{
};
///
+#[allow(clippy::empty_docs)]
pub mod list {
use crate::driver;
@@ -23,6 +24,7 @@ pub mod list {
}
///
+#[allow(clippy::empty_docs)]
pub mod fetch {
use crate::driver;
diff --git a/gix-filter/src/driver/mod.rs b/gix-filter/src/driver/mod.rs
index 43d3edb2f8b..f85c996ee0c 100644
--- a/gix-filter/src/driver/mod.rs
+++ b/gix-filter/src/driver/mod.rs
@@ -3,18 +3,23 @@ use std::collections::HashMap;
use bstr::{BStr, BString, ByteSlice, ByteVec};
///
+#[allow(clippy::empty_docs)]
pub mod init;
///
+#[allow(clippy::empty_docs)]
pub mod apply;
///
+#[allow(clippy::empty_docs)]
pub mod shutdown;
///
+#[allow(clippy::empty_docs)]
pub mod delayed;
///
+#[allow(clippy::empty_docs)]
pub mod process;
/// A literal driver process.
diff --git a/gix-filter/src/driver/process/client.rs b/gix-filter/src/driver/process/client.rs
index 912b1629091..40a3c97e3c8 100644
--- a/gix-filter/src/driver/process/client.rs
+++ b/gix-filter/src/driver/process/client.rs
@@ -8,6 +8,7 @@ use crate::driver::{
};
///
+#[allow(clippy::empty_docs)]
pub mod handshake {
/// The error returned by [Client::handshake()][super::Client::handshake()].
#[derive(Debug, thiserror::Error)]
@@ -23,6 +24,7 @@ pub mod handshake {
}
///
+#[allow(clippy::empty_docs)]
pub mod invoke {
/// The error returned by [Client::invoke()][super::Client::invoke()].
#[derive(Debug, thiserror::Error)]
@@ -33,6 +35,7 @@ pub mod invoke {
}
///
+ #[allow(clippy::empty_docs)]
pub mod without_content {
/// The error returned by [Client::invoke_without_content()][super::super::Client::invoke_without_content()].
#[derive(Debug, thiserror::Error)]
diff --git a/gix-filter/src/driver/process/mod.rs b/gix-filter/src/driver/process/mod.rs
index c2f62ddd260..d8e95806ef7 100644
--- a/gix-filter/src/driver/process/mod.rs
+++ b/gix-filter/src/driver/process/mod.rs
@@ -104,9 +104,11 @@ impl Status {
}
///
+#[allow(clippy::empty_docs)]
pub mod client;
///
+#[allow(clippy::empty_docs)]
pub mod server;
type PacketlineReader<'a, T = std::process::ChildStdout> =
diff --git a/gix-filter/src/driver/process/server.rs b/gix-filter/src/driver/process/server.rs
index 9a634e5ad38..7b2ad17afd7 100644
--- a/gix-filter/src/driver/process/server.rs
+++ b/gix-filter/src/driver/process/server.rs
@@ -14,6 +14,7 @@ pub struct Request<'a> {
}
///
+#[allow(clippy::empty_docs)]
pub mod next_request {
use bstr::BString;
@@ -31,6 +32,7 @@ pub mod next_request {
}
///
+#[allow(clippy::empty_docs)]
pub mod handshake {
/// The error returned by [Server::handshake()][super::Server::handshake()].
#[derive(Debug, thiserror::Error)]
diff --git a/gix-filter/src/eol/mod.rs b/gix-filter/src/eol/mod.rs
index ad1553826e0..7cd7be7eb3f 100644
--- a/gix-filter/src/eol/mod.rs
+++ b/gix-filter/src/eol/mod.rs
@@ -1,4 +1,5 @@
///
+#[allow(clippy::empty_docs)]
pub mod convert_to_git;
pub use convert_to_git::function::convert_to_git;
diff --git a/gix-filter/src/lib.rs b/gix-filter/src/lib.rs
index fbe250607e5..b816237b80c 100644
--- a/gix-filter/src/lib.rs
+++ b/gix-filter/src/lib.rs
@@ -29,6 +29,7 @@ pub mod worktree;
pub mod driver;
///
+#[allow(clippy::empty_docs)]
pub mod pipeline;
/// The standard git filter pipeline comprised of multiple standard filters and support for external filters.
diff --git a/gix-filter/src/pipeline/convert.rs b/gix-filter/src/pipeline/convert.rs
index 0572dd451b1..8154f98e40b 100644
--- a/gix-filter/src/pipeline/convert.rs
+++ b/gix-filter/src/pipeline/convert.rs
@@ -5,6 +5,7 @@ use bstr::BStr;
use crate::{driver, eol, ident, pipeline::util::Configuration, worktree, Pipeline};
///
+#[allow(clippy::empty_docs)]
pub mod configuration {
use bstr::BString;
@@ -20,6 +21,7 @@ pub mod configuration {
}
///
+#[allow(clippy::empty_docs)]
pub mod to_git {
/// A function that fills `buf` `fn(&mut buf)` with the data stored in the index of the file that should be converted.
pub type IndexObjectFn<'a> = dyn FnMut(&mut Vec) -> Result, gix_object::find::Error> + 'a;
@@ -44,6 +46,7 @@ pub mod to_git {
}
///
+#[allow(clippy::empty_docs)]
pub mod to_worktree {
/// The error returned by [Pipeline::convert_to_worktree()][super::Pipeline::convert_to_worktree()].
#[derive(Debug, thiserror::Error)]
diff --git a/gix-filter/src/pipeline/mod.rs b/gix-filter/src/pipeline/mod.rs
index 7dff070a4ce..a5f556ee8d5 100644
--- a/gix-filter/src/pipeline/mod.rs
+++ b/gix-filter/src/pipeline/mod.rs
@@ -110,6 +110,7 @@ impl Pipeline {
}
///
+#[allow(clippy::empty_docs)]
pub mod convert;
pub(crate) mod util;
diff --git a/gix-filter/src/worktree/encoding.rs b/gix-filter/src/worktree/encoding.rs
index 0b75adc96aa..df4b1ee7985 100644
--- a/gix-filter/src/worktree/encoding.rs
+++ b/gix-filter/src/worktree/encoding.rs
@@ -2,6 +2,7 @@ use bstr::BStr;
use encoding_rs::Encoding;
///
+#[allow(clippy::empty_docs)]
pub mod for_label {
use bstr::BString;
diff --git a/gix-filter/src/worktree/mod.rs b/gix-filter/src/worktree/mod.rs
index 3b13ea49ede..167d1266e32 100644
--- a/gix-filter/src/worktree/mod.rs
+++ b/gix-filter/src/worktree/mod.rs
@@ -5,12 +5,15 @@
//! can be taken, which we do not yet take unless there is specific examples or problems to solve.
///
+#[allow(clippy::empty_docs)]
pub mod encoding;
///
+#[allow(clippy::empty_docs)]
pub mod encode_to_git;
pub use encode_to_git::function::encode_to_git;
///
+#[allow(clippy::empty_docs)]
pub mod encode_to_worktree;
pub use encode_to_worktree::function::encode_to_worktree;
diff --git a/gix-filter/tests/eol/convert_to_worktree.rs b/gix-filter/tests/eol/convert_to_worktree.rs
index 25e50312133..d61a1ea96c7 100644
--- a/gix-filter/tests/eol/convert_to_worktree.rs
+++ b/gix-filter/tests/eol/convert_to_worktree.rs
@@ -59,7 +59,7 @@ fn no_conversion_if_nothing_to_do() -> crate::Result {
"mixed crlf and lf is avoided",
),
(
- &b"elligible-but-disabled\nhere"[..],
+ &b"eligible-but-disabled\nhere"[..],
AttributesDigest::Binary,
"designated binary is never handled",
),
diff --git a/gix-filter/tests/fixtures/baseline.sh b/gix-filter/tests/fixtures/baseline.sh
index c02b3c22aef..c27d559bb28 100755
--- a/gix-filter/tests/fixtures/baseline.sh
+++ b/gix-filter/tests/fixtures/baseline.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
driver=${1:?First argument is the driver program supporting both process mode and clean/smudge}
@@ -17,7 +17,7 @@ function repo_assertions() {
git config filter.arrow.clean "$driver clean %f"
git config filter.arrow.smudge "$driver smudge %f"
- git config filter.arrow.requred true
+ git config filter.arrow.required true
repo_assertions
)
@@ -26,7 +26,7 @@ function repo_assertions() {
git init process && cd process
git config filter.arrow.process "$driver process"
- git config filter.arrow.requred true
+ git config filter.arrow.required true
repo_assertions
)
@@ -35,7 +35,7 @@ function repo_assertions() {
git init process-no-delay && cd process-no-delay
git config filter.arrow.process "$driver process disallow-delay"
- git config filter.arrow.requred true
+ git config filter.arrow.required true
repo_assertions
)
diff --git a/gix-filter/tests/fixtures/generated-archives/pipeline_repos.tar.xz b/gix-filter/tests/fixtures/generated-archives/pipeline_repos.tar.xz
index 2079bf649fc..549b249f39e 100644
Binary files a/gix-filter/tests/fixtures/generated-archives/pipeline_repos.tar.xz and b/gix-filter/tests/fixtures/generated-archives/pipeline_repos.tar.xz differ
diff --git a/gix-filter/tests/fixtures/pipeline_repos.sh b/gix-filter/tests/fixtures/pipeline_repos.sh
index e2f64f99e62..c6360c7a090 100755
--- a/gix-filter/tests/fixtures/pipeline_repos.sh
+++ b/gix-filter/tests/fixtures/pipeline_repos.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
(mkdir all-filters && cd all-filters
diff --git a/gix-filter/tests/pipeline/convert_to_git.rs b/gix-filter/tests/pipeline/convert_to_git.rs
index 79d79993238..5cff5c888e3 100644
--- a/gix-filter/tests/pipeline/convert_to_git.rs
+++ b/gix-filter/tests/pipeline/convert_to_git.rs
@@ -53,7 +53,7 @@ fn all_stages_mean_streaming_is_impossible() -> gix_testtools::Result {
Path::new("any.txt"),
&mut |path, attrs| {
cache
- .at_entry(path, Some(false), &gix_object::find::Never)
+ .at_entry(path, None, &gix_object::find::Never)
.expect("cannot fail")
.matching_attributes(attrs);
},
@@ -82,7 +82,7 @@ fn only_driver_means_streaming_is_possible() -> gix_testtools::Result {
Path::new("subdir/doesnot/matter/any.txt"),
&mut |path, attrs| {
cache
- .at_entry(path, Some(false), &gix_object::find::Never)
+ .at_entry(path, None, &gix_object::find::Never)
.expect("cannot fail")
.matching_attributes(attrs);
},
@@ -112,7 +112,7 @@ fn no_filter_means_reader_is_returned_unchanged() -> gix_testtools::Result {
Path::new("other.txt"),
&mut |path, attrs| {
cache
- .at_entry(path, Some(false), &gix_object::find::Never)
+ .at_entry(path, None, &gix_object::find::Never)
.expect("cannot fail")
.matching_attributes(attrs);
},
diff --git a/gix-filter/tests/pipeline/convert_to_worktree.rs b/gix-filter/tests/pipeline/convert_to_worktree.rs
index 2449c50304a..be757e01ab8 100644
--- a/gix-filter/tests/pipeline/convert_to_worktree.rs
+++ b/gix-filter/tests/pipeline/convert_to_worktree.rs
@@ -21,7 +21,7 @@ fn all_stages() -> gix_testtools::Result {
"any.txt".into(),
&mut |path, attrs| {
cache
- .at_entry(path, Some(false), &gix_object::find::Never)
+ .at_entry(path, None, &gix_object::find::Never)
.expect("cannot fail")
.matching_attributes(attrs);
},
@@ -54,7 +54,7 @@ fn all_stages_no_filter() -> gix_testtools::Result {
"other.txt".into(),
&mut |path, attrs| {
cache
- .at_entry(path, Some(false), &gix_object::find::Never)
+ .at_entry(path, None, &gix_object::find::Never)
.expect("cannot fail")
.matching_attributes(attrs);
},
@@ -86,7 +86,7 @@ fn no_filter() -> gix_testtools::Result {
"other.txt".into(),
&mut |path, attrs| {
cache
- .at_entry(path, Some(false), &gix_object::find::Never)
+ .at_entry(path, None, &gix_object::find::Never)
.expect("cannot fail")
.matching_attributes(attrs);
},
diff --git a/gix-fs/CHANGELOG.md b/gix-fs/CHANGELOG.md
index b7d36bf40f2..8b8918e1792 100644
--- a/gix-fs/CHANGELOG.md
+++ b/gix-fs/CHANGELOG.md
@@ -5,6 +5,137 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.11.1 (2024-05-28)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 3 commits contributed to the release.
+ - 6 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Prepare gix-fs changelog prior to release ([`eb7880b`](https://github.com/Byron/gitoxide/commit/eb7880b32803d5d91a1be563da07f80d3213f7d0))
+ - Merge branch 'dir-as-ignore' ([`31d2f0a`](https://github.com/Byron/gitoxide/commit/31d2f0a742257d7031df114f0c92197a0781921e))
+ - Adapt to changes in `gix-glob` ([`5fbbaaa`](https://github.com/Byron/gitoxide/commit/5fbbaaa10d919dd216badb05b2fae32d5dd955c9))
+view details
+
+ * **[#1354](https://github.com/Byron/gitoxide/issues/1354)**
+ - Default to creating file-symlinks if it is dangling on Windows ([`31d02a8`](https://github.com/Byron/gitoxide/commit/31d02a89ee15a0df463a5b5c34864497f8adfae1))
+ * **[#1373](https://github.com/Byron/gitoxide/issues/1373)**
+ - Multi-process safe parallel filesystem capabilities probing ([`bec648d`](https://github.com/Byron/gitoxide/commit/bec648dc5790186cddbe12277978baf572f8e164))
+ * **Uncategorized**
+ - Release gix-features v0.38.2, gix-actor v0.31.2, gix-validate v0.8.5, gix-object v0.42.2, gix-command v0.3.7, gix-filter v0.11.2, gix-fs v0.11.0, gix-revwalk v0.13.1, gix-traverse v0.39.1, gix-worktree-stream v0.13.0, gix-archive v0.13.0, gix-tempfile v14.0.0, gix-lock v14.0.0, gix-ref v0.44.0, gix-config v0.37.0, gix-prompt v0.8.5, gix-index v0.33.0, gix-worktree v0.34.0, gix-diff v0.44.0, gix-discover v0.32.0, gix-pathspec v0.7.5, gix-dir v0.5.0, gix-macros v0.1.5, gix-mailmap v0.23.1, gix-negotiate v0.13.1, gix-pack v0.51.0, gix-odb v0.61.0, gix-transport v0.42.1, gix-protocol v0.45.1, gix-revision v0.27.1, gix-status v0.10.0, gix-submodule v0.11.0, gix-worktree-state v0.11.0, gix v0.63.0, gitoxide-core v0.38.0, gitoxide v0.36.0, safety bump 19 crates ([`4f98e94`](https://github.com/Byron/gitoxide/commit/4f98e94e0e8b79ed2899b35bef40f3c30b3025b0))
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge branch 'various-fixes' ([`d6cd449`](https://github.com/Byron/gitoxide/commit/d6cd44930fb204b06e2b70fc6965e7705530c47a))
+ - Merge pull request from GHSA-7w47-3wg8-547c ([`79dce79`](https://github.com/Byron/gitoxide/commit/79dce79c62f6072aa2653780d590dc3993dfa401))
+ - Apply suggestions from code review ([`1242151`](https://github.com/Byron/gitoxide/commit/1242151079004ae99fae7b80966de151961a6159))
+ - Adapt to changes in `gix-index` ([`5f86e6b`](https://github.com/Byron/gitoxide/commit/5f86e6b11bb73921b458ffee9091bc028a7d6204))
+ - Apply suggestions from code review ([`ccbc119`](https://github.com/Byron/gitoxide/commit/ccbc1197b6dcb7e7118e206183582d6b46fc5ebc))
+ - Address review comments ([`fcc3b69`](https://github.com/Byron/gitoxide/commit/fcc3b69867db1628f6a44d0e0dad8f7417f566bc))
+ - Apply suggestions from code review ([`bad9a79`](https://github.com/Byron/gitoxide/commit/bad9a797b99880ce9d1c20e11c801bd0e741db64))
+ - Validate all components pushed onto the stack when creating leading paths. ([`874cfd6`](https://github.com/Byron/gitoxide/commit/874cfd6dd7e371f178ec5f63368220b272608805))
+ - Add validation for path components and tree-names ([`0d78db2`](https://github.com/Byron/gitoxide/commit/0d78db2440c3866bfa972c8773aa7d8e7b245f2e))
+ - Merge branch 'status' ([`04ef31e`](https://github.com/Byron/gitoxide/commit/04ef31e9d6f5332d49037a5a4c248ebbb5aaf92b))
+ - Improve the symlink probing by simplifying it ([`7a3c583`](https://github.com/Byron/gitoxide/commit/7a3c583d51629697804c9f6d122b505b0afcefc8))
+view details
+
+ * **Uncategorized**
+ - Release gix-trace v0.1.9, gix-utils v0.1.12, gix-packetline-blocking v0.17.4, gix-filter v0.11.1, gix-fs v0.10.2, gix-traverse v0.39.0, gix-worktree-stream v0.12.0, gix-archive v0.12.0, gix-config v0.36.1, gix-url v0.27.3, gix-index v0.32.0, gix-worktree v0.33.0, gix-diff v0.43.0, gix-pathspec v0.7.3, gix-dir v0.4.0, gix-pack v0.50.0, gix-odb v0.60.0, gix-transport v0.42.0, gix-protocol v0.45.0, gix-status v0.9.0, gix-worktree-state v0.10.0, gix v0.62.0, gix-fsck v0.4.0, gitoxide-core v0.37.0, gitoxide v0.35.0, safety bump 14 crates ([`095c673`](https://github.com/Byron/gitoxide/commit/095c6739b2722a8b9af90776b435ef2da454c0e6))
+ - Prepare changelogs prior to release ([`5755271`](https://github.com/Byron/gitoxide/commit/57552717f46f96c35ba4ddc0a64434354ef845e9))
+ - Merge pull request #1341 from szepeviktor/typos ([`55f379b`](https://github.com/Byron/gitoxide/commit/55f379bc47065822d078393d83d30c0835a89782))
+ - Fix typos ([`f72ecce`](https://github.com/Byron/gitoxide/commit/f72ecce45babcad2a0c9b73c79d01ff502907a57))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-utils v0.1.9, gix-features v0.38.0, gix-actor v0.30.0, gix-object v0.41.0, gix-path v0.10.4, gix-glob v0.16.0, gix-attributes v0.22.0, gix-command v0.3.3, gix-packetline-blocking v0.17.3, gix-filter v0.9.0, gix-fs v0.10.0, gix-commitgraph v0.24.0, gix-revwalk v0.12.0, gix-traverse v0.37.0, gix-worktree-stream v0.9.0, gix-archive v0.9.0, gix-config-value v0.14.4, gix-tempfile v13.0.0, gix-lock v13.0.0, gix-ref v0.41.0, gix-sec v0.10.4, gix-config v0.34.0, gix-url v0.27.0, gix-credentials v0.24.0, gix-ignore v0.11.0, gix-index v0.29.0, gix-worktree v0.30.0, gix-diff v0.40.0, gix-discover v0.29.0, gix-mailmap v0.22.0, gix-negotiate v0.12.0, gix-pack v0.47.0, gix-odb v0.57.0, gix-pathspec v0.6.0, gix-packetline v0.17.3, gix-transport v0.41.0, gix-protocol v0.44.0, gix-revision v0.26.0, gix-refspec v0.22.0, gix-status v0.5.0, gix-submodule v0.8.0, gix-worktree-state v0.7.0, gix v0.58.0, safety bump 39 crates ([`eb6aa8f`](https://github.com/Byron/gitoxide/commit/eb6aa8f502314f886fc4ea3d52ab220763968208))
- Prepare changelogs prior to release ([`6a2e0be`](https://github.com/Byron/gitoxide/commit/6a2e0bebfdf012dc2ed0ff2604086081f2a0f96d))
- Merge branch 'dirwalk' ([`5d176fc`](https://github.com/Byron/gitoxide/commit/5d176fc5ab82bfc7c194b4d929e73da9659ae8b8))
- Add `read_dir(precompose_unicode)` ([`f6e4bba`](https://github.com/Byron/gitoxide/commit/f6e4bba28062faf29795a87e0e569366df0ab4f1))
@@ -43,12 +175,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Chore
- - change `rust-version` manifest field back to 1.65.
- They didn't actually need to be higher to work, and changing them
- unecessarily can break downstream CI.
-
- Let's keep this value as low as possible, and only increase it when
- more recent features are actually used.
+- change `rust-version` manifest field back to 1.65.
+ They didn't actually need to be higher to work, and changing them
+ unecessarily can break downstream CI.
+
+ Let's keep this value as low as possible, and only increase it when
+ more recent features are actually used.
### Commit Statistics
@@ -76,8 +208,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Chore
- - upgrade MSRV to v1.70
- Our MSRV follows the one of `helix`, which in turn follows Firefox.
+- upgrade MSRV to v1.70
+ Our MSRV follows the one of `helix`, which in turn follows Firefox.
### Commit Statistics
@@ -335,7 +467,7 @@ A maintenance release without user-facing changes.
### Chore
- - inline format args
+- inline format args
### Commit Statistics
diff --git a/gix-fs/Cargo.toml b/gix-fs/Cargo.toml
index 931226f9b42..830b23bbfef 100644
--- a/gix-fs/Cargo.toml
+++ b/gix-fs/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-fs"
-version = "0.10.0"
+version = "0.11.1"
repository = "https://github.com/Byron/gitoxide"
license = "MIT OR Apache-2.0"
description = "A crate providing file system specific utilities to `gitoxide`"
@@ -17,9 +17,13 @@ doctest = false
serde = ["dep:serde"]
[dependencies]
-gix-features = { version = "^0.38.0", path = "../gix-features", features = ["fs-read-dir"] }
-gix-utils = { version = "^0.1.9", path = "../gix-utils" }
+gix-features = { version = "^0.38.2", path = "../gix-features", features = ["fs-read-dir"] }
+gix-utils = { version = "^0.1.12", path = "../gix-utils" }
serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"] }
+# For `Capabilities` to assure parallel operation works.
+fastrand = { version = "2.1.0", default-features = false, features = ["std"] }
+
[dev-dependencies]
tempfile = "3.5.0"
+crossbeam-channel = "0.5.0"
diff --git a/gix-fs/src/capabilities.rs b/gix-fs/src/capabilities.rs
index 4c0d2f8d95e..4fa6892eed7 100644
--- a/gix-fs/src/capabilities.rs
+++ b/gix-fs/src/capabilities.rs
@@ -60,7 +60,8 @@ impl Capabilities {
use std::os::unix::fs::{MetadataExt, OpenOptionsExt};
// test it exactly as we typically create executable files, not using chmod.
- let test_path = root.join("_test_executable_bit");
+ let rand = fastrand::usize(..);
+ let test_path = root.join(format!("_test_executable_bit{rand}"));
let res = std::fs::OpenOptions::new()
.create_new(true)
.write(true)
@@ -87,8 +88,9 @@ impl Capabilities {
}
fn probe_precompose_unicode(root: &Path) -> std::io::Result {
- let precomposed = "ä";
- let decomposed = "a\u{308}";
+ let rand = fastrand::usize(..);
+ let precomposed = format!("ä{rand}");
+ let decomposed = format!("a\u{308}{rand}");
let precomposed = root.join(precomposed);
std::fs::OpenOptions::new()
@@ -101,22 +103,14 @@ impl Capabilities {
}
fn probe_symlink(root: &Path) -> std::io::Result {
- let src_path = root.join("__link_src_file");
- std::fs::OpenOptions::new()
- .create_new(true)
- .write(true)
- .open(&src_path)?;
- let link_path = root.join("__file_link");
- if crate::symlink::create(&src_path, &link_path).is_err() {
- std::fs::remove_file(&src_path)?;
+ let rand = fastrand::usize(..);
+ let link_path = root.join(format!("__file_link{rand}"));
+ if crate::symlink::create("dangling".as_ref(), &link_path).is_err() {
return Ok(false);
}
let res = std::fs::symlink_metadata(&link_path).map(|m| m.file_type().is_symlink());
-
- let cleanup = crate::symlink::remove(&link_path).or_else(|_| std::fs::remove_file(&link_path));
- std::fs::remove_file(&src_path).and(cleanup)?;
-
+ crate::symlink::remove(&link_path).or_else(|_| std::fs::remove_file(&link_path))?;
res
}
}
diff --git a/gix-fs/src/dir/mod.rs b/gix-fs/src/dir/mod.rs
index 4c709a6a88a..ae181a3f01f 100644
--- a/gix-fs/src/dir/mod.rs
+++ b/gix-fs/src/dir/mod.rs
@@ -1,4 +1,6 @@
///
+#[allow(clippy::empty_docs)]
pub mod create;
///
+#[allow(clippy::empty_docs)]
pub mod remove;
diff --git a/gix-fs/src/lib.rs b/gix-fs/src/lib.rs
index 9d02ea33426..2b8a209e9a7 100644
--- a/gix-fs/src/lib.rs
+++ b/gix-fs/src/lib.rs
@@ -8,7 +8,7 @@ use std::path::PathBuf;
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
pub struct Capabilities {
- /// If `true`, the filesystem will consider the precomposed umlaut `ä` similiar to its decomposed form `"a\u{308}"` and consider them the same.
+ /// If `true`, the filesystem will consider the precomposed umlaut `ä` similar to its decomposed form `"a\u{308}"` and consider them the same.
/// If `false`, the filesystem will only see bytes which means that the above example could live side-by-side.
///
/// Even though a filesystem that treats both forms the same will still reproduce the exact same byte sequence during traversal for instance,
@@ -36,13 +36,16 @@ mod snapshot;
pub use snapshot::{FileSnapshot, SharedFileSnapshot, SharedFileSnapshotMut};
///
+#[allow(clippy::empty_docs)]
pub mod symlink;
///
+#[allow(clippy::empty_docs)]
pub mod read_dir;
pub use read_dir::function::read_dir;
///
+#[allow(clippy::empty_docs)]
pub mod dir;
/// Like [`std::env::current_dir()`], but it will `precompose_unicode` if that value is true, if the current directory
@@ -90,4 +93,5 @@ pub fn is_executable(_metadata: &std::fs::Metadata) -> bool {
}
///
+#[allow(clippy::empty_docs)]
pub mod stack;
diff --git a/gix-fs/src/stack.rs b/gix-fs/src/stack.rs
index 5d3dfeccd34..c5cf73ca459 100644
--- a/gix-fs/src/stack.rs
+++ b/gix-fs/src/stack.rs
@@ -1,4 +1,4 @@
-use std::path::{Path, PathBuf};
+use std::path::{Component, Path, PathBuf};
use crate::Stack;
@@ -22,20 +22,22 @@ impl Stack {
/// A delegate for use in a [`Stack`].
pub trait Delegate {
- /// Called whenever we push a directory on top of the stack, after the fact.
+ /// Called whenever we push a directory on top of the stack, and after the respective call to [`push()`](Self::push).
///
- /// It is also called if the currently acted on path is a directory in itself.
- /// Use `stack.current()` to see the directory.
+ /// It is only called if the currently acted on path is a directory in itself, which is determined by knowing
+ /// that it's not the last component of the path.
+ /// Use [`Stack::current()`] to see the directory.
fn push_directory(&mut self, stack: &Stack) -> std::io::Result<()>;
- /// Called after any component was pushed, with the path available at `stack.current()`.
+ /// Called after any component was pushed, with the path available at [`Stack::current()`].
///
- /// `is_last_component` is true if the path is completely built.
+ /// `is_last_component` is `true` if the path is completely built, which typically means it's not a directory.
fn push(&mut self, is_last_component: bool, stack: &Stack) -> std::io::Result<()>;
/// Called right after a directory-component was popped off the stack.
///
- /// Use it to pop information off internal data structures.
+ /// Use it to pop information off internal data structures. Note that no equivalent call exists for popping
+ /// the file-component.
fn pop_directory(&mut self);
}
@@ -58,12 +60,15 @@ impl Stack {
/// The full path to `relative` will be returned along with the data returned by `push_comp`.
/// Note that this only works correctly for the delegate's `push_directory()` and `pop_directory()` methods if
/// `relative` paths are terminal, so point to their designated file or directory.
+ /// The path is also expected to be normalized, and should not contain extra separators, and must not contain `..`
+ /// or have leading or trailing slashes (or additionally backslashes on Windows).
pub fn make_relative_path_current(&mut self, relative: &Path, delegate: &mut dyn Delegate) -> std::io::Result<()> {
- debug_assert!(
- relative.is_relative(),
- "only index paths are handled correctly here, must be relative"
- );
-
+ if self.valid_components != 0 && relative.as_os_str().is_empty() {
+ return Err(std::io::Error::new(
+ std::io::ErrorKind::Other,
+ "empty inputs are not allowed",
+ ));
+ }
if self.valid_components == 0 {
delegate.push_directory(self)?;
}
@@ -95,6 +100,15 @@ impl Stack {
}
while let Some(comp) = components.next() {
+ if !matches!(comp, Component::Normal(_)) {
+ return Err(std::io::Error::new(
+ std::io::ErrorKind::Other,
+ format!(
+ "Input path \"{}\" contains relative or absolute components",
+ relative.display()
+ ),
+ ));
+ }
let is_last_component = components.peek().is_none();
self.current_is_directory = !is_last_component;
self.current.push(comp);
diff --git a/gix-fs/src/symlink.rs b/gix-fs/src/symlink.rs
index 55798daa3e9..ce639c48f65 100644
--- a/gix-fs/src/symlink.rs
+++ b/gix-fs/src/symlink.rs
@@ -1,15 +1,17 @@
use std::{io, io::ErrorKind::AlreadyExists, path::Path};
-#[cfg(not(windows))]
/// Create a new symlink at `link` which points to `original`.
+///
+/// Note that `original` doesn't have to exist.
+#[cfg(not(windows))]
pub fn create(original: &Path, link: &Path) -> io::Result<()> {
std::os::unix::fs::symlink(original, link)
}
-#[cfg(not(windows))]
/// Remove a symlink.
///
/// Note that on only on windows this is special.
+#[cfg(not(windows))]
pub fn remove(path: &Path) -> io::Result<()> {
std::fs::remove_file(path)
}
@@ -29,21 +31,31 @@ pub fn remove(path: &Path) -> io::Result<()> {
}
}
-#[cfg(windows)]
/// Create a new symlink at `link` which points to `original`.
+///
+/// Note that if a symlink target (the `original`) isn't present on disk, it's assumed to be a
+/// file, creating a dangling file symlink. This is similar to a dangling symlink on Unix,
+/// which doesn't have to care about the target type though.
+#[cfg(windows)]
pub fn create(original: &Path, link: &Path) -> io::Result<()> {
use std::os::windows::fs::{symlink_dir, symlink_file};
// TODO: figure out if links to links count as files or whatever they point at
- if std::fs::metadata(link.parent().expect("dir for link").join(original))?.is_dir() {
+ let orig_abs = link.parent().expect("dir for link").join(original);
+ let is_dir = match std::fs::metadata(orig_abs) {
+ Ok(m) => m.is_dir(),
+ Err(err) if err.kind() == io::ErrorKind::NotFound => false,
+ Err(err) => return Err(err),
+ };
+ if is_dir {
symlink_dir(original, link)
} else {
symlink_file(original, link)
}
}
-#[cfg(not(windows))]
/// Return true if `err` indicates that a file collision happened, i.e. a symlink couldn't be created as the `link`
/// already exists as filesystem object.
+#[cfg(not(windows))]
pub fn is_collision_error(err: &std::io::Error) -> bool {
// TODO: use ::IsDirectory as well when stabilized instead of raw_os_error(), and ::FileSystemLoop respectively
err.kind() == AlreadyExists
@@ -52,9 +64,9 @@ pub fn is_collision_error(err: &std::io::Error) -> bool {
|| err.raw_os_error() == Some(40) // no-follow on symlnk on ubuntu
}
-#[cfg(windows)]
/// Return true if `err` indicates that a file collision happened, i.e. a symlink couldn't be created as the `link`
/// already exists as filesystem object.
+#[cfg(windows)]
pub fn is_collision_error(err: &std::io::Error) -> bool {
err.kind() == AlreadyExists || err.kind() == std::io::ErrorKind::PermissionDenied
}
diff --git a/gix-fs/tests/capabilities/mod.rs b/gix-fs/tests/capabilities/mod.rs
index edff3b022f8..749bfb3a61f 100644
--- a/gix-fs/tests/capabilities/mod.rs
+++ b/gix-fs/tests/capabilities/mod.rs
@@ -2,7 +2,7 @@
fn probe() {
let dir = tempfile::tempdir().unwrap();
std::fs::File::create(dir.path().join("config")).unwrap();
- gix_fs::Capabilities::probe(dir.path());
+ let caps = gix_fs::Capabilities::probe(dir.path());
let entries: Vec<_> = std::fs::read_dir(dir.path())
.unwrap()
@@ -15,4 +15,34 @@ fn probe() {
0,
"there should be no left-over files after probing, found {entries:?}"
);
+ if cfg!(unix) {
+ assert!(caps.symlink, "Unix should always be able to create symlinks");
+ assert!(caps.executable_bit, "Unix should always honor executable bits");
+ }
+}
+
+#[test]
+fn parallel_probe() {
+ let dir = tempfile::tempdir().unwrap();
+ std::fs::File::create(dir.path().join("config")).unwrap();
+ let baseline = gix_fs::Capabilities::probe(dir.path());
+
+ let (tx, rx) = crossbeam_channel::unbounded::<()>();
+ let threads: Vec<_> = (0..10)
+ .map(|_id| {
+ std::thread::spawn({
+ let dir = dir.path().to_owned();
+ let rx = rx.clone();
+ move || {
+ for _ in rx {}
+ let actual = gix_fs::Capabilities::probe(&dir);
+ assert_eq!(actual, baseline);
+ }
+ })
+ })
+ .collect();
+ drop((rx, tx));
+ for thread in threads {
+ thread.join().expect("no panic");
+ }
}
diff --git a/gix-fs/tests/stack/mod.rs b/gix-fs/tests/stack/mod.rs
index 5e122cdb007..c79db87dbf9 100644
--- a/gix-fs/tests/stack/mod.rs
+++ b/gix-fs/tests/stack/mod.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::join_absolute_paths)]
use std::path::{Path, PathBuf};
use gix_fs::Stack;
@@ -26,6 +27,287 @@ impl gix_fs::stack::Delegate for Record {
}
}
+fn p(s: &str) -> &Path {
+ s.as_ref()
+}
+
+/// Just to learn the specialities of `Path::join()`, which boils down to `Path::push(component)`.
+#[test]
+#[cfg(windows)]
+fn path_join_handling() {
+ let absolute = p("/absolute");
+ assert!(
+ absolute.is_relative(),
+ "on Windows, absolute Linux paths are considered relative (and relative to the current drive)"
+ );
+ let bs_absolute = p("\\absolute");
+ assert!(
+ absolute.is_relative(),
+ "on Windows, strange single-backslash paths are relative (and relative to the current drive)"
+ );
+ assert_eq!(
+ p("relative").join(absolute),
+ absolute,
+ "relative + absolute = absolute - however, they kind of act like they are absolute in conjunction with relative base paths"
+ );
+ assert_eq!(
+ p("relative").join(bs_absolute),
+ bs_absolute,
+ "relative + absolute = absolute - backslashes aren't special here, and it just acts like it's absolute"
+ );
+
+ assert_eq!(
+ p("c:").join("relative"),
+ p("c:relative"),
+ "drive + relative = strange joined result with missing backslash, but it's a valid path that works just like `c:\relative`"
+ );
+ assert_eq!(
+ p("c:\\").join("relative"),
+ p("c:\\relative"),
+ "absolute + relative = joined result"
+ );
+
+ assert_eq!(
+ p("\\\\?\\base").join(absolute),
+ p("\\\\?\\base\\absolute"),
+ "absolute1 + unix-absolute2 = joined result with backslash"
+ );
+ assert_eq!(
+ p("\\\\.\\base").join(absolute),
+ p("\\\\.\\base\\absolute"),
+ "absolute1 + absolute2 = joined result with backslash (device namespace)"
+ );
+ assert_eq!(
+ p("\\\\?\\base").join(bs_absolute),
+ p("\\\\?\\base\\absolute"),
+ "absolute1 + absolute2 = joined result"
+ );
+ assert_eq!(
+ p("\\\\.\\base").join(bs_absolute),
+ p("\\\\.\\base\\absolute"),
+ "absolute1 + absolute2 = joined result (device namespace)"
+ );
+
+ assert_eq!(p("/").join("C:"), p("C:"), "unix-absolute + win-drive = win-drive");
+ assert_eq!(
+ p("d:/").join("C:"),
+ p("C:"),
+ "d-drive + c-drive = c-drive - interesting, as C: is supposed to be relative"
+ );
+ assert_eq!(
+ p("d:\\").join("C:\\"),
+ p("C:\\"),
+ "d-drive-with-bs + c-drive-with-bs = c-drive-with-bs - nothing special happens with backslashes"
+ );
+ assert_eq!(
+ p("c:\\").join("\\\\.\\"),
+ p("\\\\.\\"),
+ "c-drive-with-bs + device-namespace-unc = device-namespace-unc"
+ );
+ assert_eq!(
+ p("/").join("C:/"),
+ p("C:\\"),
+ "unix-absolute + win-drive = win-drive, strangely enough it changed the trailing slash to backslash, so better not have trailing slashes"
+ );
+ assert_eq!(p("/").join("C:\\"), p("C:\\"), "unix-absolute + win-drive = win-drive");
+ assert_eq!(
+ p("\\\\.").join("C:"),
+ p("C:"),
+ "device-namespace-unc + win-drive-relative = win-drive-relative - c: was supposed to be relative, but it's not acting like it."
+ );
+ assert_eq!(p("relative").join("C:"), p("C:"), "relative + win-drive = win-drive");
+
+ assert_eq!(
+ p("/").join("\\\\localhost"),
+ p("\\localhost"),
+ "unix-absolute + win-absolute-unc = win-absolute-unc"
+ );
+ assert_eq!(
+ p("relative").join("\\\\localhost"),
+ p("\\\\localhost"),
+ "relative + win-absolute-unc = win-absolute-unc"
+ );
+}
+
+/// Just to learn the specialities of `Path::join()`, which boils down to `Path::push(component)`.
+#[test]
+#[cfg(not(windows))]
+fn path_join_handling() {
+ assert_eq!(
+ p("relative").join("/absolute"),
+ p("/absolute"),
+ "relative + absolute = absolute"
+ );
+
+ assert_eq!(
+ p("/").join("relative"),
+ p("/relative"),
+ "absolute + relative = joined result"
+ );
+
+ assert_eq!(
+ p("/").join("/absolute"),
+ p("/absolute"),
+ "absolute1 + absolute2 = absolute2"
+ );
+
+ assert_eq!(p("/").join("C:"), p("/C:"), "absolute + win-drive = joined result");
+ assert_eq!(p("/").join("C:/"), p("/C:/"), "absolute + win-absolute = joined result");
+ assert_eq!(
+ p("/").join("C:\\"),
+ p("/C:\\"),
+ "absolute + win-absolute = joined result"
+ );
+ assert_eq!(
+ p("relative").join("C:"),
+ p("relative/C:"),
+ "relative + win-drive = joined result"
+ );
+
+ assert_eq!(
+ p("/").join("\\localhost"),
+ p("/\\localhost"),
+ "absolute + win-absolute-unc = joined result"
+ );
+ assert_eq!(
+ p("relative").join("\\localhost"),
+ p("relative/\\localhost"),
+ "relative + win-absolute-unc = joined result"
+ );
+}
+
+#[test]
+fn empty_paths_are_noop_if_no_path_was_pushed_before() {
+ let root = PathBuf::from(".");
+ let mut s = Stack::new(root.clone());
+
+ let mut r = Record::default();
+ s.make_relative_path_current("".as_ref(), &mut r).unwrap();
+ assert_eq!(
+ s.current_relative().to_string_lossy(),
+ "",
+ "it's fine to push an empty path to get a value for the stack root, once"
+ );
+}
+
+#[test]
+fn relative_components_are_invalid() {
+ let root = PathBuf::from(".");
+ let mut s = Stack::new(root.clone());
+
+ let mut r = Record::default();
+ let err = s.make_relative_path_current("a/..".as_ref(), &mut r).unwrap_err();
+ assert_eq!(
+ err.to_string(),
+ format!(
+ "Input path {input:?} contains relative or absolute components",
+ input = "a/.."
+ )
+ );
+
+ s.make_relative_path_current("a/./b".as_ref(), &mut r)
+ .expect("dot is ignored");
+ assert_eq!(
+ r,
+ Record {
+ push_dir: 2,
+ dirs: vec![".".into(), "./a".into()],
+ push: 2,
+ },
+ "The `a` directory is pushed, and the leaf, for a total of 2 pushes"
+ );
+ assert_eq!(
+ s.current().to_string_lossy(),
+ if cfg!(windows) { ".\\a\\b" } else { "./a/b" },
+ "dot is silently ignored"
+ );
+ s.make_relative_path_current("a//b/".as_ref(), &mut r)
+ .expect("multiple-slashes are ignored");
+ assert_eq!(
+ r,
+ Record {
+ push_dir: 2,
+ dirs: vec![".".into(), "./a".into()],
+ push: 2,
+ },
+ "nothing changed"
+ );
+}
+
+#[test]
+fn absolute_paths_are_invalid() -> crate::Result {
+ let root = PathBuf::from(".");
+ let mut s = Stack::new(root.clone());
+
+ let mut r = Record::default();
+ let err = s.make_relative_path_current("/".as_ref(), &mut r).unwrap_err();
+ assert_eq!(
+ err.to_string(),
+ "Input path \"/\" contains relative or absolute components",
+ "a leading slash is always considered absolute"
+ );
+ s.make_relative_path_current("a/".as_ref(), &mut r)?;
+ assert_eq!(
+ s.current(),
+ p("./a/"),
+ "trailing slashes aren't a problem at this stage, as they cannot cause a 'breakout'"
+ );
+ s.make_relative_path_current("b\\".as_ref(), &mut r)?;
+ assert_eq!(
+ s.current(),
+ p("./b\\"),
+ "trailing backslashes are fine both on Windows and Unix - on Unix it's part fo the filename"
+ );
+
+ #[cfg(windows)]
+ {
+ let err = s.make_relative_path_current("\\".as_ref(), &mut r).unwrap_err();
+ assert_eq!(
+ err.to_string(),
+ "Input path \"\\\" contains relative or absolute components",
+ "on Windows, backslashes are considered absolute and replace the base if it is relative, \
+ hence they are forbidden."
+ );
+
+ let err = s.make_relative_path_current("c:".as_ref(), &mut r).unwrap_err();
+ assert_eq!(
+ err.to_string(),
+ "Input path \"c:\" contains relative or absolute components",
+ "on Windows, drive-letters without trailing backslash or slash are also absolute (even though they ought to be relative)"
+ );
+ let err = s.make_relative_path_current("c:\\".as_ref(), &mut r).unwrap_err();
+ assert_eq!(
+ err.to_string(),
+ "Input path \"c:\\\" contains relative or absolute components",
+ "on Windows, drive-letters are absolute, which is expected"
+ );
+
+ s.make_relative_path_current("֍:".as_ref(), &mut r)?;
+ assert_eq!(
+ s.current().to_string_lossy(),
+ ".\\֍:",
+ "on Windows, almost any unicode character will do as virtual drive-letter actually with `subst`, \
+ but we just turn it into a presumably invalid path which is fine, i.e. we get a joined path"
+ );
+ let err = s
+ .make_relative_path_current(r#"\\localhost\hello"#.as_ref(), &mut r)
+ .unwrap_err();
+ assert_eq!(
+ err.to_string(),
+ r#"Input path "\\localhost\hello" contains relative or absolute components"#,
+ "there is UNC paths as well"
+ );
+
+ let err = s.make_relative_path_current(r#"\\?\C:"#.as_ref(), &mut r).unwrap_err();
+ assert_eq!(
+ err.to_string(),
+ r#"Input path "\\?\C:" contains relative or absolute components"#,
+ "there is UNC paths as well, sometimes they look different"
+ );
+ }
+ Ok(())
+}
+
#[test]
fn delegate_calls_are_consistent() -> crate::Result {
let root = PathBuf::from(".");
@@ -43,7 +325,8 @@ fn delegate_calls_are_consistent() -> crate::Result {
push_dir: 2,
dirs: dirs.clone(),
push: 2,
- }
+ },
+ "it pushes the root-directory first, then the intermediate one"
);
s.make_relative_path_current("a/b2".as_ref(), &mut r)?;
@@ -53,7 +336,8 @@ fn delegate_calls_are_consistent() -> crate::Result {
push_dir: 2,
dirs: dirs.clone(),
push: 3,
- }
+ },
+ "dirs remain the same as b2 is a leaf/file, hence the new `push`"
);
s.make_relative_path_current("c/d/e".as_ref(), &mut r)?;
@@ -65,7 +349,8 @@ fn delegate_calls_are_consistent() -> crate::Result {
push_dir: 4,
dirs: dirs.clone(),
push: 6,
- }
+ },
+ "each directory is pushed individually, after popping 'a' which isn't included anymore"
);
dirs.push(root.join("c").join("d").join("x"));
@@ -76,10 +361,11 @@ fn delegate_calls_are_consistent() -> crate::Result {
push_dir: 5,
dirs: dirs.clone(),
push: 8,
- }
+ },
+ "a new path component is added, hence `push_dir + 1`, but two components are added in total"
);
- dirs.drain(dirs.len() - 3..).count();
+ dirs.drain(1..).count();
s.make_relative_path_current("f".as_ref(), &mut r)?;
assert_eq!(s.current_relative(), Path::new("f"));
assert_eq!(
@@ -88,7 +374,8 @@ fn delegate_calls_are_consistent() -> crate::Result {
push_dir: 5,
dirs: dirs.clone(),
push: 9,
- }
+ },
+ "Now we only keep the root, as `f` is a leaf, hence `push + 1`"
);
dirs.push(root.join("x"));
@@ -99,7 +386,8 @@ fn delegate_calls_are_consistent() -> crate::Result {
push_dir: 6,
dirs: dirs.clone(),
push: 11,
- }
+ },
+ "a new directory is pushed, or two new components total, hence `push + 2`"
);
dirs.push(root.join("x").join("z"));
@@ -110,7 +398,8 @@ fn delegate_calls_are_consistent() -> crate::Result {
push_dir: 7,
dirs: dirs.clone(),
push: 12,
- }
+ },
+ "and another sub-directory is added"
);
dirs.push(root.join("x").join("z").join("a"));
@@ -122,10 +411,11 @@ fn delegate_calls_are_consistent() -> crate::Result {
push_dir: 9,
dirs: dirs.clone(),
push: 14,
- }
+ },
+ "and more subdirectories, two at once this time."
);
- dirs.drain(dirs.len() - 2..).count();
+ dirs.drain(1 /*root*/ + 1 /*x*/ + 1 /*x/z*/ ..).count();
s.make_relative_path_current("x/z".as_ref(), &mut r)?;
assert_eq!(
r,
@@ -133,7 +423,8 @@ fn delegate_calls_are_consistent() -> crate::Result {
push_dir: 9,
dirs: dirs.clone(),
push: 14,
- }
+ },
+ "this only pops components, and as x/z/a/ was previously a directory, x/z is still a directory"
);
assert_eq!(
dirs.last(),
@@ -141,16 +432,104 @@ fn delegate_calls_are_consistent() -> crate::Result {
"the stack is state so keeps thinking it's a directory which is consistent. Git does it differently though."
);
- s.make_relative_path_current("".as_ref(), &mut r)?;
+ let err = s.make_relative_path_current("".as_ref(), &mut r).unwrap_err();
+ assert_eq!(
+ err.to_string(),
+ "empty inputs are not allowed",
+ "this is to protect us from double-counting the root path next time a component is pushed, \
+ and besides that really shouldn't happen"
+ );
+
+ s.make_relative_path_current("leaf".as_ref(), &mut r)?;
+ dirs.drain(1..).count();
assert_eq!(
r,
Record {
push_dir: 9,
- dirs: vec![".".into()],
- push: 14,
+ dirs: dirs.clone(),
+ push: 15,
},
- "empty-paths reset the tree effectively"
+ "reset as much as possible, with just a leaf-component and the root directory"
);
+ s.make_relative_path_current("a//b".as_ref(), &mut r)?;
+ dirs.push(root.join("a"));
+ assert_eq!(
+ r,
+ Record {
+ push_dir: 10,
+ dirs: dirs.clone(),
+ push: 17,
+ },
+ "double-slashes are automatically cleaned, even though they shouldn't happen, it's not forbidden"
+ );
+
+ #[cfg(not(windows))]
+ {
+ s.make_relative_path_current("\\/b".as_ref(), &mut r)?;
+ dirs.pop();
+ dirs.push(root.join("\\"));
+ assert_eq!(
+ r,
+ Record {
+ push_dir: 11,
+ dirs: dirs.clone(),
+ push: 19,
+ },
+ "a backslash is a normal character outside of Windows, so it's fine to have it as component"
+ );
+
+ s.make_relative_path_current("\\".as_ref(), &mut r)?;
+ assert_eq!(
+ r,
+ Record {
+ push_dir: 11,
+ dirs: dirs.clone(),
+ push: 19,
+ },
+ );
+ assert_eq!(
+ s.current().to_string_lossy(),
+ "./\\",
+ "a backslash can also be a valid leaf component - here we only popped the 'b', leaving the \\ 'directory'"
+ );
+
+ s.make_relative_path_current("\\\\".as_ref(), &mut r)?;
+ dirs.pop();
+ assert_eq!(
+ r,
+ Record {
+ push_dir: 11,
+ dirs: dirs.clone(),
+ push: 20,
+ },
+ );
+ assert_eq!(
+ s.current().to_string_lossy(),
+ "./\\\\",
+ "the backslash can also be an ordinary leaf, without the need for it to be a directory"
+ );
+ }
+
+ #[cfg(windows)]
+ {
+ s.make_relative_path_current("c\\/d".as_ref(), &mut r)?;
+ dirs.pop();
+ dirs.push(root.join("c"));
+ assert_eq!(
+ r,
+ Record {
+ push_dir: 11,
+ dirs: dirs.clone(),
+ push: 19,
+ },
+ );
+ assert_eq!(
+ s.current().to_string_lossy(),
+ ".\\c\\d",
+ "the backslash is a path-separator, and so is the `/`, which is turned into backslash"
+ );
+ }
+
Ok(())
}
diff --git a/gix-fsck/CHANGELOG.md b/gix-fsck/CHANGELOG.md
index e99254fba5e..5e2afeb111c 100644
--- a/gix-fsck/CHANGELOG.md
+++ b/gix-fsck/CHANGELOG.md
@@ -5,24 +5,52 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.4.0 (2024-04-13)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 6 commits contributed to the release over the course of 29 calendar days.
+ - 47 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Prepare changelogs prior to release ([`5755271`](https://github.com/Byron/gitoxide/commit/57552717f46f96c35ba4ddc0a64434354ef845e9))
+ - Merge pull request #1332 from cesfahani/fix_fsck_tree_traversal ([`4bb8ef5`](https://github.com/Byron/gitoxide/commit/4bb8ef5fd05133b87eb1e79a0ac6e45eb66940a2))
+ - Fix git-fsck to handle non-root trees ([`5fdb440`](https://github.com/Byron/gitoxide/commit/5fdb440de2837f00a313b2747fc1b4773b70c045))
+ - Release gix-actor v0.31.1, gix-object v0.42.1, gix-index v0.31.1, gix-pathspec v0.7.2, gix-dir v0.3.0, gix-status v0.8.0, gix v0.61.0, safety bump 2 crates ([`155cc45`](https://github.com/Byron/gitoxide/commit/155cc45730b259e662d7c4be42a469a3af3750e1))
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Release gix-utils v0.1.9, gix-features v0.38.0, gix-actor v0.30.0, gix-object v0.41.0, gix-path v0.10.4, gix-glob v0.16.0, gix-attributes v0.22.0, gix-command v0.3.3, gix-packetline-blocking v0.17.3, gix-filter v0.9.0, gix-fs v0.10.0, gix-commitgraph v0.24.0, gix-revwalk v0.12.0, gix-traverse v0.37.0, gix-worktree-stream v0.9.0, gix-archive v0.9.0, gix-config-value v0.14.4, gix-tempfile v13.0.0, gix-lock v13.0.0, gix-ref v0.41.0, gix-sec v0.10.4, gix-config v0.34.0, gix-url v0.27.0, gix-credentials v0.24.0, gix-ignore v0.11.0, gix-index v0.29.0, gix-worktree v0.30.0, gix-diff v0.40.0, gix-discover v0.29.0, gix-mailmap v0.22.0, gix-negotiate v0.12.0, gix-pack v0.47.0, gix-odb v0.57.0, gix-pathspec v0.6.0, gix-packetline v0.17.3, gix-transport v0.41.0, gix-protocol v0.44.0, gix-revision v0.26.0, gix-refspec v0.22.0, gix-status v0.5.0, gix-submodule v0.8.0, gix-worktree-state v0.7.0, gix v0.58.0, safety bump 39 crates ([`eb6aa8f`](https://github.com/Byron/gitoxide/commit/eb6aa8f502314f886fc4ea3d52ab220763968208))
- Release gix-date v0.8.3, gix-hash v0.14.1, gix-trace v0.1.6, gix-features v0.37.1, gix-actor v0.29.1, gix-validate v0.8.3, gix-object v0.40.1, gix-path v0.10.3, gix-glob v0.15.1, gix-quote v0.4.10, gix-attributes v0.21.1, gix-command v0.3.2, gix-packetline-blocking v0.17.2, gix-utils v0.1.8, gix-filter v0.8.1, gix-fs v0.9.1, gix-chunk v0.4.7, gix-commitgraph v0.23.1, gix-hashtable v0.5.1, gix-revwalk v0.11.1, gix-traverse v0.36.1, gix-worktree-stream v0.8.1, gix-archive v0.8.1, gix-config-value v0.14.3, gix-tempfile v12.0.1, gix-lock v12.0.1, gix-ref v0.40.1, gix-sec v0.10.3, gix-config v0.33.1, gix-prompt v0.8.2, gix-url v0.26.1, gix-credentials v0.23.1, gix-ignore v0.10.1, gix-bitmap v0.2.10, gix-index v0.28.1, gix-worktree v0.29.1, gix-diff v0.39.1, gix-discover v0.28.1, gix-macros v0.1.3, gix-mailmap v0.21.1, gix-negotiate v0.11.1, gix-pack v0.46.1, gix-odb v0.56.1, gix-pathspec v0.5.1, gix-packetline v0.17.2, gix-transport v0.40.1, gix-protocol v0.43.1, gix-revision v0.25.1, gix-refspec v0.21.1, gix-status v0.4.1, gix-submodule v0.7.1, gix-worktree-state v0.6.1, gix v0.57.1 ([`972241f`](https://github.com/Byron/gitoxide/commit/972241f1904944e8b6e84c6aa1649a49be7a85c3))
@@ -47,8 +76,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Chore
- - upgrade MSRV to v1.70
- Our MSRV follows the one of `helix`, which in turn follows Firefox.
+- upgrade MSRV to v1.70
+ Our MSRV follows the one of `helix`, which in turn follows Firefox.
### Commit Statistics
diff --git a/gix-fsck/Cargo.toml b/gix-fsck/Cargo.toml
index 93d827b8f42..8725bea95a4 100644
--- a/gix-fsck/Cargo.toml
+++ b/gix-fsck/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-fsck"
-version = "0.3.0"
+version = "0.4.0"
repository = "https://github.com/Byron/gitoxide"
authors = ["Cameron Esfahani ", "Sebastian Thiel "]
license = "MIT OR Apache-2.0"
@@ -13,9 +13,9 @@ rust-version = "1.65"
doctest = false
[dependencies]
-gix-hash = { version = "^0.14.1", path = "../gix-hash" }
-gix-hashtable = { version = "^0.5.1", path = "../gix-hashtable" }
-gix-object = { version = "^0.41.1", path = "../gix-object" }
+gix-hash = { version = "^0.14.2", path = "../gix-hash" }
+gix-hashtable = { version = "^0.5.2", path = "../gix-hashtable" }
+gix-object = { version = "^0.42.1", path = "../gix-object" }
[dev-dependencies]
gix-odb = { path = "../gix-odb" }
diff --git a/gix-fsck/src/lib.rs b/gix-fsck/src/lib.rs
index 99bb8986c06..6429b2307a0 100644
--- a/gix-fsck/src/lib.rs
+++ b/gix-fsck/src/lib.rs
@@ -80,9 +80,7 @@ where
match entry_ref.mode.kind() {
EntryKind::Tree => {
let tree_id = entry_ref.oid.to_owned();
- if self.seen.insert(tree_id) {
- tree_ids.push_back(tree_id);
- }
+ tree_ids.push_back(tree_id);
}
EntryKind::Blob | EntryKind::BlobExecutable | EntryKind::Link => {
let blob_id = entry_ref.oid.to_owned();
@@ -91,7 +89,7 @@ where
}
}
EntryKind::Commit => {
- // Skip submodules as it's not in this repository!
+ // Skip submodules as they wouldn't be in this repository!
}
}
}
diff --git a/gix-fsck/tests/connectivity/mod.rs b/gix-fsck/tests/connectivity/mod.rs
index 120ae699f6b..3468f0bc290 100644
--- a/gix-fsck/tests/connectivity/mod.rs
+++ b/gix-fsck/tests/connectivity/mod.rs
@@ -42,8 +42,8 @@ fn hex_to_objects<'a>(hex_ids: impl IntoIterator- , kind: Kind) ->
fn all_commits() -> &'static [ObjectId] {
static ALL_COMMITS: Lazy> = Lazy::new(|| {
hex_to_ids([
- "5d18db2e2aabadf7b914435ef34f2faf8b4546dd",
- "3a3dfaa55a515f3fb3a25751107bbb523af6a1b0",
+ "ebed23648b19484cb1f340c4ee04dda08479188a",
+ "8ff6d0f8891c3cb22827be142cc64606121d47b3",
"734c926856a328d1168ffd7088532e0d1ad19bbe",
])
});
@@ -59,7 +59,13 @@ fn no_missing() {
#[test]
fn missing_blobs() {
// The "blobless" repo is cloned with `--filter=blob:none`, and is missing one blob
- let expected = hex_to_objects(["c18147dc648481eeb65dc5e66628429a64843327"], Kind::Blob);
+ let expected = hex_to_objects(
+ [
+ "4cdeaab5b01f9a9fbbb2fb6c08404cf12b7bdab1",
+ "c18147dc648481eeb65dc5e66628429a64843327",
+ ],
+ Kind::Blob,
+ );
assert_eq!(check_missing("blobless", all_commits()), expected);
}
@@ -69,7 +75,7 @@ fn missing_trees() {
// NOTE: This repo is also missing a blob, but we have no way of knowing that, as the tree referencing it is missing
let expected = hex_to_objects(
[
- "9561cfbae43c5e2accdfcd423378588dd10d827f",
+ "20317ffa7614f49b2702a057bf2833918ea9fd24",
"fc264b3b6875a46e9031483aeb9994a1b897ffd3",
],
Kind::Tree,
diff --git a/gix-fsck/tests/fixtures/make_test_repos.sh b/gix-fsck/tests/fixtures/make_test_repos.sh
index 19491a0c551..7b37084d01b 100755
--- a/gix-fsck/tests/fixtures/make_test_repos.sh
+++ b/gix-fsck/tests/fixtures/make_test_repos.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -x
set -euo pipefail
@@ -18,9 +18,11 @@ git init base
git add -A
git commit -m "commit 1"
echo "blob-2" > blob-2
+ mkdir tree-1
+ echo "blob-3" > tree-1/blob-3
git add -A
git commit -m "commit 2"
- git rm blob-1
+ git rm blob-1 tree-1/blob-3
git add -A
git commit -m "commit 3"
)
diff --git a/gix-glob/CHANGELOG.md b/gix-glob/CHANGELOG.md
index 7f35e3116a5..21a09e1dc1a 100644
--- a/gix-glob/CHANGELOG.md
+++ b/gix-glob/CHANGELOG.md
@@ -5,6 +5,59 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.16.3 (2024-05-28)
+
+### Bug Fixes
+
+ - ignore `.gitignore` files that are directories
+ This happens in real-life, and Git itself doesn't budge.
+
+### Commit Statistics
+
+
+
+ - 2 commits contributed to the release.
+ - 74 days passed between releases.
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+
view details
+
+ * **Uncategorized**
+ - Merge branch 'dir-as-ignore' ([`31d2f0a`](https://github.com/Byron/gitoxide/commit/31d2f0a742257d7031df114f0c92197a0781921e))
+ - Ignore `.gitignore` files that are directories ([`31ade4a`](https://github.com/Byron/gitoxide/commit/31ade4a66141a4ce465ea7edfb9ec56636e77da4))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Thanks clippy ([`13d5602`](https://github.com/Byron/gitoxide/commit/13d5602faa58aa6f520ebc6003ed54bc9c844f2b))
- Release gix-path v0.10.5 ([`b8cba96`](https://github.com/Byron/gitoxide/commit/b8cba96ce57f8b6b0067d6a8cf3e37eaf280a238))
diff --git a/gix-glob/Cargo.toml b/gix-glob/Cargo.toml
index c963ca8af6d..05f3921aeac 100644
--- a/gix-glob/Cargo.toml
+++ b/gix-glob/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-glob"
-version = "0.16.1"
+version = "0.16.3"
repository = "https://github.com/Byron/gitoxide"
license = "MIT OR Apache-2.0"
description = "A crate of the gitoxide project dealing with pattern matching"
@@ -17,8 +17,8 @@ doctest = false
serde= ["dep:serde", "bstr/serde", "bitflags/serde"]
[dependencies]
-gix-path = { version = "^0.10.6", path = "../gix-path" }
-gix-features = { version = "^0.38.0", path = "../gix-features" }
+gix-path = { version = "^0.10.7", path = "../gix-path" }
+gix-features = { version = "^0.38.1", path = "../gix-features" }
bstr = { version = "1.3.0", default-features = false, features = ["std"]}
bitflags = "2"
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
diff --git a/gix-glob/src/lib.rs b/gix-glob/src/lib.rs
index ee8599fc8ec..4ddf98699de 100644
--- a/gix-glob/src/lib.rs
+++ b/gix-glob/src/lib.rs
@@ -25,11 +25,13 @@ pub struct Pattern {
}
///
+#[allow(clippy::empty_docs)]
pub mod pattern;
pub mod search;
///
+#[allow(clippy::empty_docs)]
pub mod wildmatch;
pub use wildmatch::function::wildmatch;
diff --git a/gix-glob/src/search/mod.rs b/gix-glob/src/search/mod.rs
index b6fb2a49025..da58e1a1fcb 100644
--- a/gix-glob/src/search/mod.rs
+++ b/gix-glob/src/search/mod.rs
@@ -5,6 +5,7 @@
use std::path::{Path, PathBuf};
///
+#[allow(clippy::empty_docs)]
pub mod pattern;
/// A trait to convert bytes into patterns and their associated value.
diff --git a/gix-glob/src/search/pattern.rs b/gix-glob/src/search/pattern.rs
index 828e59df3f7..54981651ecb 100644
--- a/gix-glob/src/search/pattern.rs
+++ b/gix-glob/src/search/pattern.rs
@@ -48,16 +48,29 @@ fn read_in_full_ignore_missing(path: &Path, follow_symlinks: bool, buf: &mut Vec
};
Ok(match file {
Ok(mut file) => {
- file.read_to_end(buf)?;
- true
+ if let Err(err) = file.read_to_end(buf) {
+ if io_err_is_dir(&err) {
+ false
+ } else {
+ return Err(err);
+ }
+ } else {
+ true
+ }
}
- Err(err) if err.kind() == std::io::ErrorKind::NotFound ||
- // TODO: use the enum variant NotADirectory for this once stabilized
- err.raw_os_error() == Some(20) /* Not a directory */ => false,
+ Err(err) if err.kind() == std::io::ErrorKind::NotFound || io_err_is_dir(&err) => false,
Err(err) => return Err(err),
})
}
+fn io_err_is_dir(err: &std::io::Error) -> bool {
+ // TODO: use the enum variant NotADirectory for this once stabilized
+ let raw = err.raw_os_error();
+ raw == Some(if cfg!(windows) { 5 } else { 21 }) /* Not a directory */
+ /* Also that, but under different circumstances */
+ || raw == Some(20)
+}
+
/// Instantiation
impl List
where
diff --git a/gix-glob/tests/fixtures/generated-archives/make_baseline.tar.xz b/gix-glob/tests/fixtures/generated-archives/make_baseline.tar.xz
index 5fc9dfdf1d5..f7c19284c7e 100644
Binary files a/gix-glob/tests/fixtures/generated-archives/make_baseline.tar.xz and b/gix-glob/tests/fixtures/generated-archives/make_baseline.tar.xz differ
diff --git a/gix-glob/tests/fixtures/make_baseline.sh b/gix-glob/tests/fixtures/make_baseline.sh
index 5787ff64ce1..02727edbf60 100755
--- a/gix-glob/tests/fixtures/make_baseline.sh
+++ b/gix-glob/tests/fixtures/make_baseline.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-glob/tests/search/pattern.rs b/gix-glob/tests/search/pattern.rs
index 6b62ee3d286..cfdb410a67f 100644
--- a/gix-glob/tests/search/pattern.rs
+++ b/gix-glob/tests/search/pattern.rs
@@ -85,7 +85,7 @@ mod list {
}
#[test]
- fn from_file() {
+ fn from_file_that_does_not_exist() {
let mut buf = Vec::new();
for path in [
Path::new(".").join("non-existing-dir").join("pattern-file"),
@@ -95,4 +95,16 @@ mod list {
assert!(list.is_none(), "the file does not exist");
}
}
+
+ #[test]
+ fn from_file_that_is_a_directory() -> gix_testtools::Result<()> {
+ let tmp = gix_testtools::tempfile::TempDir::new()?;
+ let dir_path = tmp.path().join(".gitignore");
+ std::fs::create_dir(&dir_path)?;
+ let mut buf = Vec::new();
+ let list = List::::from_file(dir_path, None, false, &mut buf).expect("no io error");
+ assert!(list.is_none(), "directories are ignored just like Git does it");
+
+ Ok(())
+ }
}
diff --git a/gix-hash/CHANGELOG.md b/gix-hash/CHANGELOG.md
index 4ef66fd73ed..cedce514408 100644
--- a/gix-hash/CHANGELOG.md
+++ b/gix-hash/CHANGELOG.md
@@ -5,22 +5,49 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.14.2 (2024-03-14)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 3 commits contributed to the release over the course of 4 calendar days.
+ - 75 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.3, gix-hash v0.14.1, gix-trace v0.1.6, gix-features v0.37.1, gix-actor v0.29.1, gix-validate v0.8.3, gix-object v0.40.1, gix-path v0.10.3, gix-glob v0.15.1, gix-quote v0.4.10, gix-attributes v0.21.1, gix-command v0.3.2, gix-packetline-blocking v0.17.2, gix-utils v0.1.8, gix-filter v0.8.1, gix-fs v0.9.1, gix-chunk v0.4.7, gix-commitgraph v0.23.1, gix-hashtable v0.5.1, gix-revwalk v0.11.1, gix-traverse v0.36.1, gix-worktree-stream v0.8.1, gix-archive v0.8.1, gix-config-value v0.14.3, gix-tempfile v12.0.1, gix-lock v12.0.1, gix-ref v0.40.1, gix-sec v0.10.3, gix-config v0.33.1, gix-prompt v0.8.2, gix-url v0.26.1, gix-credentials v0.23.1, gix-ignore v0.10.1, gix-bitmap v0.2.10, gix-index v0.28.1, gix-worktree v0.29.1, gix-diff v0.39.1, gix-discover v0.28.1, gix-macros v0.1.3, gix-mailmap v0.21.1, gix-negotiate v0.11.1, gix-pack v0.46.1, gix-odb v0.56.1, gix-pathspec v0.5.1, gix-packetline v0.17.2, gix-transport v0.40.1, gix-protocol v0.43.1, gix-revision v0.25.1, gix-refspec v0.21.1, gix-status v0.4.1, gix-submodule v0.7.1, gix-worktree-state v0.6.1, gix v0.57.1 ([`972241f`](https://github.com/Byron/gitoxide/commit/972241f1904944e8b6e84c6aa1649a49be7a85c3))
- Merge branch 'msrv' ([`8c492d7`](https://github.com/Byron/gitoxide/commit/8c492d7b7e6e5d520b1e3ffeb489eeb88266aa75))
- Change `rust-version` manifest field back to 1.65. ([`3bd09ef`](https://github.com/Byron/gitoxide/commit/3bd09ef120945a9669321ea856db4079a5dab930))
view details
+
+ * **Uncategorized**
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.3, gix-hash v0.14.1, gix-trace v0.1.6, gix-features v0.37.1, gix-actor v0.29.1, gix-validate v0.8.3, gix-object v0.40.1, gix-path v0.10.3, gix-glob v0.15.1, gix-quote v0.4.10, gix-attributes v0.21.1, gix-command v0.3.2, gix-packetline-blocking v0.17.2, gix-utils v0.1.8, gix-filter v0.8.1, gix-fs v0.9.1, gix-chunk v0.4.7, gix-commitgraph v0.23.1, gix-hashtable v0.5.1, gix-revwalk v0.11.1, gix-traverse v0.36.1, gix-worktree-stream v0.8.1, gix-archive v0.8.1, gix-config-value v0.14.3, gix-tempfile v12.0.1, gix-lock v12.0.1, gix-ref v0.40.1, gix-sec v0.10.3, gix-config v0.33.1, gix-prompt v0.8.2, gix-url v0.26.1, gix-credentials v0.23.1, gix-ignore v0.10.1, gix-bitmap v0.2.10, gix-index v0.28.1, gix-worktree v0.29.1, gix-diff v0.39.1, gix-discover v0.28.1, gix-macros v0.1.3, gix-mailmap v0.21.1, gix-negotiate v0.11.1, gix-pack v0.46.1, gix-odb v0.56.1, gix-pathspec v0.5.1, gix-packetline v0.17.2, gix-transport v0.40.1, gix-protocol v0.43.1, gix-revision v0.25.1, gix-refspec v0.21.1, gix-status v0.4.1, gix-submodule v0.7.1, gix-worktree-state v0.6.1, gix v0.57.1 ([`972241f`](https://github.com/Byron/gitoxide/commit/972241f1904944e8b6e84c6aa1649a49be7a85c3))
- Merge branch 'msrv' ([`8c492d7`](https://github.com/Byron/gitoxide/commit/8c492d7b7e6e5d520b1e3ffeb489eeb88266aa75))
- Change `rust-version` manifest field back to 1.65. ([`3bd09ef`](https://github.com/Byron/gitoxide/commit/3bd09ef120945a9669321ea856db4079a5dab930))
view details
+
+ * **Uncategorized**
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Release gix-path v0.10.5 ([`b8cba96`](https://github.com/Byron/gitoxide/commit/b8cba96ce57f8b6b0067d6a8cf3e37eaf280a238))
view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge branch 'various-fixes' ([`d6cd449`](https://github.com/Byron/gitoxide/commit/d6cd44930fb204b06e2b70fc6965e7705530c47a))
+ - Merge pull request from GHSA-7w47-3wg8-547c ([`79dce79`](https://github.com/Byron/gitoxide/commit/79dce79c62f6072aa2653780d590dc3993dfa401))
+ - `State::from_tree()` now performs name validation. ([`2ea87f0`](https://github.com/Byron/gitoxide/commit/2ea87f0060fd796961a2173569f16f362ed61617))
+ - Apply suggestions from code review ([`bad9a79`](https://github.com/Byron/gitoxide/commit/bad9a797b99880ce9d1c20e11c801bd0e741db64))
+ - Make clear that indices can contain invalid or dangerous paths. ([`b6a67d7`](https://github.com/Byron/gitoxide/commit/b6a67d7fe3b5645fccb785af01d72919c6761c52))
+ - Add `From for gix_index::entry::Mode`. ([`9564699`](https://github.com/Byron/gitoxide/commit/956469944d14bc0e5b16e3f95d407bb8b2282903))
+ - Merge branch 'cargo-fixes' ([`977346e`](https://github.com/Byron/gitoxide/commit/977346ee61de6207c66f3de003db6e8c722fb81c))
+view details
+
+ * **Uncategorized**
+ - Release gix-index v0.32.1, gix-pathspec v0.7.4, gix-worktree v0.33.1, gix-dir v0.4.1 ([`54ac559`](https://github.com/Byron/gitoxide/commit/54ac55946bb04635cd74582a1ce2e4bee70f2e60))
+ - Prepare changelog prior to `gix-dir` patch release ([`6ca6fa6`](https://github.com/Byron/gitoxide/commit/6ca6fa69b5c21c8d8e9e07e21558e98201504cda))
+ - Merge pull request #1345 from EliahKagan/shell-scripts ([`fe24c89`](https://github.com/Byron/gitoxide/commit/fe24c89e326670deaa3aaa643276d612d866072e))
+ - Add missing +x bit on scripts that are run and not sourced ([`41bf65a`](https://github.com/Byron/gitoxide/commit/41bf65adef6f7d2cdd28fede262173ec7ba10822))
+view details
+
+ * **[#1330](https://github.com/Byron/gitoxide/issues/1330)**
+ - Fix unread-fields warnings on latest nightly ([`2e06a00`](https://github.com/Byron/gitoxide/commit/2e06a00800418a6f571ba1731ffe05074565af03))
+ * **Uncategorized**
+ - Release gix-trace v0.1.9, gix-utils v0.1.12, gix-packetline-blocking v0.17.4, gix-filter v0.11.1, gix-fs v0.10.2, gix-traverse v0.39.0, gix-worktree-stream v0.12.0, gix-archive v0.12.0, gix-config v0.36.1, gix-url v0.27.3, gix-index v0.32.0, gix-worktree v0.33.0, gix-diff v0.43.0, gix-pathspec v0.7.3, gix-dir v0.4.0, gix-pack v0.50.0, gix-odb v0.60.0, gix-transport v0.42.0, gix-protocol v0.45.0, gix-status v0.9.0, gix-worktree-state v0.10.0, gix v0.62.0, gix-fsck v0.4.0, gitoxide-core v0.37.0, gitoxide v0.35.0, safety bump 14 crates ([`095c673`](https://github.com/Byron/gitoxide/commit/095c6739b2722a8b9af90776b435ef2da454c0e6))
+ - Prepare changelogs prior to release ([`5755271`](https://github.com/Byron/gitoxide/commit/57552717f46f96c35ba4ddc0a64434354ef845e9))
+ - Merge branch 'status' ([`45edd2e`](https://github.com/Byron/gitoxide/commit/45edd2ea66035adf526cb2f617873dcba60a2a9a))
+ - Adapt to changes in `gix-index` ([`1e1fce1`](https://github.com/Byron/gitoxide/commit/1e1fce11a968ebbcede1135ccbd0b03e749a1267))
+ - Turn `entry::Stage` into an `enum`. ([`a6cc781`](https://github.com/Byron/gitoxide/commit/a6cc78176c5b399c363bb6ee776cb16d6f5d3dad))
+view details
+
+ * **Uncategorized**
+ - Release gix-actor v0.31.1, gix-object v0.42.1, gix-index v0.31.1, gix-pathspec v0.7.2, gix-dir v0.3.0, gix-status v0.8.0, gix v0.61.0, safety bump 2 crates ([`155cc45`](https://github.com/Byron/gitoxide/commit/155cc45730b259e662d7c4be42a469a3af3750e1))
+ - Prepare changelog prior to release ([`129ba3d`](https://github.com/Byron/gitoxide/commit/129ba3deccc9ada0dc571466458845939502763d))
+ - Merge branch 'improvements-for-cargo' ([`41cd53e`](https://github.com/Byron/gitoxide/commit/41cd53e2af76e35e047aac4eca6324774df4cb50))
+ - Remove a TODO as it doesn't make sense anymore. ([`b05af9f`](https://github.com/Byron/gitoxide/commit/b05af9f86119ba5c71a19d632312fd66edb30a0e))
+view details
+
+ * **[#1312](https://github.com/Byron/gitoxide/issues/1312)**
+ - Assure memory maps are created with `MAP_PRIVATE` ([`88061a1`](https://github.com/Byron/gitoxide/commit/88061a176b2f4b5a377a4cff513979ddb1e306a1))
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+ - Merge branch 'mmap-mode' ([`9e9b9fe`](https://github.com/Byron/gitoxide/commit/9e9b9fe6f63759d3bf479a8ec2f9dd1fbef87a08))
+ - Fix usage of tracing span (which now is just a message) ([`259b38e`](https://github.com/Byron/gitoxide/commit/259b38e629807e887442ca6140a14cefcd672699))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Merge branch 'btoi' ([`5fc379d`](https://github.com/Byron/gitoxide/commit/5fc379d1dc867d15a50cb086e30beefde2b42d86))
- Refactor ([`c5c69bd`](https://github.com/Byron/gitoxide/commit/c5c69bd355771a6fb3e4f6db0c5f49aa2bf7f42f))
diff --git a/gix-index/Cargo.toml b/gix-index/Cargo.toml
index 684c93c5713..92290db0a30 100644
--- a/gix-index/Cargo.toml
+++ b/gix-index/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-index"
-version = "0.30.0"
+version = "0.33.0"
repository = "https://github.com/Byron/gitoxide"
license = "MIT OR Apache-2.0"
description = "A work-in-progress crate of the gitoxide project dedicated implementing the git index file"
@@ -20,17 +20,18 @@ test = true
serde = ["dep:serde", "smallvec/serde", "gix-hash/serde"]
[dependencies]
-gix-features = { version = "^0.38.0", path = "../gix-features", features = [
+gix-features = { version = "^0.38.2", path = "../gix-features", features = [
"rustsha1",
"progress",
] }
-gix-hash = { version = "^0.14.1", path = "../gix-hash" }
-gix-bitmap = { version = "^0.2.10", path = "../gix-bitmap" }
-gix-object = { version = "^0.41.1", path = "../gix-object" }
-gix-traverse = { version = "^0.37.0", path = "../gix-traverse" }
-gix-lock = { version = "^13.0.0", path = "../gix-lock" }
-gix-fs = { version = "^0.10.0", path = "../gix-fs" }
-gix-utils = { version = "^0.1.10", path = "../gix-utils" }
+gix-hash = { version = "^0.14.2", path = "../gix-hash" }
+gix-bitmap = { version = "^0.2.11", path = "../gix-bitmap" }
+gix-object = { version = "^0.42.2", path = "../gix-object" }
+gix-validate = { version = "^0.8.5", path = "../gix-validate" }
+gix-traverse = { version = "^0.39.1", path = "../gix-traverse" }
+gix-lock = { version = "^14.0.0", path = "../gix-lock" }
+gix-fs = { version = "^0.11.1", path = "../gix-fs" }
+gix-utils = { version = "^0.1.12", path = "../gix-utils" }
hashbrown = "0.14.3"
fnv = "1.0.7"
diff --git a/gix-index/src/access/mod.rs b/gix-index/src/access/mod.rs
index 431a47e5805..dd2449c6d47 100644
--- a/gix-index/src/access/mod.rs
+++ b/gix-index/src/access/mod.rs
@@ -3,6 +3,7 @@ use std::{cmp::Ordering, ops::Range};
use bstr::{BStr, ByteSlice, ByteVec};
use filetime::FileTime;
+use crate::entry::{Stage, StageRaw};
use crate::{entry, extension, AccelerateLookup, Entry, PathStorage, PathStorageRef, State, Version};
// TODO: integrate this somehow, somewhere, depending on later usage.
@@ -81,7 +82,7 @@ impl State {
res
})
.ok()?;
- self.entry_index_by_idx_and_stage(path, idx, stage, stage_cmp)
+ self.entry_index_by_idx_and_stage(path, idx, stage as StageRaw, stage_cmp)
}
/// Walk as far in `direction` as possible, with [`Ordering::Greater`] towards higher stages, and [`Ordering::Less`]
@@ -112,7 +113,7 @@ impl State {
&self,
path: &BStr,
idx: usize,
- wanted_stage: entry::Stage,
+ wanted_stage: entry::StageRaw,
stage_cmp: Ordering,
) -> Option {
match stage_cmp {
@@ -121,7 +122,7 @@ impl State {
.enumerate()
.rev()
.take_while(|(_, e)| e.path(self) == path)
- .find_map(|(idx, e)| (e.stage() == wanted_stage).then_some(idx)),
+ .find_map(|(idx, e)| (e.stage_raw() == wanted_stage).then_some(idx)),
Ordering::Equal => Some(idx),
Ordering::Less => self
.entries
@@ -129,7 +130,7 @@ impl State {
.iter()
.enumerate()
.take_while(|(_, e)| e.path(self) == path)
- .find_map(|(ofs, e)| (e.stage() == wanted_stage).then_some(idx + ofs + 1)),
+ .find_map(|(ofs, e)| (e.stage_raw() == wanted_stage).then_some(idx + ofs + 1)),
}
}
@@ -173,7 +174,7 @@ impl State {
}
}
}
- gix_features::trace::detail!("stored directories", directories = out.icase_dirs.len());
+ gix_features::trace::debug!(directories = out.icase_dirs.len(), "stored directories");
out
}
@@ -291,7 +292,7 @@ impl State {
.binary_search_by(|e| {
let res = e.path(self).cmp(path);
if res.is_eq() {
- stage_at_index = e.stage();
+ stage_at_index = e.stage_raw();
}
res
})
@@ -299,7 +300,7 @@ impl State {
let idx = if stage_at_index == 0 || stage_at_index == 2 {
idx
} else {
- self.entry_index_by_idx_and_stage(path, idx, 2, stage_at_index.cmp(&2))?
+ self.entry_index_by_idx_and_stage(path, idx, Stage::Ours as StageRaw, stage_at_index.cmp(&2))?
};
Some(&self.entries[idx])
}
@@ -334,13 +335,13 @@ impl State {
+ self.entries[low..].partition_point(|e| e.path(self).get(..prefix_len).map_or(false, |p| p <= prefix));
let low_entry = &self.entries.get(low)?;
- if low_entry.stage() != 0 {
+ if low_entry.stage_raw() != 0 {
low = self
.walk_entry_stages(low_entry.path(self), low, Ordering::Less)
.unwrap_or(low);
}
if let Some(high_entry) = self.entries.get(high) {
- if high_entry.stage() != 0 {
+ if high_entry.stage_raw() != 0 {
high = self
.walk_entry_stages(high_entry.path(self), high, Ordering::Less)
.unwrap_or(high);
@@ -374,7 +375,7 @@ impl State {
.binary_search_by(|e| {
let res = e.path(self).cmp(path);
if res.is_eq() {
- stage_at_index = e.stage();
+ stage_at_index = e.stage_raw();
}
res
})
diff --git a/gix-index/src/decode/entries.rs b/gix-index/src/decode/entries.rs
index 78f544691ae..d3bda1cb6a3 100644
--- a/gix-index/src/decode/entries.rs
+++ b/gix-index/src/decode/entries.rs
@@ -1,4 +1,4 @@
-use std::{convert::TryInto, ops::Range};
+use std::ops::Range;
use crate::{
decode::{self, header},
diff --git a/gix-index/src/decode/mod.rs b/gix-index/src/decode/mod.rs
index aea189248bd..6c77109877a 100644
--- a/gix-index/src/decode/mod.rs
+++ b/gix-index/src/decode/mod.rs
@@ -4,6 +4,7 @@ use crate::{entry, extension, Entry, State, Version};
mod entries;
///
+#[allow(clippy::empty_docs)]
pub mod header;
mod error {
diff --git a/gix-index/src/entry/flags.rs b/gix-index/src/entry/flags.rs
index 05198bafb01..c32cb6f8d7a 100644
--- a/gix-index/src/entry/flags.rs
+++ b/gix-index/src/entry/flags.rs
@@ -62,6 +62,23 @@ bitflags! {
impl Flags {
/// Return the stage as extracted from the bits of this instance.
pub fn stage(&self) -> Stage {
+ match self.stage_raw() {
+ 0 => Stage::Unconflicted,
+ 1 => Stage::Base,
+ 2 => Stage::Ours,
+ 3 => Stage::Theirs,
+ _ => unreachable!("BUG: Flags::STAGE_MASK is two bits, whose 4 possible values we have covered"),
+ }
+ }
+
+ /// Return an entry's stage as raw number between 0 and 4.
+ /// Possible values are:
+ ///
+ /// * 0 = no conflict,
+ /// * 1 = base,
+ /// * 2 = ours,
+ /// * 3 = theirs
+ pub fn stage_raw(&self) -> u32 {
(*self & Flags::STAGE_MASK).bits() >> 12
}
diff --git a/gix-index/src/entry/mod.rs b/gix-index/src/entry/mod.rs
index b7fb13f7baf..5fd2e501930 100644
--- a/gix-index/src/entry/mod.rs
+++ b/gix-index/src/entry/mod.rs
@@ -1,11 +1,26 @@
-/// The stage of an entry, one of…
+/// The stage of an entry.
+#[derive(Default, Copy, Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)]
+pub enum Stage {
+ /// This is the default, and most entries are in this stage.
+ #[default]
+ Unconflicted = 0,
+ /// The entry is the common base between 'our' change and 'their' change, for comparison.
+ Base = 1,
+ /// The entry represents our change.
+ Ours = 2,
+ /// The entry represents their change.
+ Theirs = 3,
+}
+
+// The stage of an entry, one of…
/// * 0 = no conflict,
/// * 1 = base,
/// * 2 = ours,
/// * 3 = theirs
-pub type Stage = u32;
+pub type StageRaw = u32;
///
+#[allow(clippy::empty_docs)]
pub mod mode;
mod flags;
@@ -13,14 +28,12 @@ pub(crate) use flags::at_rest;
pub use flags::Flags;
///
+#[allow(clippy::empty_docs)]
pub mod stat;
mod write;
use bitflags::bitflags;
-// TODO: we essentially treat this as an enum with the only exception being
-// that `FILE_EXECUTABLE.contains(FILE)` works might want to turn this into an
-// enum proper
bitflags! {
/// The kind of file of an entry.
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
@@ -79,6 +92,17 @@ mod access {
pub fn stage(&self) -> entry::Stage {
self.flags.stage()
}
+
+ /// Return an entry's stage as raw number between 0 and 4.
+ /// Possible values are:
+ ///
+ /// * 0 = no conflict,
+ /// * 1 = base,
+ /// * 2 = ours,
+ /// * 3 = theirs
+ pub fn stage_raw(&self) -> u32 {
+ self.flags.stage_raw()
+ }
}
}
diff --git a/gix-index/src/entry/mode.rs b/gix-index/src/entry/mode.rs
index fca861d2b18..dc3a9a6de94 100644
--- a/gix-index/src/entry/mode.rs
+++ b/gix-index/src/entry/mode.rs
@@ -67,6 +67,12 @@ impl Mode {
}
}
+impl From for Mode {
+ fn from(value: gix_object::tree::EntryMode) -> Self {
+ Self::from_bits_truncate(value.0 as u32)
+ }
+}
+
/// A change of a [`Mode`].
pub enum Change {
/// The type of mode changed, like symlink => file.
diff --git a/gix-index/src/entry/write.rs b/gix-index/src/entry/write.rs
index 2a6ad55884c..66ef24d9a9e 100644
--- a/gix-index/src/entry/write.rs
+++ b/gix-index/src/entry/write.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
use crate::{entry, Entry, State};
impl Entry {
diff --git a/gix-index/src/extension/decode.rs b/gix-index/src/extension/decode.rs
index fa0a624104b..4114f8c8f20 100644
--- a/gix-index/src/extension/decode.rs
+++ b/gix-index/src/extension/decode.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
use crate::{extension, extension::Signature, util::from_be_u32};
pub(crate) fn header(data: &[u8]) -> (Signature, u32, &[u8]) {
diff --git a/gix-index/src/extension/fs_monitor.rs b/gix-index/src/extension/fs_monitor.rs
index 4bb5016ffe5..79d609dba19 100644
--- a/gix-index/src/extension/fs_monitor.rs
+++ b/gix-index/src/extension/fs_monitor.rs
@@ -6,6 +6,7 @@ use crate::{
};
#[derive(Clone)]
+#[allow(dead_code)]
pub enum Token {
V1 { nanos_since_1970: u64 },
V2 { token: BString },
diff --git a/gix-index/src/extension/iter.rs b/gix-index/src/extension/iter.rs
index f791b064eb4..ed0a457343d 100644
--- a/gix-index/src/extension/iter.rs
+++ b/gix-index/src/extension/iter.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
use crate::{extension, extension::Iter, util::from_be_u32};
impl<'a> Iter<'a> {
diff --git a/gix-index/src/extension/link.rs b/gix-index/src/extension/link.rs
index 722cbd17971..f2d52ca3d43 100644
--- a/gix-index/src/extension/link.rs
+++ b/gix-index/src/extension/link.rs
@@ -16,6 +16,7 @@ pub struct Bitmaps {
}
///
+#[allow(clippy::empty_docs)]
pub mod decode {
/// The error returned when decoding link extensions.
diff --git a/gix-index/src/extension/mod.rs b/gix-index/src/extension/mod.rs
index 33b91c5517b..3b51de6b20d 100644
--- a/gix-index/src/extension/mod.rs
+++ b/gix-index/src/extension/mod.rs
@@ -74,23 +74,29 @@ mod iter;
pub(crate) mod fs_monitor;
///
+#[allow(clippy::empty_docs)]
pub mod decode;
///
+#[allow(clippy::empty_docs)]
pub mod tree;
///
+#[allow(clippy::empty_docs)]
pub mod end_of_index_entry;
pub(crate) mod index_entry_offset_table;
///
+#[allow(clippy::empty_docs)]
pub mod link;
pub(crate) mod resolve_undo;
///
+#[allow(clippy::empty_docs)]
pub mod untracked_cache;
///
+#[allow(clippy::empty_docs)]
pub mod sparse;
diff --git a/gix-index/src/extension/tree/decode.rs b/gix-index/src/extension/tree/decode.rs
index a55d12269a1..71e881ac38a 100644
--- a/gix-index/src/extension/tree/decode.rs
+++ b/gix-index/src/extension/tree/decode.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
use gix_hash::ObjectId;
use crate::{
diff --git a/gix-index/src/extension/tree/mod.rs b/gix-index/src/extension/tree/mod.rs
index f2075939978..8831530e590 100644
--- a/gix-index/src/extension/tree/mod.rs
+++ b/gix-index/src/extension/tree/mod.rs
@@ -4,6 +4,7 @@ use crate::extension::Signature;
pub const SIGNATURE: Signature = *b"TREE";
///
+#[allow(clippy::empty_docs)]
pub mod verify;
mod decode;
diff --git a/gix-index/src/extension/tree/write.rs b/gix-index/src/extension/tree/write.rs
index 2b1e3d94950..354ff0d393e 100644
--- a/gix-index/src/extension/tree/write.rs
+++ b/gix-index/src/extension/tree/write.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
use crate::extension::{tree, Tree};
impl Tree {
diff --git a/gix-index/src/extension/untracked_cache.rs b/gix-index/src/extension/untracked_cache.rs
index f3b2d8afdcb..c47d6883745 100644
--- a/gix-index/src/extension/untracked_cache.rs
+++ b/gix-index/src/extension/untracked_cache.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
use bstr::BString;
use gix_hash::ObjectId;
diff --git a/gix-index/src/file/init.rs b/gix-index/src/file/init.rs
index 88dd86af9ac..10c01015fcb 100644
--- a/gix-index/src/file/init.rs
+++ b/gix-index/src/file/init.rs
@@ -2,8 +2,6 @@
use std::path::{Path, PathBuf};
-use memmap2::Mmap;
-
use crate::{decode, extension, File, State};
mod error {
@@ -64,7 +62,7 @@ impl File {
let mut file = std::fs::File::open(&path)?;
// SAFETY: we have to take the risk of somebody changing the file underneath. Git never writes into the same file.
#[allow(unsafe_code)]
- let data = unsafe { Mmap::map(&file)? };
+ let data = unsafe { memmap2::MmapOptions::new().map_copy_read_only(&file)? };
if !skip_hash {
// Note that even though it's trivial to offload this into a thread, which is worth it for all but the smallest
diff --git a/gix-index/src/file/mod.rs b/gix-index/src/file/mod.rs
index 40332abbd0e..68f6e6268c7 100644
--- a/gix-index/src/file/mod.rs
+++ b/gix-index/src/file/mod.rs
@@ -83,8 +83,11 @@ mod mutation {
}
///
+#[allow(clippy::empty_docs)]
pub mod init;
///
+#[allow(clippy::empty_docs)]
pub mod verify;
///
+#[allow(clippy::empty_docs)]
pub mod write;
diff --git a/gix-index/src/fs.rs b/gix-index/src/fs.rs
index a9acb155de2..5fb369f9eef 100644
--- a/gix-index/src/fs.rs
+++ b/gix-index/src/fs.rs
@@ -54,16 +54,16 @@ impl Metadata {
pub fn modified(&self) -> Option {
#[cfg(not(windows))]
{
- #[cfg(not(target_os = "aix"))]
+ #[cfg(not(any(target_os = "aix", target_os = "hurd")))]
let seconds = self.0.st_mtime;
- #[cfg(target_os = "aix")]
+ #[cfg(any(target_os = "aix", target_os = "hurd"))]
let seconds = self.0.st_mtim.tv_sec;
- #[cfg(not(any(target_os = "netbsd", target_os = "aix")))]
+ #[cfg(not(any(target_os = "netbsd", target_os = "aix", target_os = "hurd")))]
let nanoseconds = self.0.st_mtime_nsec;
#[cfg(target_os = "netbsd")]
let nanoseconds = self.0.st_mtimensec;
- #[cfg(target_os = "aix")]
+ #[cfg(any(target_os = "aix", target_os = "hurd"))]
let nanoseconds = self.0.st_mtim.tv_nsec;
// All operating systems treat the seconds as offset from unix epoch, hence it must
@@ -83,16 +83,16 @@ impl Metadata {
pub fn created(&self) -> Option {
#[cfg(not(windows))]
{
- #[cfg(not(target_os = "aix"))]
+ #[cfg(not(any(target_os = "aix", target_os = "hurd")))]
let seconds = self.0.st_ctime;
- #[cfg(target_os = "aix")]
+ #[cfg(any(target_os = "aix", target_os = "hurd"))]
let seconds = self.0.st_ctim.tv_sec;
- #[cfg(not(any(target_os = "netbsd", target_os = "aix")))]
+ #[cfg(not(any(target_os = "netbsd", target_os = "aix", target_os = "hurd")))]
let nanoseconds = self.0.st_ctime_nsec;
#[cfg(target_os = "netbsd")]
let nanoseconds = self.0.st_ctimensec;
- #[cfg(target_os = "aix")]
+ #[cfg(any(target_os = "aix", target_os = "hurd"))]
let nanoseconds = self.0.st_ctim.tv_nsec;
// All operating systems treat the seconds as offset from unix epoch, hence it must
diff --git a/gix-index/src/init.rs b/gix-index/src/init.rs
index ecb1f0b13a8..1301df77e9e 100644
--- a/gix-index/src/init.rs
+++ b/gix-index/src/init.rs
@@ -1,4 +1,6 @@
-mod from_tree {
+#[allow(clippy::empty_docs)]
+///
+pub mod from_tree {
use std::collections::VecDeque;
use bstr::{BStr, BString, ByteSlice, ByteVec};
@@ -10,6 +12,19 @@ mod from_tree {
Entry, PathStorage, State, Version,
};
+ /// The error returned by [State::from_tree()].
+ #[derive(Debug, thiserror::Error)]
+ #[allow(missing_docs)]
+ pub enum Error {
+ #[error("The path \"{path}\" is invalid")]
+ InvalidComponent {
+ path: BString,
+ source: gix_validate::path::component::Error,
+ },
+ #[error(transparent)]
+ Traversal(#[from] gix_traverse::tree::breadthfirst::Error),
+ }
+
/// Initialization
impl State {
/// Return a new and empty in-memory index assuming the given `object_hash`.
@@ -32,23 +47,42 @@ mod from_tree {
}
/// Create an index [`State`] by traversing `tree` recursively, accessing sub-trees
/// with `objects`.
+ /// `validate` is used to determine which validations to perform on every path component we see.
///
/// **No extension data is currently produced**.
- pub fn from_tree(tree: &gix_hash::oid, objects: Find) -> Result
+ pub fn from_tree(
+ tree: &gix_hash::oid,
+ objects: Find,
+ validate: gix_validate::path::component::Options,
+ ) -> Result
where
Find: gix_object::Find,
{
let _span = gix_features::trace::coarse!("gix_index::State::from_tree()");
let mut buf = Vec::new();
- let root = objects.find_tree_iter(tree, &mut buf)?;
- let mut delegate = CollectEntries::new();
- breadthfirst(root, breadthfirst::State::default(), &objects, &mut delegate)?;
+ let root = objects
+ .find_tree_iter(tree, &mut buf)
+ .map_err(breadthfirst::Error::from)?;
+ let mut delegate = CollectEntries::new(validate);
+ match breadthfirst(root, breadthfirst::State::default(), &objects, &mut delegate) {
+ Ok(()) => {}
+ Err(gix_traverse::tree::breadthfirst::Error::Cancelled) => {
+ let (path, err) = delegate
+ .invalid_path
+ .take()
+ .expect("cancellation only happens on validation error");
+ return Err(Error::InvalidComponent { path, source: err });
+ }
+ Err(err) => return Err(err.into()),
+ }
let CollectEntries {
mut entries,
path_backing,
path: _,
path_deque: _,
+ validate: _,
+ invalid_path: _,
} = delegate;
entries.sort_by(|a, b| Entry::cmp_filepaths(a.path_in(&path_backing), b.path_in(&path_backing)));
@@ -76,15 +110,19 @@ mod from_tree {
path_backing: PathStorage,
path: BString,
path_deque: VecDeque,
+ validate: gix_validate::path::component::Options,
+ invalid_path: Option<(BString, gix_validate::path::component::Error)>,
}
impl CollectEntries {
- pub fn new() -> CollectEntries {
+ pub fn new(validate: gix_validate::path::component::Options) -> CollectEntries {
CollectEntries {
entries: Vec::new(),
path_backing: Vec::new(),
path: BString::default(),
path_deque: VecDeque::new(),
+ validate,
+ invalid_path: None,
}
}
@@ -93,6 +131,11 @@ mod from_tree {
self.path.push(b'/');
}
self.path.push_str(name);
+ if self.invalid_path.is_none() {
+ if let Err(err) = gix_validate::path::component(name, None, self.validate) {
+ self.invalid_path = Some((self.path.clone(), err))
+ }
+ }
}
pub fn add_entry(&mut self, entry: &tree::EntryRef<'_>) {
@@ -103,6 +146,18 @@ mod from_tree {
EntryKind::Link => Mode::SYMLINK,
EntryKind::Commit => Mode::COMMIT,
};
+ // There are leaf-names that require special validation, specific to their mode.
+ // Double-validate just for this case, as the previous validation didn't know the mode yet.
+ if self.invalid_path.is_none() {
+ let start = self.path.rfind_byte(b'/').map(|pos| pos + 1).unwrap_or_default();
+ if let Err(err) = gix_validate::path::component(
+ self.path[start..].as_ref(),
+ (entry.mode.kind() == EntryKind::Link).then_some(gix_validate::path::component::Mode::Symlink),
+ self.validate,
+ ) {
+ self.invalid_path = Some((self.path.clone(), err));
+ }
+ }
let path_start = self.path_backing.len();
self.path_backing.extend_from_slice(&self.path);
@@ -117,6 +172,14 @@ mod from_tree {
self.entries.push(new_entry);
}
+
+ fn determine_action(&self) -> Action {
+ if self.invalid_path.is_none() {
+ Action::Continue
+ } else {
+ Action::Cancel
+ }
+ }
}
impl Visit for CollectEntries {
@@ -127,12 +190,12 @@ mod from_tree {
.expect("every call is matched with push_tracked_path_component");
}
- fn push_back_tracked_path_component(&mut self, component: &bstr::BStr) {
+ fn push_back_tracked_path_component(&mut self, component: &BStr) {
self.push_element(component);
self.path_deque.push_back(self.path.clone());
}
- fn push_path_component(&mut self, component: &bstr::BStr) {
+ fn push_path_component(&mut self, component: &BStr) {
self.push_element(component);
}
@@ -144,13 +207,13 @@ mod from_tree {
}
}
- fn visit_tree(&mut self, _entry: &gix_object::tree::EntryRef<'_>) -> gix_traverse::tree::visit::Action {
- Action::Continue
+ fn visit_tree(&mut self, _entry: &gix_object::tree::EntryRef<'_>) -> Action {
+ self.determine_action()
}
- fn visit_nontree(&mut self, entry: &gix_object::tree::EntryRef<'_>) -> gix_traverse::tree::visit::Action {
+ fn visit_nontree(&mut self, entry: &gix_object::tree::EntryRef<'_>) -> Action {
self.add_entry(entry);
- Action::Continue
+ self.determine_action()
}
}
}
diff --git a/gix-index/src/lib.rs b/gix-index/src/lib.rs
index 96a218c6355..1e157bdc0d5 100644
--- a/gix-index/src/lib.rs
+++ b/gix-index/src/lib.rs
@@ -13,25 +13,33 @@ use filetime::FileTime;
pub use gix_hash as hash;
///
+#[allow(clippy::empty_docs)]
pub mod file;
///
+#[allow(clippy::empty_docs)]
pub mod extension;
///
+#[allow(clippy::empty_docs)]
pub mod entry;
mod access;
-mod init;
+///
+#[allow(clippy::empty_docs)]
+pub mod init;
///
+#[allow(clippy::empty_docs)]
pub mod decode;
///
+#[allow(clippy::empty_docs)]
pub mod verify;
///
+#[allow(clippy::empty_docs)]
pub mod write;
pub mod fs;
@@ -107,6 +115,21 @@ pub struct AccelerateLookup<'a> {
///
/// As opposed to a snapshot, it's meant to be altered and eventually be written back to disk or converted into a tree.
/// We treat index and its state synonymous.
+///
+/// # A note on safety
+///
+/// An index (i.e. [`State`]) created by hand is not guaranteed to have valid entry paths as they are entirely controlled
+/// by the caller, without applying any level of validation.
+///
+/// This means that before using these paths to recreate files on disk, *they must be validated*.
+///
+/// It's notable that it's possible to manufacture tree objects which contain names like `.git/hooks/pre-commit`
+/// which then will look like `.git/hooks/pre-commit` in the index, which doesn't care that the name came from a single
+/// tree instead of from trees named `.git`, `hooks` and a blob named `pre-commit`. The effect is still the same - an invalid
+/// path is presented in the index and its consumer must validate each path component before usage.
+///
+/// It's recommended to do that using `gix_worktree::Stack` which has it built-in if it's created `for_checkout()`. Alternatively
+/// one can validate component names with `gix_validate::path::component()`.
#[derive(Clone)]
pub struct State {
/// The kind of object hash used when storing the underlying file.
@@ -138,6 +161,7 @@ pub struct State {
}
mod impls {
+ use crate::entry::Stage;
use std::fmt::{Debug, Formatter};
use crate::State;
@@ -149,11 +173,10 @@ mod impls {
f,
"{} {}{:?} {} {}",
match entry.flags.stage() {
- 0 => " ",
- 1 => "BASE ",
- 2 => "OURS ",
- 3 => "THEIRS ",
- _ => "UNKNOWN",
+ Stage::Unconflicted => " ",
+ Stage::Base => "BASE ",
+ Stage::Ours => "OURS ",
+ Stage::Theirs => "THEIRS ",
},
if entry.flags.is_empty() {
"".to_string()
@@ -171,8 +194,6 @@ mod impls {
}
pub(crate) mod util {
- use std::convert::TryInto;
-
#[inline]
pub fn var_int(data: &[u8]) -> Option<(u64, &[u8])> {
let (num, consumed) = gix_features::decode::leb64_from_read(data).ok()?;
diff --git a/gix-index/src/verify.rs b/gix-index/src/verify.rs
index 776f13b3c5f..e01a26fe306 100644
--- a/gix-index/src/verify.rs
+++ b/gix-index/src/verify.rs
@@ -3,6 +3,7 @@ use std::cmp::Ordering;
use crate::State;
///
+#[allow(clippy::empty_docs)]
pub mod entries {
use bstr::BString;
@@ -22,6 +23,7 @@ pub mod entries {
}
///
+#[allow(clippy::empty_docs)]
pub mod extensions {
use crate::extension;
diff --git a/gix-index/src/write.rs b/gix-index/src/write.rs
index 3e90d52e5be..d52ba640ee0 100644
--- a/gix-index/src/write.rs
+++ b/gix-index/src/write.rs
@@ -1,4 +1,4 @@
-use std::{convert::TryInto, io::Write};
+use std::io::Write;
use crate::{entry, extension, write::util::CountBytes, State, Version};
@@ -183,8 +183,6 @@ fn entries(out: &mut CountBytes, state: &State, header_siz
}
mod util {
- use std::convert::TryFrom;
-
pub struct CountBytes {
pub count: u32,
pub inner: T,
diff --git a/gix-index/tests/Cargo.toml b/gix-index/tests/Cargo.toml
index 4d15e5aed4f..8e5700826f5 100644
--- a/gix-index/tests/Cargo.toml
+++ b/gix-index/tests/Cargo.toml
@@ -19,8 +19,9 @@ gix-features-parallel = ["gix-features/parallel"]
[dev-dependencies]
gix-index = { path = ".." }
gix-features = { path = "../../gix-features", features = ["rustsha1", "progress"] }
-gix-testtools = { path = "../../tests/tools"}
-gix = { path = "../../gix", default-features = false, features = ["index"] }
-gix-hash = { path = "../../gix-hash"}
+gix-testtools = { path = "../../tests/tools" }
+gix-odb = { path = "../../gix-odb" }
+gix-object = { path = "../../gix-object" }
+gix-hash = { path = "../../gix-hash" }
filetime = "0.2.15"
bstr = { version = "1.3.0", default-features = false }
diff --git a/gix-index/tests/fixtures/file_metadata.sh b/gix-index/tests/fixtures/file_metadata.sh
old mode 100644
new mode 100755
index 81ca3b8a3fa..94b45fcc6ae
--- a/gix-index/tests/fixtures/file_metadata.sh
+++ b/gix-index/tests/fixtures/file_metadata.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
# The largest-possible date for Ext4, nanos are special there, but ont usually on other filesystems
diff --git a/gix-index/tests/fixtures/generated-archives/V2_empty.tar.xz b/gix-index/tests/fixtures/generated-archives/V2_empty.tar.xz
index c3336ba9a2e..70ddca8c48b 100644
Binary files a/gix-index/tests/fixtures/generated-archives/V2_empty.tar.xz and b/gix-index/tests/fixtures/generated-archives/V2_empty.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/make_traverse_literal_separators.tar.xz b/gix-index/tests/fixtures/generated-archives/make_traverse_literal_separators.tar.xz
new file mode 100644
index 00000000000..f7b13684d75
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/make_traverse_literal_separators.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2.tar.xz b/gix-index/tests/fixtures/generated-archives/v2.tar.xz
index 42e49dc2c72..143f40f7ddc 100644
Binary files a/gix-index/tests/fixtures/generated-archives/v2.tar.xz and b/gix-index/tests/fixtures/generated-archives/v2.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_all_file_kinds.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_all_file_kinds.tar.xz
index 169e964ba09..a83ecec0af5 100644
Binary files a/gix-index/tests/fixtures/generated-archives/v2_all_file_kinds.tar.xz and b/gix-index/tests/fixtures/generated-archives/v2_all_file_kinds.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_icase_name_clashes.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_icase_name_clashes.tar.xz
index 7f7a4a42aba..17845f85aec 100644
Binary files a/gix-index/tests/fixtures/generated-archives/v2_icase_name_clashes.tar.xz and b/gix-index/tests/fixtures/generated-archives/v2_icase_name_clashes.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_more_files.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_more_files.tar.xz
index 4f257c10db9..68d730041aa 100644
Binary files a/gix-index/tests/fixtures/generated-archives/v2_more_files.tar.xz and b/gix-index/tests/fixtures/generated-archives/v2_more_files.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_sparse_index_no_dirs.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_sparse_index_no_dirs.tar.xz
index dac194d03cf..556b8fa5a83 100644
Binary files a/gix-index/tests/fixtures/generated-archives/v2_sparse_index_no_dirs.tar.xz and b/gix-index/tests/fixtures/generated-archives/v2_sparse_index_no_dirs.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_split_index.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_split_index.tar.xz
index c45f3fe336e..d666760516a 100644
Binary files a/gix-index/tests/fixtures/generated-archives/v2_split_index.tar.xz and b/gix-index/tests/fixtures/generated-archives/v2_split_index.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_split_index_recursive.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_split_index_recursive.tar.xz
index 03c891025ec..971200d51b9 100644
Binary files a/gix-index/tests/fixtures/generated-archives/v2_split_index_recursive.tar.xz and b/gix-index/tests/fixtures/generated-archives/v2_split_index_recursive.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_split_vs_regular_index.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_split_vs_regular_index.tar.xz
index 9d751efb419..4ba20b40755 100644
Binary files a/gix-index/tests/fixtures/generated-archives/v2_split_vs_regular_index.tar.xz and b/gix-index/tests/fixtures/generated-archives/v2_split_vs_regular_index.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/v3_added_files.tar.xz b/gix-index/tests/fixtures/generated-archives/v3_added_files.tar.xz
index d9806bdfece..9859e878710 100644
Binary files a/gix-index/tests/fixtures/generated-archives/v3_added_files.tar.xz and b/gix-index/tests/fixtures/generated-archives/v3_added_files.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/v3_skip_worktree.tar.xz b/gix-index/tests/fixtures/generated-archives/v3_skip_worktree.tar.xz
index aaeee1fa751..2aef44263a2 100644
Binary files a/gix-index/tests/fixtures/generated-archives/v3_skip_worktree.tar.xz and b/gix-index/tests/fixtures/generated-archives/v3_skip_worktree.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/v3_sparse_index.tar.xz b/gix-index/tests/fixtures/generated-archives/v3_sparse_index.tar.xz
index 0ed0fa93108..58a29bb4174 100644
Binary files a/gix-index/tests/fixtures/generated-archives/v3_sparse_index.tar.xz and b/gix-index/tests/fixtures/generated-archives/v3_sparse_index.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/v3_sparse_index_non_cone.tar.xz b/gix-index/tests/fixtures/generated-archives/v3_sparse_index_non_cone.tar.xz
index ee53ba29c48..1209c847522 100644
Binary files a/gix-index/tests/fixtures/generated-archives/v3_sparse_index_non_cone.tar.xz and b/gix-index/tests/fixtures/generated-archives/v3_sparse_index_non_cone.tar.xz differ
diff --git a/gix-index/tests/fixtures/generated-archives/v4_more_files_IEOT.tar.xz b/gix-index/tests/fixtures/generated-archives/v4_more_files_IEOT.tar.xz
index eb191c2d5fd..72c6cd5c119 100644
Binary files a/gix-index/tests/fixtures/generated-archives/v4_more_files_IEOT.tar.xz and b/gix-index/tests/fixtures/generated-archives/v4_more_files_IEOT.tar.xz differ
diff --git a/gix-index/tests/fixtures/make_index/V2_empty.sh b/gix-index/tests/fixtures/make_index/V2_empty.sh
index 1eb48b72b8c..d36f819498f 100755
--- a/gix-index/tests/fixtures/make_index/V2_empty.sh
+++ b/gix-index/tests/fixtures/make_index/V2_empty.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-index/tests/fixtures/make_index/v2.sh b/gix-index/tests/fixtures/make_index/v2.sh
index a61c9527d01..a39d25bea19 100755
--- a/gix-index/tests/fixtures/make_index/v2.sh
+++ b/gix-index/tests/fixtures/make_index/v2.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
export GIT_INDEX_VERSION=2
@@ -8,3 +8,5 @@ git config index.threads 2
touch a
git add a
git commit -m "empty"
+
+git rev-parse @^{tree} > head.tree
diff --git a/gix-index/tests/fixtures/make_index/v2_all_file_kinds.sh b/gix-index/tests/fixtures/make_index/v2_all_file_kinds.sh
index b7a4610da2f..0dae4a4027c 100755
--- a/gix-index/tests/fixtures/make_index/v2_all_file_kinds.sh
+++ b/gix-index/tests/fixtures/make_index/v2_all_file_kinds.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
export GIT_INDEX_VERSION=2;
@@ -22,3 +22,5 @@ mkdir d
git add .
git commit -m "init"
+
+git rev-parse @^{tree} > head.tree
diff --git a/gix-index/tests/fixtures/make_index/v2_deeper_tree.sh b/gix-index/tests/fixtures/make_index/v2_deeper_tree.sh
old mode 100644
new mode 100755
index fe2f6fa1f57..09ba2a53464
--- a/gix-index/tests/fixtures/make_index/v2_deeper_tree.sh
+++ b/gix-index/tests/fixtures/make_index/v2_deeper_tree.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
export GIT_INDEX_VERSION=2;
diff --git a/gix-index/tests/fixtures/make_index/v2_icase_name_clashes.sh b/gix-index/tests/fixtures/make_index/v2_icase_name_clashes.sh
old mode 100644
new mode 100755
index 78ae8c4331f..426e53c14f7
--- a/gix-index/tests/fixtures/make_index/v2_icase_name_clashes.sh
+++ b/gix-index/tests/fixtures/make_index/v2_icase_name_clashes.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-index/tests/fixtures/make_index/v2_more_files.sh b/gix-index/tests/fixtures/make_index/v2_more_files.sh
index d4cafddc097..f4b90c95aa3 100755
--- a/gix-index/tests/fixtures/make_index/v2_more_files.sh
+++ b/gix-index/tests/fixtures/make_index/v2_more_files.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
export GIT_INDEX_VERSION=2;
@@ -11,3 +11,5 @@ mkdir d
git add .
git commit -m "empty"
+
+git rev-parse @^{tree} > head.tree
diff --git a/gix-index/tests/fixtures/make_index/v2_sparse_index_no_dirs.sh b/gix-index/tests/fixtures/make_index/v2_sparse_index_no_dirs.sh
index 890483b4276..9a35bbfe03b 100755
--- a/gix-index/tests/fixtures/make_index/v2_sparse_index_no_dirs.sh
+++ b/gix-index/tests/fixtures/make_index/v2_sparse_index_no_dirs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
@@ -17,4 +17,4 @@ git config --worktree index.sparse true
echo "/*" > .git/info/sparse-checkout &&
echo "!/*/" >> .git/info/sparse-checkout
-git checkout main
\ No newline at end of file
+git checkout main
diff --git a/gix-index/tests/fixtures/make_index/v2_split_index.sh b/gix-index/tests/fixtures/make_index/v2_split_index.sh
index 0b5c98e5ed8..8fe5b58ce9c 100755
--- a/gix-index/tests/fixtures/make_index/v2_split_index.sh
+++ b/gix-index/tests/fixtures/make_index/v2_split_index.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
export GIT_INDEX_VERSION=2
diff --git a/gix-index/tests/fixtures/make_index/v2_split_index_recursive.sh b/gix-index/tests/fixtures/make_index/v2_split_index_recursive.sh
index 0763fbe5a66..02003737a92 100755
--- a/gix-index/tests/fixtures/make_index/v2_split_index_recursive.sh
+++ b/gix-index/tests/fixtures/make_index/v2_split_index_recursive.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
export GIT_INDEX_VERSION=2
diff --git a/gix-index/tests/fixtures/make_index/v2_split_vs_regular_index.sh b/gix-index/tests/fixtures/make_index/v2_split_vs_regular_index.sh
index 162ff6a3ca5..fd985a3235f 100755
--- a/gix-index/tests/fixtures/make_index/v2_split_vs_regular_index.sh
+++ b/gix-index/tests/fixtures/make_index/v2_split_vs_regular_index.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# Creates a 2 identical repositories, one using a split index, the other
# using a regular index
diff --git a/gix-index/tests/fixtures/make_index/v3_added_files.sh b/gix-index/tests/fixtures/make_index/v3_added_files.sh
index 8d2e5179fd2..d85db90ac4a 100755
--- a/gix-index/tests/fixtures/make_index/v3_added_files.sh
+++ b/gix-index/tests/fixtures/make_index/v3_added_files.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-index/tests/fixtures/make_index/v3_skip_worktree.sh b/gix-index/tests/fixtures/make_index/v3_skip_worktree.sh
index 3ebe78e04fb..9c74bdace5b 100755
--- a/gix-index/tests/fixtures/make_index/v3_skip_worktree.sh
+++ b/gix-index/tests/fixtures/make_index/v3_skip_worktree.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-index/tests/fixtures/make_index/v3_sparse_index.sh b/gix-index/tests/fixtures/make_index/v3_sparse_index.sh
index 9e88fb03178..a4410f6073b 100755
--- a/gix-index/tests/fixtures/make_index/v3_sparse_index.sh
+++ b/gix-index/tests/fixtures/make_index/v3_sparse_index.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-index/tests/fixtures/make_index/v3_sparse_index_non_cone.sh b/gix-index/tests/fixtures/make_index/v3_sparse_index_non_cone.sh
index 542d9c8ba2d..670cb73cff5 100755
--- a/gix-index/tests/fixtures/make_index/v3_sparse_index_non_cone.sh
+++ b/gix-index/tests/fixtures/make_index/v3_sparse_index_non_cone.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
@@ -13,4 +13,4 @@ mkdir d
git add .
git commit -m "init"
-git sparse-checkout set c1/c2 --no-cone
\ No newline at end of file
+git sparse-checkout set c1/c2 --no-cone
diff --git a/gix-index/tests/fixtures/make_index/v4_more_files_IEOT.sh b/gix-index/tests/fixtures/make_index/v4_more_files_IEOT.sh
index 3b22aaa6692..3bff00b94a7 100755
--- a/gix-index/tests/fixtures/make_index/v4_more_files_IEOT.sh
+++ b/gix-index/tests/fixtures/make_index/v4_more_files_IEOT.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
export GIT_INDEX_VERSION=4
@@ -12,3 +12,5 @@ touch x
git add .
git commit -m "empty"
+
+git rev-parse @^{tree} > head.tree
diff --git a/gix-index/tests/fixtures/make_traverse_literal_separators.sh b/gix-index/tests/fixtures/make_traverse_literal_separators.sh
new file mode 100644
index 00000000000..a310e9e1c91
--- /dev/null
+++ b/gix-index/tests/fixtures/make_traverse_literal_separators.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+set -eu -o pipefail
+
+# Makes a repo carrying a literally named file, which may even contain "/".
+# File content is from stdin. Arguments are repo name, file name, and file mode.
+function make_repo() (
+ local repo="$1" file="$2" mode="$3"
+ local blob_hash_escaped tree_hash commit_hash branch
+
+ git init -- "$repo"
+ cd -- "$repo" # Temporary, as the function body is a ( ) subshell.
+
+ blob_hash_escaped="$(git hash-object -w --stdin | sed 's/../\\x&/g')"
+
+ tree_hash="$(
+ printf "%s %s\\0$blob_hash_escaped" "$mode" "$file" |
+ git hash-object -t tree -w --stdin --literally
+ )"
+
+ commit_hash="$(git commit-tree -m 'Initial commit' "$tree_hash")"
+
+ branch="$(git symbolic-ref --short HEAD)"
+ git branch -f -- "$branch" "$commit_hash"
+ test -z "${DEBUG_FIXTURE-}" || git show # TODO: How should verbosity be controlled?
+ git rev-parse @^{tree} > head.tree
+)
+
+make_repo traverse_dotdot_slashes ../outside 100644 \
+ <<<'A file outside the working tree, somehow.'
+
+make_repo traverse_dotgit_slashes .git/hooks/pre-commit 100755 <<'EOF'
+#!/bin/sh
+printf 'Vulnerable!\n'
+date >vulnerable
+EOF
+
+make_repo traverse_dotdot_backslashes '..\outside' 100644 \
+ <<<'A file outside the working tree, somehow.'
+
+make_repo traverse_dotgit_backslashes '.git\hooks\pre-commit' 100755 <<'EOF'
+#!/bin/sh
+printf 'Vulnerable!\n'
+date >vulnerable
+EOF
diff --git a/gix-index/tests/index/access.rs b/gix-index/tests/index/access.rs
index af76a45a295..d3e720486a4 100644
--- a/gix-index/tests/index/access.rs
+++ b/gix-index/tests/index/access.rs
@@ -1,5 +1,6 @@
use crate::index::Fixture;
use bstr::{BString, ByteSlice};
+use gix_index::entry::Stage;
fn icase_fixture() -> gix_index::File {
Fixture::Generated("v2_icase_name_clashes").open()
@@ -11,7 +12,7 @@ fn entry_by_path() {
for entry in file.entries() {
let path = entry.path(&file);
assert_eq!(file.entry_by_path(path), Some(entry));
- assert_eq!(file.entry_by_path_and_stage(path, 0), Some(entry));
+ assert_eq!(file.entry_by_path_and_stage(path, Stage::Unconflicted), Some(entry));
}
}
@@ -140,27 +141,27 @@ fn entry_by_path_and_stage() {
for entry in file.entries() {
let path = entry.path(&file);
assert_eq!(
- file.entry_index_by_path_and_stage(path, 0)
+ file.entry_index_by_path_and_stage(path, Stage::Unconflicted)
.map(|idx| &file.entries()[idx]),
Some(entry)
);
- assert_eq!(file.entry_by_path_and_stage(path, 0), Some(entry));
+ assert_eq!(file.entry_by_path_and_stage(path, Stage::Unconflicted), Some(entry));
}
}
#[test]
fn entry_by_path_with_conflicting_file() {
let file = Fixture::Loose("conflicting-file").open();
- for expected_stage in [1 /* common ancestor */, 2 /* ours */, 3 /* theirs */] {
+ for expected_stage in [Stage::Base, Stage::Ours, Stage::Theirs] {
assert!(
file.entry_by_path_and_stage("file".into(), expected_stage).is_some(),
- "we have no stage 0 during a conflict, but all other ones. Missed {expected_stage}"
+ "we have no stage 0 during a conflict, but all other ones. Missed {expected_stage:?}"
);
}
assert_eq!(
file.entry_by_path("file".into()).expect("found").stage(),
- 2,
+ Stage::Ours,
"we always find our stage while in a merge"
);
}
@@ -226,13 +227,13 @@ fn sort_entries() {
for (idx, entry) in file.entries()[..valid_entries].iter().enumerate() {
assert_eq!(
- file.entry_index_by_path_and_stage_bounded(entry.path(&file), 0, valid_entries),
+ file.entry_index_by_path_and_stage_bounded(entry.path(&file), Stage::Unconflicted, valid_entries),
Some(idx),
"we can still find entries in the correctly sorted region"
);
}
assert_eq!(
- file.entry_by_path_and_stage(new_entry_path, 0),
+ file.entry_by_path_and_stage(new_entry_path, Stage::Unconflicted),
None,
"new entry can't be found due to incorrect order"
);
@@ -241,7 +242,7 @@ fn sort_entries() {
assert!(file.verify_entries().is_ok(), "sorting of entries restores invariants");
assert_eq!(
- file.entry_by_path_and_stage(new_entry_path, 0)
+ file.entry_by_path_and_stage(new_entry_path, Stage::Unconflicted)
.expect("can be found")
.path(&file),
new_entry_path,
diff --git a/gix-index/tests/index/file/read.rs b/gix-index/tests/index/file/read.rs
index 53387266f4c..bf1804384be 100644
--- a/gix-index/tests/index/file/read.rs
+++ b/gix-index/tests/index/file/read.rs
@@ -11,7 +11,7 @@ use crate::{hex_to_id, index::Fixture, loose_file_path};
fn verify(index: gix_index::File) -> gix_index::File {
index.verify_integrity().unwrap();
index.verify_entries().unwrap();
- index.verify_extensions(false, gix::objs::find::Never).unwrap();
+ index.verify_extensions(false, gix_object::find::Never).unwrap();
index
}
diff --git a/gix-index/tests/index/file/write.rs b/gix-index/tests/index/file/write.rs
index a01963c8e31..10d924b4e21 100644
--- a/gix-index/tests/index/file/write.rs
+++ b/gix-index/tests/index/file/write.rs
@@ -228,7 +228,7 @@ fn compare_states_against_baseline(
fn compare_states(actual: &State, actual_version: Version, expected: &State, options: Options, fixture: &str) {
actual.verify_entries().expect("valid");
- actual.verify_extensions(false, gix::objs::find::Never).expect("valid");
+ actual.verify_extensions(false, gix_object::find::Never).expect("valid");
assert_eq!(
actual.version(),
diff --git a/gix-index/tests/index/init.rs b/gix-index/tests/index/init.rs
index 22595526605..cc3b0494119 100644
--- a/gix-index/tests/index/init.rs
+++ b/gix-index/tests/index/init.rs
@@ -1,5 +1,7 @@
use gix_index::State;
use gix_testtools::scripted_fixture_read_only_standalone;
+use std::error::Error;
+use std::path::Path;
#[test]
fn from_tree() -> crate::Result {
@@ -11,19 +13,45 @@ fn from_tree() -> crate::Result {
];
for fixture in fixtures {
- let repo_dir = scripted_fixture_read_only_standalone(fixture)?;
- let repo = gix::open(&repo_dir)?;
+ let worktree_dir = scripted_fixture_read_only_standalone(fixture)?;
- let tree_id = repo.head_commit()?.tree_id()?;
+ let tree_id = tree_id(&worktree_dir);
- let expected_state = repo.index()?;
- let actual_state = State::from_tree(&tree_id, &repo.objects)?;
+ let git_dir = worktree_dir.join(".git");
+ let expected_state =
+ gix_index::File::at(git_dir.join("index"), gix_hash::Kind::Sha1, false, Default::default())?;
+ let odb = gix_odb::at(git_dir.join("objects"))?;
+ let actual_state = State::from_tree(&tree_id, &odb, Default::default())?;
compare_states(&actual_state, &expected_state, fixture)
}
Ok(())
}
+#[test]
+fn from_tree_validation() -> crate::Result {
+ let root = scripted_fixture_read_only_standalone("make_traverse_literal_separators.sh")?;
+ for repo_name in [
+ "traverse_dotdot_slashes",
+ "traverse_dotgit_slashes",
+ "traverse_dotgit_backslashes",
+ "traverse_dotdot_backslashes",
+ ] {
+ let worktree_dir = root.join(repo_name);
+ let tree_id = tree_id(&worktree_dir);
+ let git_dir = worktree_dir.join(".git");
+ let odb = gix_odb::at(git_dir.join("objects"))?;
+
+ let err = State::from_tree(&tree_id, &odb, Default::default()).unwrap_err();
+ assert_eq!(
+ err.source().expect("inner").to_string(),
+ "Path separators like / or \\ are not allowed",
+ "Note that this effectively tests what would happen on Windows, where \\ also isn't allowed"
+ );
+ }
+ Ok(())
+}
+
#[test]
fn new() {
let state = State::new(gix_hash::Kind::Sha1);
@@ -34,7 +62,7 @@ fn new() {
fn compare_states(actual: &State, expected: &State, fixture: &str) {
actual.verify_entries().expect("valid");
- actual.verify_extensions(false, gix::objs::find::Never).expect("valid");
+ actual.verify_extensions(false, gix_object::find::Never).expect("valid");
assert_eq!(
actual.entries().len(),
@@ -49,3 +77,9 @@ fn compare_states(actual: &State, expected: &State, fixture: &str) {
assert_eq!(a.path(actual), e.path(expected), "entry path mismatch in {fixture:?}");
}
}
+
+fn tree_id(root: &Path) -> gix_hash::ObjectId {
+ let hex_hash =
+ std::fs::read_to_string(root.join("head.tree")).expect("head.tree was created by git rev-parse @^{tree}");
+ hex_hash.trim().parse().expect("valid hash")
+}
diff --git a/gix-lock/CHANGELOG.md b/gix-lock/CHANGELOG.md
index b4366a01354..0d211364a87 100644
--- a/gix-lock/CHANGELOG.md
+++ b/gix-lock/CHANGELOG.md
@@ -5,6 +5,56 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 14.0.0 (2024-05-22)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 1 commit contributed to the release.
+ - 68 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+ - Merge branch 'tempfile-permissions' ([`7b44c7f`](https://github.com/Byron/gitoxide/commit/7b44c7ff1dc0b8875214d2673c7f52948cf04ff0))
+view details
* **Uncategorized**
+ - Release gix-tempfile v13.1.0, gix-lock v13.1.0, safety bump 12 crates ([`8430442`](https://github.com/Byron/gitoxide/commit/84304427dfe4d170c7732161b126961719f70059))
- Add `*_with_permissions(..., permissions)` methods. ([`719fc81`](https://github.com/Byron/gitoxide/commit/719fc81fa72756faa13fc3f8d4759df5d40cebd0))
- When obtaining locks, use mode 666 on Linux by default. ([`d83e45d`](https://github.com/Byron/gitoxide/commit/d83e45de625587b7b11e376a4d608854027a723e))
view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge branch 'status' ([`04ef31e`](https://github.com/Byron/gitoxide/commit/04ef31e9d6f5332d49037a5a4c248ebbb5aaf92b))
+ - Adapt to changes in `gix-pack` ([`bad5b48`](https://github.com/Byron/gitoxide/commit/bad5b48e4f0d865b0b0937f136d9a0041aa88046))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.3, gix-hash v0.14.1, gix-trace v0.1.6, gix-features v0.37.1, gix-actor v0.29.1, gix-validate v0.8.3, gix-object v0.40.1, gix-path v0.10.3, gix-glob v0.15.1, gix-quote v0.4.10, gix-attributes v0.21.1, gix-command v0.3.2, gix-packetline-blocking v0.17.2, gix-utils v0.1.8, gix-filter v0.8.1, gix-fs v0.9.1, gix-chunk v0.4.7, gix-commitgraph v0.23.1, gix-hashtable v0.5.1, gix-revwalk v0.11.1, gix-traverse v0.36.1, gix-worktree-stream v0.8.1, gix-archive v0.8.1, gix-config-value v0.14.3, gix-tempfile v12.0.1, gix-lock v12.0.1, gix-ref v0.40.1, gix-sec v0.10.3, gix-config v0.33.1, gix-prompt v0.8.2, gix-url v0.26.1, gix-credentials v0.23.1, gix-ignore v0.10.1, gix-bitmap v0.2.10, gix-index v0.28.1, gix-worktree v0.29.1, gix-diff v0.39.1, gix-discover v0.28.1, gix-macros v0.1.3, gix-mailmap v0.21.1, gix-negotiate v0.11.1, gix-pack v0.46.1, gix-odb v0.56.1, gix-pathspec v0.5.1, gix-packetline v0.17.2, gix-transport v0.40.1, gix-protocol v0.43.1, gix-revision v0.25.1, gix-refspec v0.21.1, gix-status v0.4.1, gix-submodule v0.7.1, gix-worktree-state v0.6.1, gix v0.57.1 ([`972241f`](https://github.com/Byron/gitoxide/commit/972241f1904944e8b6e84c6aa1649a49be7a85c3))
- Merge branch 'msrv' ([`8c492d7`](https://github.com/Byron/gitoxide/commit/8c492d7b7e6e5d520b1e3ffeb489eeb88266aa75))
- Change `rust-version` manifest field back to 1.65. ([`3bd09ef`](https://github.com/Byron/gitoxide/commit/3bd09ef120945a9669321ea856db4079a5dab930))
view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Release gix-date v0.8.6 ([`d3588ca`](https://github.com/Byron/gitoxide/commit/d3588ca4fe0364c88e42cdac24ceae548355d99d))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-utils v0.1.9, gix-features v0.38.0, gix-actor v0.30.0, gix-object v0.41.0, gix-path v0.10.4, gix-glob v0.16.0, gix-attributes v0.22.0, gix-command v0.3.3, gix-packetline-blocking v0.17.3, gix-filter v0.9.0, gix-fs v0.10.0, gix-commitgraph v0.24.0, gix-revwalk v0.12.0, gix-traverse v0.37.0, gix-worktree-stream v0.9.0, gix-archive v0.9.0, gix-config-value v0.14.4, gix-tempfile v13.0.0, gix-lock v13.0.0, gix-ref v0.41.0, gix-sec v0.10.4, gix-config v0.34.0, gix-url v0.27.0, gix-credentials v0.24.0, gix-ignore v0.11.0, gix-index v0.29.0, gix-worktree v0.30.0, gix-diff v0.40.0, gix-discover v0.29.0, gix-mailmap v0.22.0, gix-negotiate v0.12.0, gix-pack v0.47.0, gix-odb v0.57.0, gix-pathspec v0.6.0, gix-packetline v0.17.3, gix-transport v0.41.0, gix-protocol v0.44.0, gix-revision v0.26.0, gix-refspec v0.22.0, gix-status v0.5.0, gix-submodule v0.8.0, gix-worktree-state v0.7.0, gix v0.58.0, safety bump 39 crates ([`eb6aa8f`](https://github.com/Byron/gitoxide/commit/eb6aa8f502314f886fc4ea3d52ab220763968208))
- Prepare changelogs prior to release ([`6a2e0be`](https://github.com/Byron/gitoxide/commit/6a2e0bebfdf012dc2ed0ff2604086081f2a0f96d))
- > {
mod entry;
///
+#[allow(clippy::empty_docs)]
pub mod snapshot;
/// A data-structure to efficiently store a list of entries for optimal, case-insensitive lookup by email and
diff --git a/gix-negotiate/CHANGELOG.md b/gix-negotiate/CHANGELOG.md
index 24164986fdb..bd82c1cc02d 100644
--- a/gix-negotiate/CHANGELOG.md
+++ b/gix-negotiate/CHANGELOG.md
@@ -5,6 +5,57 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.13.1 (2024-05-22)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 5 commits contributed to the release over the course of 8 calendar days.
+ - 68 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+
view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge branch 'various-fixes' ([`d6cd449`](https://github.com/Byron/gitoxide/commit/d6cd44930fb204b06e2b70fc6965e7705530c47a))
+ - Merge pull request from GHSA-7w47-3wg8-547c ([`79dce79`](https://github.com/Byron/gitoxide/commit/79dce79c62f6072aa2653780d590dc3993dfa401))
+ - Adapt to changes in `gix-ref` ([`d2ae9d5`](https://github.com/Byron/gitoxide/commit/d2ae9d5f11be9f2561f6799d88804d0d8eae33ef))
+ - Release gix-date v0.8.6 ([`d3588ca`](https://github.com/Byron/gitoxide/commit/d3588ca4fe0364c88e42cdac24ceae548355d99d))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+view details
* **Uncategorized**
+ - Release gix-utils v0.1.9, gix-features v0.38.0, gix-actor v0.30.0, gix-object v0.41.0, gix-path v0.10.4, gix-glob v0.16.0, gix-attributes v0.22.0, gix-command v0.3.3, gix-packetline-blocking v0.17.3, gix-filter v0.9.0, gix-fs v0.10.0, gix-commitgraph v0.24.0, gix-revwalk v0.12.0, gix-traverse v0.37.0, gix-worktree-stream v0.9.0, gix-archive v0.9.0, gix-config-value v0.14.4, gix-tempfile v13.0.0, gix-lock v13.0.0, gix-ref v0.41.0, gix-sec v0.10.4, gix-config v0.34.0, gix-url v0.27.0, gix-credentials v0.24.0, gix-ignore v0.11.0, gix-index v0.29.0, gix-worktree v0.30.0, gix-diff v0.40.0, gix-discover v0.29.0, gix-mailmap v0.22.0, gix-negotiate v0.12.0, gix-pack v0.47.0, gix-odb v0.57.0, gix-pathspec v0.6.0, gix-packetline v0.17.3, gix-transport v0.41.0, gix-protocol v0.44.0, gix-revision v0.26.0, gix-refspec v0.22.0, gix-status v0.5.0, gix-submodule v0.8.0, gix-worktree-state v0.7.0, gix v0.58.0, safety bump 39 crates ([`eb6aa8f`](https://github.com/Byron/gitoxide/commit/eb6aa8f502314f886fc4ea3d52ab220763968208))
- Prepare changelogs prior to release ([`6a2e0be`](https://github.com/Byron/gitoxide/commit/6a2e0bebfdf012dc2ed0ff2604086081f2a0f96d))
- Merge branch 'dirwalk' ([`5d176fc`](https://github.com/Byron/gitoxide/commit/5d176fc5ab82bfc7c194b4d929e73da9659ae8b8))
- Adapt to changes in `gix-features` ([`eacb5a4`](https://github.com/Byron/gitoxide/commit/eacb5a4ae2fd94b095005cfbc0a8b2aa67539e52))
@@ -37,12 +89,12 @@ A maintenance release without user-facing changes.
### Chore
- - change `rust-version` manifest field back to 1.65.
- They didn't actually need to be higher to work, and changing them
- unecessarily can break downstream CI.
-
- Let's keep this value as low as possible, and only increase it when
- more recent features are actually used.
+- change `rust-version` manifest field back to 1.65.
+ They didn't actually need to be higher to work, and changing them
+ unecessarily can break downstream CI.
+
+ Let's keep this value as low as possible, and only increase it when
+ more recent features are actually used.
### Commit Statistics
@@ -70,8 +122,8 @@ A maintenance release without user-facing changes.
### Chore
- - upgrade MSRV to v1.70
- Our MSRV follows the one of `helix`, which in turn follows Firefox.
+- upgrade MSRV to v1.70
+ Our MSRV follows the one of `helix`, which in turn follows Firefox.
### Commit Statistics
@@ -331,7 +383,7 @@ A maintenance release without user-facing changes.
### Chore
- - Add `clippy::redundant-closure-for-method-calls` lint
+- Add `clippy::redundant-closure-for-method-calls` lint
### New Features
@@ -417,12 +469,12 @@ A maintenance release without user-facing changes.
### Other
- - try to change test-suite from --negotiate-only to the more realistic fetch with --dry-run.
- This means we will have to reproduce what git does naturally, to fill in common refs
- and also provide tips.
-
- Unfortunately this doesn't work as it's apparently not really dry-running, but modifying
- the repository underneath. This means it's not idempotent when running it multiple times.
+- try to change test-suite from --negotiate-only to the more realistic fetch with --dry-run.
+ This means we will have to reproduce what git does naturally, to fill in common refs
+ and also provide tips.
+
+ Unfortunately this doesn't work as it's apparently not really dry-running, but modifying
+ the repository underneath. This means it's not idempotent when running it multiple times.
### Commit Statistics
diff --git a/gix-negotiate/Cargo.toml b/gix-negotiate/Cargo.toml
index 3989e568246..6c1c41732e9 100644
--- a/gix-negotiate/Cargo.toml
+++ b/gix-negotiate/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-negotiate"
-version = "0.12.0"
+version = "0.13.1"
repository = "https://github.com/Byron/gitoxide"
license = "MIT OR Apache-2.0"
description = "A crate of the gitoxide project implementing negotiation algorithms"
@@ -14,11 +14,11 @@ doctest = false
test = false
[dependencies]
-gix-hash = { version = "^0.14.1", path = "../gix-hash" }
-gix-object = { version = "^0.41.0", path = "../gix-object" }
-gix-date = { version = "^0.8.3", path = "../gix-date" }
-gix-commitgraph = { version = "^0.24.0", path = "../gix-commitgraph" }
-gix-revwalk = { version = "^0.12.0", path = "../gix-revwalk" }
+gix-hash = { version = "^0.14.2", path = "../gix-hash" }
+gix-object = { version = "^0.42.2", path = "../gix-object" }
+gix-date = { version = "^0.8.6", path = "../gix-date" }
+gix-commitgraph = { version = "^0.24.2", path = "../gix-commitgraph" }
+gix-revwalk = { version = "^0.13.1", path = "../gix-revwalk" }
thiserror = "1.0.40"
smallvec = "1.10.0"
bitflags = "2"
diff --git a/gix-negotiate/tests/baseline/mod.rs b/gix-negotiate/tests/baseline/mod.rs
index 158d70a4be3..f416097f428 100644
--- a/gix-negotiate/tests/baseline/mod.rs
+++ b/gix-negotiate/tests/baseline/mod.rs
@@ -26,9 +26,10 @@ fn run() -> crate::Result {
let store = gix_odb::at(base.join("client").join(".git/objects"))?;
let refs = gix_ref::file::Store::at(
base.join("client").join(".git"),
- WriteReflog::Disable,
- gix_hash::Kind::Sha1,
- false,
+ gix_ref::store::init::Options {
+ write_reflog: WriteReflog::Disable,
+ ..Default::default()
+ },
);
let lookup_names = |names: &[&str]| -> Vec {
names
diff --git a/gix-negotiate/tests/fixtures/generated-archives/make_repos.tar.xz b/gix-negotiate/tests/fixtures/generated-archives/make_repos.tar.xz
index 93e83693131..2a0799c3ea3 100644
Binary files a/gix-negotiate/tests/fixtures/generated-archives/make_repos.tar.xz and b/gix-negotiate/tests/fixtures/generated-archives/make_repos.tar.xz differ
diff --git a/gix-negotiate/tests/fixtures/make_repos.sh b/gix-negotiate/tests/fixtures/make_repos.sh
index b1b96527d89..1b6997c220b 100755
--- a/gix-negotiate/tests/fixtures/make_repos.sh
+++ b/gix-negotiate/tests/fixtures/make_repos.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
function tick () {
diff --git a/gix-object/CHANGELOG.md b/gix-object/CHANGELOG.md
index ff1db7a9c2e..0a0b8fa6688 100644
--- a/gix-object/CHANGELOG.md
+++ b/gix-object/CHANGELOG.md
@@ -5,6 +5,86 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.42.2 (2024-05-22)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 2 commits contributed to the release over the course of 8 calendar days.
+ - 65 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Release gix-date v0.8.6 ([`d3588ca`](https://github.com/Byron/gitoxide/commit/d3588ca4fe0364c88e42cdac24ceae548355d99d))
+view details
+
+ * **[#1322](https://github.com/Byron/gitoxide/issues/1322)**
+ - Allow parsing of commits with broken timestamp. ([`ab21083`](https://github.com/Byron/gitoxide/commit/ab210836ac4558c88cc5f19fdddfb5c8eeb29754))
+ * **Uncategorized**
+ - Release gix-actor v0.31.1, gix-object v0.42.1, gix-index v0.31.1, gix-pathspec v0.7.2, gix-dir v0.3.0, gix-status v0.8.0, gix v0.61.0, safety bump 2 crates ([`155cc45`](https://github.com/Byron/gitoxide/commit/155cc45730b259e662d7c4be42a469a3af3750e1))
+ - Prepare changelog prior to release ([`129ba3d`](https://github.com/Byron/gitoxide/commit/129ba3deccc9ada0dc571466458845939502763d))
+ - Merge branch 'improvements-for-cargo' ([`41cd53e`](https://github.com/Byron/gitoxide/commit/41cd53e2af76e35e047aac4eca6324774df4cb50))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Release gix-date v0.8.6 ([`d3588ca`](https://github.com/Byron/gitoxide/commit/d3588ca4fe0364c88e42cdac24ceae548355d99d))
+ - Merge branch 'status' ([`04ef31e`](https://github.com/Byron/gitoxide/commit/04ef31e9d6f5332d49037a5a4c248ebbb5aaf92b))
+ - Adapt to changes in `gix-pack` ([`bad5b48`](https://github.com/Byron/gitoxide/commit/bad5b48e4f0d865b0b0937f136d9a0041aa88046))
+ - More robustness in the face of a trampling-herd of threads loading a single index. ([`addf446`](https://github.com/Byron/gitoxide/commit/addf446f052ff74edcdb083f2b2968b313daa940))
+ - Use `tempfile` permissions support to set the correct mode on unix. ([`7b3dc92`](https://github.com/Byron/gitoxide/commit/7b3dc92d04e5240a7bdbcdaa4019ac93cec6eaa3))
+view details
+
+ * **Uncategorized**
+ - Release gix-trace v0.1.9, gix-utils v0.1.12, gix-packetline-blocking v0.17.4, gix-filter v0.11.1, gix-fs v0.10.2, gix-traverse v0.39.0, gix-worktree-stream v0.12.0, gix-archive v0.12.0, gix-config v0.36.1, gix-url v0.27.3, gix-index v0.32.0, gix-worktree v0.33.0, gix-diff v0.43.0, gix-pathspec v0.7.3, gix-dir v0.4.0, gix-pack v0.50.0, gix-odb v0.60.0, gix-transport v0.42.0, gix-protocol v0.45.0, gix-status v0.9.0, gix-worktree-state v0.10.0, gix v0.62.0, gix-fsck v0.4.0, gitoxide-core v0.37.0, gitoxide v0.35.0, safety bump 14 crates ([`095c673`](https://github.com/Byron/gitoxide/commit/095c6739b2722a8b9af90776b435ef2da454c0e6))
+ - Prepare changelogs prior to release ([`5755271`](https://github.com/Byron/gitoxide/commit/57552717f46f96c35ba4ddc0a64434354ef845e9))
+view details
+
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Merge branch 'tempfile-permissions' ([`7b44c7f`](https://github.com/Byron/gitoxide/commit/7b44c7ff1dc0b8875214d2673c7f52948cf04ff0))
- Release gix-tempfile v13.1.0, gix-lock v13.1.0, safety bump 12 crates ([`8430442`](https://github.com/Byron/gitoxide/commit/84304427dfe4d170c7732161b126961719f70059))
diff --git a/gix-odb/Cargo.toml b/gix-odb/Cargo.toml
index 041f5a67b1d..7bda4ed5de9 100644
--- a/gix-odb/Cargo.toml
+++ b/gix-odb/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-odb"
-version = "0.58.0"
+version = "0.61.0"
repository = "https://github.com/Byron/gitoxide"
authors = ["Sebastian Thiel "]
license = "MIT OR Apache-2.0"
@@ -15,33 +15,25 @@ doctest = false
[features]
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
-serde= ["dep:serde", "gix-hash/serde", "gix-object/serde", "gix-pack/serde"]
+serde = ["dep:serde", "gix-hash/serde", "gix-object/serde", "gix-pack/serde"]
[dependencies]
-gix-features = { version = "^0.38.0", path = "../gix-features", features = ["rustsha1", "walkdir", "zlib", "crc32" ] }
-gix-hash = { version = "^0.14.1", path = "../gix-hash" }
-gix-date = { version = "^0.8.4", path = "../gix-date" }
-gix-path = { version = "^0.10.6", path = "../gix-path" }
-gix-quote = { version = "^0.4.11", path = "../gix-quote" }
-gix-object = { version = "^0.41.1", path = "../gix-object" }
-gix-pack = { version = "^0.48.0", path = "../gix-pack", default-features = false }
-gix-fs = { version = "^0.10.0", path = "../gix-fs" }
-serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
+gix-features = { version = "^0.38.2", path = "../gix-features", features = ["rustsha1", "walkdir", "zlib", "crc32"] }
+gix-hash = { version = "^0.14.2", path = "../gix-hash" }
+gix-date = { version = "^0.8.6", path = "../gix-date" }
+gix-path = { version = "^0.10.7", path = "../gix-path" }
+gix-quote = { version = "^0.4.12", path = "../gix-quote" }
+gix-object = { version = "^0.42.2", path = "../gix-object" }
+gix-pack = { version = "^0.51.0", path = "../gix-pack", default-features = false }
+gix-fs = { version = "^0.11.1", path = "../gix-fs" }
+serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
-tempfile = "3.1.0"
+tempfile = "3.10.0"
thiserror = "1.0.26"
parking_lot = { version = "0.12.0" }
arc-swap = "1.5.0"
document-features = { version = "0.2.0", optional = true }
-#[dev-dependencies]
-#gix-testtools = { path = "../tests/tools"}
-#gix-actor = { path = "../gix-actor" }
-#pretty_assertions = "1.0.0"
-#filetime = "0.2.15"
-#maplit = "1.0.2"
-#crossbeam-channel = "0.5.6"
-
[package.metadata.docs.rs]
features = ["document-features", "serde"]
diff --git a/gix-odb/src/alternate/mod.rs b/gix-odb/src/alternate/mod.rs
index c4e9fc8c040..919a3249ebd 100644
--- a/gix-odb/src/alternate/mod.rs
+++ b/gix-odb/src/alternate/mod.rs
@@ -21,6 +21,7 @@ use std::{fs, io, path::PathBuf};
use gix_path::realpath::MAX_SYMLINKS;
///
+#[allow(clippy::empty_docs)]
pub mod parse;
/// Returned by [`resolve()`]
diff --git a/gix-odb/src/lib.rs b/gix-odb/src/lib.rs
index 40d7c2aea90..f034fdaadc9 100644
--- a/gix-odb/src/lib.rs
+++ b/gix-odb/src/lib.rs
@@ -47,6 +47,7 @@ pub struct Cache {
}
///
+#[allow(clippy::empty_docs)]
pub mod cache;
///
@@ -69,6 +70,7 @@ pub fn sink(object_hash: gix_hash::Kind) -> Sink {
mod sink;
///
+#[allow(clippy::empty_docs)]
pub mod find;
/// An object database equivalent to `/dev/null`, dropping all objects stored into it.
@@ -77,6 +79,7 @@ mod traits;
pub use traits::{Header, HeaderExt, Write};
///
+#[allow(clippy::empty_docs)]
pub mod write {
/// The error type returned by the [`Write`](crate::Write) trait.
pub type Error = Box;
diff --git a/gix-odb/src/store_impls/dynamic/find.rs b/gix-odb/src/store_impls/dynamic/find.rs
index 99b58d7477f..13608b7c876 100644
--- a/gix-odb/src/store_impls/dynamic/find.rs
+++ b/gix-odb/src/store_impls/dynamic/find.rs
@@ -1,4 +1,4 @@
-use std::{convert::TryInto, ops::Deref};
+use std::ops::Deref;
use gix_pack::cache::DecodeEntry;
@@ -19,6 +19,8 @@ pub(crate) mod error {
LoadIndex(#[from] crate::store::load_index::Error),
#[error(transparent)]
LoadPack(#[from] std::io::Error),
+ #[error(transparent)]
+ EntryType(#[from] gix_pack::data::entry::decode::Error),
#[error("Reached recursion limit of {} while resolving ref delta bases for {}", .max_depth, .id)]
DeltaBaseRecursionLimit {
/// the maximum recursion depth we encountered.
@@ -144,19 +146,21 @@ where
}
},
};
- let entry = pack.entry(pack_offset);
+ let entry = pack.entry(pack_offset)?;
let header_size = entry.header_size();
- let res = match pack.decode_entry(
+ let res = pack.decode_entry(
entry,
buffer,
inflate,
&|id, _out| {
- index_file.pack_offset_by_id(id).map(|pack_offset| {
- gix_pack::data::decode::entry::ResolvedBase::InPack(pack.entry(pack_offset))
- })
+ let pack_offset = index_file.pack_offset_by_id(id)?;
+ pack.entry(pack_offset)
+ .ok()
+ .map(gix_pack::data::decode::entry::ResolvedBase::InPack)
},
pack_cache,
- ) {
+ );
+ let res = match res {
Ok(r) => Ok((
gix_object::Data {
kind: r.kind,
@@ -230,7 +234,7 @@ where
let pack = possibly_pack
.as_ref()
.expect("pack to still be available like just now");
- let entry = pack.entry(pack_offset);
+ let entry = pack.entry(pack_offset)?;
let header_size = entry.header_size();
pack.decode_entry(
entry,
@@ -239,10 +243,10 @@ where
&|id, out| {
index_file
.pack_offset_by_id(id)
- .map(|pack_offset| {
- gix_pack::data::decode::entry::ResolvedBase::InPack(
- pack.entry(pack_offset),
- )
+ .and_then(|pack_offset| {
+ pack.entry(pack_offset)
+ .ok()
+ .map(gix_pack::data::decode::entry::ResolvedBase::InPack)
})
.or_else(|| {
(id == base_id).then(|| {
@@ -398,7 +402,7 @@ where
}
},
};
- let entry = pack.entry(pack_offset);
+ let entry = pack.entry(pack_offset).ok()?;
buf.resize(entry.decompressed_size.try_into().expect("representable size"), 0);
assert_eq!(pack.id, pack_id.to_intrinsic_pack_id(), "both ids must always match");
diff --git a/gix-odb/src/store_impls/dynamic/handle.rs b/gix-odb/src/store_impls/dynamic/handle.rs
index 655bdfa430c..883e2c1ccb8 100644
--- a/gix-odb/src/store_impls/dynamic/handle.rs
+++ b/gix-odb/src/store_impls/dynamic/handle.rs
@@ -1,6 +1,5 @@
use std::{
cell::RefCell,
- convert::{TryFrom, TryInto},
ops::Deref,
rc::Rc,
sync::{atomic::Ordering, Arc},
diff --git a/gix-odb/src/store_impls/dynamic/header.rs b/gix-odb/src/store_impls/dynamic/header.rs
index 1e4370a91ee..2ebcc73efb4 100644
--- a/gix-odb/src/store_impls/dynamic/header.rs
+++ b/gix-odb/src/store_impls/dynamic/header.rs
@@ -72,10 +72,12 @@ where
}
},
};
- let entry = pack.entry(pack_offset);
+ let entry = pack.entry(pack_offset)?;
let res = match pack.decode_header(entry, inflate, &|id| {
- index_file.pack_offset_by_id(id).map(|pack_offset| {
- gix_pack::data::decode::header::ResolvedBase::InPack(pack.entry(pack_offset))
+ index_file.pack_offset_by_id(id).and_then(|pack_offset| {
+ pack.entry(pack_offset)
+ .ok()
+ .map(gix_pack::data::decode::header::ResolvedBase::InPack)
})
}) {
Ok(header) => Ok(header.into()),
@@ -129,14 +131,14 @@ where
let pack = possibly_pack
.as_ref()
.expect("pack to still be available like just now");
- let entry = pack.entry(pack_offset);
+ let entry = pack.entry(pack_offset)?;
pack.decode_header(entry, inflate, &|id| {
index_file
.pack_offset_by_id(id)
- .map(|pack_offset| {
- gix_pack::data::decode::header::ResolvedBase::InPack(
- pack.entry(pack_offset),
- )
+ .and_then(|pack_offset| {
+ pack.entry(pack_offset)
+ .ok()
+ .map(gix_pack::data::decode::header::ResolvedBase::InPack)
})
.or_else(|| {
(id == base_id).then(|| {
diff --git a/gix-odb/src/store_impls/dynamic/init.rs b/gix-odb/src/store_impls/dynamic/init.rs
index 980bacf767b..2031e48c837 100644
--- a/gix-odb/src/store_impls/dynamic/init.rs
+++ b/gix-odb/src/store_impls/dynamic/init.rs
@@ -1,4 +1,4 @@
-use std::{iter::FromIterator, path::PathBuf, sync::Arc};
+use std::{path::PathBuf, sync::Arc};
use arc_swap::ArcSwap;
diff --git a/gix-odb/src/store_impls/dynamic/load_index.rs b/gix-odb/src/store_impls/dynamic/load_index.rs
index a255f6c4b58..18afbc86958 100644
--- a/gix-odb/src/store_impls/dynamic/load_index.rs
+++ b/gix-odb/src/store_impls/dynamic/load_index.rs
@@ -4,7 +4,7 @@ use std::{
ops::Deref,
path::{Path, PathBuf},
sync::{
- atomic::{AtomicU16, AtomicUsize, Ordering},
+ atomic::{AtomicU16, Ordering},
Arc,
},
time::SystemTime,
@@ -86,7 +86,7 @@ impl super::Store {
Ok(Some(self.collect_snapshot()))
} else {
// always compare to the latest state
- // Nothing changed in the mean time, try to load another index…
+ // Nothing changed in the meantime, try to load another index…
if self.load_next_index(index) {
Ok(Some(self.collect_snapshot()))
} else {
@@ -119,7 +119,7 @@ impl super::Store {
let slot = &self.files[index.slot_indices[slot_map_index]];
let _lock = slot.write.lock();
if slot.generation.load(Ordering::SeqCst) > index.generation {
- // There is a disk consolidation in progress which just overwrote a slot that cold be disposed with some other
+ // There is a disk consolidation in progress which just overwrote a slot that could be disposed with some other
// index, one we didn't intend to load.
// Continue with the next slot index in the hope there is something else we can do…
continue 'retry_with_next_slot_index;
@@ -128,14 +128,18 @@ impl super::Store {
let bundle_mut = Arc::make_mut(&mut bundle);
if let Some(files) = bundle_mut.as_mut() {
// these are always expected to be set, unless somebody raced us. We handle this later by retrying.
- let _loaded_count = IncOnDrop(&index.loaded_indices);
- match files.load_index(self.object_hash) {
+ let res = {
+ let res = files.load_index(self.object_hash);
+ slot.files.store(bundle);
+ index.loaded_indices.fetch_add(1, Ordering::SeqCst);
+ res
+ };
+ match res {
Ok(_) => {
- slot.files.store(bundle);
break 'retry_with_next_slot_index;
}
- Err(_) => {
- slot.files.store(bundle);
+ Err(_err) => {
+ gix_features::trace::error!(err=?_err, "Failed to load index file - some objects may seem to not exist");
continue 'retry_with_next_slot_index;
}
}
@@ -145,9 +149,14 @@ impl super::Store {
// There can be contention as many threads start working at the same time and take all the
// slots to load indices for. Some threads might just be left-over and have to wait for something
// to change.
- let num_load_operations = index.num_indices_currently_being_loaded.deref();
// TODO: potentially hot loop - could this be a condition variable?
- while num_load_operations.load(Ordering::Relaxed) != 0 {
+ // This is a timing-based fix for the case that the `num_indices_being_loaded` isn't yet incremented,
+ // and we might break out here without actually waiting for the loading operation. Then we'd fail to
+ // observe a change and the underlying handler would not have all the indices it needs at its disposal.
+ // Yielding means we will definitely loose enough time to observe the ongoing operation,
+ // or its effects.
+ std::thread::yield_now();
+ while index.num_indices_currently_being_loaded.load(Ordering::SeqCst) != 0 {
std::thread::yield_now()
}
break 'retry_with_next_slot_index;
@@ -197,7 +206,7 @@ impl super::Store {
// We might not be able to detect by pointer if the state changed, as this itself is racy. So we keep track of double-initialization
// using a flag, which means that if `needs_init` was true we saw the index uninitialized once, but now that we are here it's
- // initialized meaning that somebody was faster and we couldn't detect it by comparisons to the index.
+ // initialized meaning that somebody was faster, and we couldn't detect it by comparisons to the index.
// If so, make sure we collect the snapshot instead of returning None in case nothing actually changed, which is likely with a
// race like this.
if !was_uninitialized && needs_init {
@@ -397,18 +406,19 @@ impl super::Store {
// generation stays the same, as it's the same value still but scheduled for eventual removal.
}
} else {
+ // set the generation before we actually change the value, otherwise readers of old generations could observe the new one.
+ // We rather want them to turn around here and update their index, which, by that time, might actually already be available.
+ // If not, they would fail unable to load a pack or index they need, but that's preferred over returning wrong objects.
+ // Safety: can't race as we hold the lock, have to set the generation beforehand to help avoid others to observe the value.
+ slot.generation.store(generation, Ordering::SeqCst);
*files_mut = None;
};
slot.files.store(files);
- if !needs_stable_indices {
- // Not racy due to lock, generation must be set after unsetting the slot value AND storing it.
- slot.generation.store(generation, Ordering::SeqCst);
- }
}
let new_index = self.index.load();
Ok(if index.state_id() == new_index.state_id() {
- // there was no change, and nothing was loaded in the meantime, reflect that in the return value to not get into loops
+ // there was no change, and nothing was loaded in the meantime, reflect that in the return value to not get into loops.
None
} else {
if load_new_index {
@@ -619,34 +629,44 @@ impl super::Store {
}
pub(crate) fn collect_snapshot(&self) -> Snapshot {
+ // We don't observe changes-on-disk in our 'wait-for-load' loop.
+ // That loop is meant to help assure the marker (which includes the amount of loaded indices) matches
+ // the actual amount of indices we collect.
let index = self.index.load();
- let indices = if index.is_initialized() {
- index
- .slot_indices
- .iter()
- .map(|idx| (*idx, &self.files[*idx]))
- .filter_map(|(id, file)| {
- let lookup = match (**file.files.load()).as_ref()? {
- types::IndexAndPacks::Index(bundle) => handle::SingleOrMultiIndex::Single {
- index: bundle.index.loaded()?.clone(),
- data: bundle.data.loaded().cloned(),
- },
- types::IndexAndPacks::MultiIndex(multi) => handle::SingleOrMultiIndex::Multi {
- index: multi.multi_index.loaded()?.clone(),
- data: multi.data.iter().map(|f| f.loaded().cloned()).collect(),
- },
- };
- handle::IndexLookup { file: lookup, id }.into()
- })
- .collect()
- } else {
- Vec::new()
- };
+ loop {
+ if index.num_indices_currently_being_loaded.deref().load(Ordering::SeqCst) != 0 {
+ std::thread::yield_now();
+ continue;
+ }
+ let marker = index.marker();
+ let indices = if index.is_initialized() {
+ index
+ .slot_indices
+ .iter()
+ .map(|idx| (*idx, &self.files[*idx]))
+ .filter_map(|(id, file)| {
+ let lookup = match (**file.files.load()).as_ref()? {
+ types::IndexAndPacks::Index(bundle) => handle::SingleOrMultiIndex::Single {
+ index: bundle.index.loaded()?.clone(),
+ data: bundle.data.loaded().cloned(),
+ },
+ types::IndexAndPacks::MultiIndex(multi) => handle::SingleOrMultiIndex::Multi {
+ index: multi.multi_index.loaded()?.clone(),
+ data: multi.data.iter().map(|f| f.loaded().cloned()).collect(),
+ },
+ };
+ handle::IndexLookup { file: lookup, id }.into()
+ })
+ .collect()
+ } else {
+ Vec::new()
+ };
- Snapshot {
- indices,
- loose_dbs: Arc::clone(&index.loose_dbs),
- marker: index.marker(),
+ return Snapshot {
+ indices,
+ loose_dbs: Arc::clone(&index.loose_dbs),
+ marker,
+ };
}
}
}
@@ -669,13 +689,6 @@ impl<'a> Drop for IncOnNewAndDecOnDrop<'a> {
}
}
-struct IncOnDrop<'a>(&'a AtomicUsize);
-impl<'a> Drop for IncOnDrop<'a> {
- fn drop(&mut self) {
- self.0.fetch_add(1, Ordering::SeqCst);
- }
-}
-
pub(crate) enum Either {
IndexPath(PathBuf),
MultiIndexFile(Arc),
diff --git a/gix-odb/src/store_impls/dynamic/mod.rs b/gix-odb/src/store_impls/dynamic/mod.rs
index 7ea462b24a1..65ea5361415 100644
--- a/gix-odb/src/store_impls/dynamic/mod.rs
+++ b/gix-odb/src/store_impls/dynamic/mod.rs
@@ -51,20 +51,25 @@ impl RefreshMode {
}
///
+#[allow(clippy::empty_docs)]
pub mod find;
///
+#[allow(clippy::empty_docs)]
pub mod prefix;
mod header;
///
+#[allow(clippy::empty_docs)]
pub mod iter;
///
+#[allow(clippy::empty_docs)]
pub mod write;
///
+#[allow(clippy::empty_docs)]
pub mod init;
pub(crate) mod types;
@@ -73,9 +78,11 @@ pub use types::Metrics;
pub(crate) mod handle;
///
+#[allow(clippy::empty_docs)]
pub mod load_index;
///
+#[allow(clippy::empty_docs)]
pub mod verify;
mod load_one;
@@ -85,4 +92,5 @@ mod metrics;
mod access;
///
+#[allow(clippy::empty_docs)]
pub mod structure;
diff --git a/gix-odb/src/store_impls/dynamic/prefix.rs b/gix-odb/src/store_impls/dynamic/prefix.rs
index 0d671400448..b6869d8c2b6 100644
--- a/gix-odb/src/store_impls/dynamic/prefix.rs
+++ b/gix-odb/src/store_impls/dynamic/prefix.rs
@@ -5,6 +5,7 @@ use gix_object::Exists;
use crate::store::{load_index, Handle};
///
+#[allow(clippy::empty_docs)]
pub mod lookup {
use crate::loose;
@@ -24,6 +25,7 @@ pub mod lookup {
}
///
+#[allow(clippy::empty_docs)]
pub mod disambiguate {
/// A potentially ambiguous prefix for use with `Handle::disambiguate_prefix()`.
#[derive(Debug, Copy, Clone)]
diff --git a/gix-odb/src/store_impls/dynamic/types.rs b/gix-odb/src/store_impls/dynamic/types.rs
index 473c587bbea..35257ee7ee8 100644
--- a/gix-odb/src/store_impls/dynamic/types.rs
+++ b/gix-odb/src/store_impls/dynamic/types.rs
@@ -18,7 +18,7 @@ pub(crate) type AtomicGeneration = AtomicU32;
/// A way to indicate which pack indices we have seen already and which of them are loaded, along with an idea
/// of whether stored `PackId`s are still usable.
-#[derive(Default, Copy, Clone)]
+#[derive(Default, Copy, Clone, Debug)]
pub struct SlotIndexMarker {
/// The generation the `loaded_until_index` belongs to. Indices of different generations are completely incompatible.
/// This value changes once the internal representation is compacted, something that may happen only if there is no handle
@@ -262,7 +262,7 @@ impl IndexAndPacks {
}
}
- /// If we are garbage, put ourselves into the loaded state. Otherwise put ourselves back to unloaded.
+ /// If we are garbage, put ourselves into the loaded state. Otherwise, put ourselves back to unloaded.
pub(crate) fn put_back(&mut self) {
match self {
IndexAndPacks::Index(bundle) => {
diff --git a/gix-odb/src/store_impls/dynamic/verify.rs b/gix-odb/src/store_impls/dynamic/verify.rs
index a59ee2c5367..b9a1f605911 100644
--- a/gix-odb/src/store_impls/dynamic/verify.rs
+++ b/gix-odb/src/store_impls/dynamic/verify.rs
@@ -13,6 +13,7 @@ use crate::{
};
///
+#[allow(clippy::empty_docs)]
pub mod integrity {
use std::{marker::PhantomData, path::PathBuf};
diff --git a/gix-odb/src/store_impls/loose/mod.rs b/gix-odb/src/store_impls/loose/mod.rs
index 17e4a33d65a..3dddf03660a 100644
--- a/gix-odb/src/store_impls/loose/mod.rs
+++ b/gix-odb/src/store_impls/loose/mod.rs
@@ -50,10 +50,13 @@ fn hash_path(id: &gix_hash::oid, mut root: PathBuf) -> PathBuf {
}
///
+#[allow(clippy::empty_docs)]
pub mod find;
///
+#[allow(clippy::empty_docs)]
pub mod iter;
///
+#[allow(clippy::empty_docs)]
pub mod verify;
/// The type for an iterator over `Result)`
@@ -63,4 +66,5 @@ pub struct Iter {
}
///
+#[allow(clippy::empty_docs)]
pub mod write;
diff --git a/gix-odb/src/store_impls/loose/verify.rs b/gix-odb/src/store_impls/loose/verify.rs
index ae83c1d01cb..2bacfa0cd27 100644
--- a/gix-odb/src/store_impls/loose/verify.rs
+++ b/gix-odb/src/store_impls/loose/verify.rs
@@ -8,6 +8,7 @@ use gix_features::progress::{Count, DynNestedProgress, Progress};
use crate::{loose::Store, Write};
///
+#[allow(clippy::empty_docs)]
pub mod integrity {
/// The error returned by [`verify_integrity()`][super::Store::verify_integrity()].
#[derive(Debug, thiserror::Error)]
diff --git a/gix-odb/src/store_impls/loose/write.rs b/gix-odb/src/store_impls/loose/write.rs
index 2cac12d1814..a70351a1574 100644
--- a/gix-odb/src/store_impls/loose/write.rs
+++ b/gix-odb/src/store_impls/loose/write.rs
@@ -107,8 +107,16 @@ impl Store {
impl Store {
fn dest(&self) -> Result, Error> {
+ #[cfg_attr(not(unix), allow(unused_mut))]
+ let mut builder = tempfile::Builder::new();
+ #[cfg(unix)]
+ {
+ use std::os::unix::fs::PermissionsExt;
+ let perms = std::fs::Permissions::from_mode(0o444);
+ builder.permissions(perms);
+ }
Ok(hash::Write::new(
- deflate::Write::new(NamedTempFile::new_in(&self.path).map_err(|err| Error::Io {
+ deflate::Write::new(builder.tempfile_in(&self.path).map_err(|err| Error::Io {
source: err,
message: "create named temp file in",
path: self.path.to_owned(),
@@ -144,24 +152,6 @@ impl Store {
return Ok(id);
}
}
- #[cfg(unix)]
- if let Ok(mut perm) = object_path.metadata().map(|m| m.permissions()) {
- use std::os::unix::fs::PermissionsExt;
- /// For now we assume the default with standard umask. This can be more sophisticated,
- /// but we have the bare minimum.
- fn comp_mode(_mode: u32) -> u32 {
- 0o444
- }
- let new_mode = comp_mode(perm.mode());
- if (perm.mode() ^ new_mode) & !0o170000 != 0 {
- perm.set_mode(new_mode);
- std::fs::set_permissions(&object_path, perm).map_err(|err| Error::Io {
- source: err,
- message: "Failed to set permission bits",
- path: object_path.clone(),
- })?;
- }
- }
res.map_err(|err| Error::Persist {
source: err,
target: object_path,
diff --git a/gix-odb/tests/Cargo.toml b/gix-odb/tests/Cargo.toml
index 2c26eb6b801..d42d1775af6 100644
--- a/gix-odb/tests/Cargo.toml
+++ b/gix-odb/tests/Cargo.toml
@@ -24,9 +24,10 @@ gix-date = { path = "../../gix-date" }
gix-object = { path = "../../gix-object" }
gix-pack = { path = "../../gix-pack" }
-gix-testtools = { path = "../../tests/tools"}
+gix-testtools = { path = "../../tests/tools" }
gix-actor = { path = "../../gix-actor" }
pretty_assertions = "1.0.0"
filetime = "0.2.15"
maplit = "1.0.2"
+crossbeam-channel = "0.5.13"
diff --git a/gix-odb/tests/fixtures/generated-archives/make_replaced_history.tar.xz b/gix-odb/tests/fixtures/generated-archives/make_replaced_history.tar.xz
index a00c1703c01..a30dfd02a15 100644
Binary files a/gix-odb/tests/fixtures/generated-archives/make_replaced_history.tar.xz and b/gix-odb/tests/fixtures/generated-archives/make_replaced_history.tar.xz differ
diff --git a/gix-odb/tests/fixtures/generated-archives/make_repo_multi_index.tar.xz b/gix-odb/tests/fixtures/generated-archives/make_repo_multi_index.tar.xz
index 6b0aa4c1e87..03c2e9c071f 100644
Binary files a/gix-odb/tests/fixtures/generated-archives/make_repo_multi_index.tar.xz and b/gix-odb/tests/fixtures/generated-archives/make_repo_multi_index.tar.xz differ
diff --git a/gix-odb/tests/fixtures/make_alternates_odb.sh b/gix-odb/tests/fixtures/make_alternates_odb.sh
index 03b9964383f..85bafc0fd82 100755
--- a/gix-odb/tests/fixtures/make_alternates_odb.sh
+++ b/gix-odb/tests/fixtures/make_alternates_odb.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-odb/tests/fixtures/make_replaced_history.sh b/gix-odb/tests/fixtures/make_replaced_history.sh
index d4d0161b4c7..416f682bf93 100755
--- a/gix-odb/tests/fixtures/make_replaced_history.sh
+++ b/gix-odb/tests/fixtures/make_replaced_history.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-odb/tests/fixtures/make_repo_multi_index.sh b/gix-odb/tests/fixtures/make_repo_multi_index.sh
index 43decae9124..abbdfb9cce1 100755
--- a/gix-odb/tests/fixtures/make_repo_multi_index.sh
+++ b/gix-odb/tests/fixtures/make_repo_multi_index.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
omit_multi_index=${1:-no}
diff --git a/gix-odb/tests/fixtures/repo_with_loose_objects.sh b/gix-odb/tests/fixtures/repo_with_loose_objects.sh
index cb055cb351d..dd6f8db5621 100755
--- a/gix-odb/tests/fixtures/repo_with_loose_objects.sh
+++ b/gix-odb/tests/fixtures/repo_with_loose_objects.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-odb/tests/odb/find/mod.rs b/gix-odb/tests/odb/find/mod.rs
index 3a93a03f1af..77d515e9505 100644
--- a/gix-odb/tests/odb/find/mod.rs
+++ b/gix-odb/tests/odb/find/mod.rs
@@ -16,7 +16,7 @@ fn can_find(db: impl gix_object::Find, hex_id: &str) {
#[test]
fn loose_object() {
- can_find(&db(), "37d4e6c5c48ba0d245164c4e10d5f41140cab980");
+ can_find(db(), "37d4e6c5c48ba0d245164c4e10d5f41140cab980");
}
#[test]
diff --git a/gix-odb/tests/odb/header/mod.rs b/gix-odb/tests/odb/header/mod.rs
index 4094a7399c8..8e059729316 100644
--- a/gix-odb/tests/odb/header/mod.rs
+++ b/gix-odb/tests/odb/header/mod.rs
@@ -8,7 +8,7 @@ fn find_header(db: impl gix_odb::Header, hex_id: &str) -> gix_odb::find::Header
#[test]
fn loose_object() {
- find_header(&db(), "37d4e6c5c48ba0d245164c4e10d5f41140cab980");
+ find_header(db(), "37d4e6c5c48ba0d245164c4e10d5f41140cab980");
}
#[test]
diff --git a/gix-odb/tests/odb/regression/mod.rs b/gix-odb/tests/odb/regression/mod.rs
index 1b8f5de0b0a..c6bffa61125 100644
--- a/gix-odb/tests/odb/regression/mod.rs
+++ b/gix-odb/tests/odb/regression/mod.rs
@@ -17,12 +17,13 @@ mod repo_with_small_packs {
}
#[test]
- #[cfg(feature = "internal-testing-gix-features-parallel")]
+ #[cfg(feature = "gix-features-parallel")]
fn multi_threaded_access_will_not_panic() -> crate::Result {
for arg in ["no", "without-multi-index"] {
- let base = gix_testtools::scripted_fixture_read_only_with_args("make_repo_multi_index.sh", Some(arg))?
- .join(".git")
- .join("objects");
+ let base =
+ gix_testtools::scripted_fixture_read_only_with_args_standalone("make_repo_multi_index.sh", Some(arg))?
+ .join(".git")
+ .join("objects");
let store = gix_odb::at(base)?;
let (tx, barrier) = crossbeam_channel::unbounded::<()>();
let handles = (0..std::thread::available_parallelism()?.get()).map(|tid| {
@@ -36,7 +37,7 @@ mod repo_with_small_packs {
for id in store.iter()? {
let id = id?;
assert!(
- store.try_find(id, &mut buf).is_ok(),
+ store.try_find(&id, &mut buf).is_ok(),
"Thread {} could not find {}",
tid,
id
diff --git a/gix-pack/CHANGELOG.md b/gix-pack/CHANGELOG.md
index 58ef8b5519c..827dcca5f28 100644
--- a/gix-pack/CHANGELOG.md
+++ b/gix-pack/CHANGELOG.md
@@ -5,6 +5,122 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.51.0 (2024-05-22)
+
+### Bug Fixes (BREAKING)
+
+ - don't panic when unknown entry types are encountered.
+ Related to https://github.com/helix-editor/helix/issues/10660
+ which runs into object types that are unknown.
+
+ I have looked into this and [couldn't find evidence of a new pack-entry type](https://github.com/git/git/blob/0f3415f1f8478b05e64db11eb8aaa2915e48fef6/packfile.c#L1303-L1358)
+ in the Git codebase.
+
+ It also looks like that Git [will never write packs that aren't V2](https://github.com/git/git/blob/0f3415f1f8478b05e64db11eb8aaa2915e48fef6/pack-write.c#L352)
+ - initially I thought it might write V3 based on some other criteria.
+
+### Commit Statistics
+
+
+
+ - 4 commits contributed to the release over the course of 9 calendar days.
+ - 38 days passed between releases.
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Adjust changelogs prior to release ([`9511416`](https://github.com/Byron/gitoxide/commit/9511416a6cd0c571233f958c165329c8705c2498))
+ - Merge branch 'status' ([`04ef31e`](https://github.com/Byron/gitoxide/commit/04ef31e9d6f5332d49037a5a4c248ebbb5aaf92b))
+ - Adapt to changes in `gix-pack` ([`bad5b48`](https://github.com/Byron/gitoxide/commit/bad5b48e4f0d865b0b0937f136d9a0041aa88046))
+ - Don't panic when unknown entry types are encountered. ([`b32a847`](https://github.com/Byron/gitoxide/commit/b32a847e10b742834169fac56c284645c1ed28f3))
+view details
+
+ * **Uncategorized**
+ - Release gix-trace v0.1.9, gix-utils v0.1.12, gix-packetline-blocking v0.17.4, gix-filter v0.11.1, gix-fs v0.10.2, gix-traverse v0.39.0, gix-worktree-stream v0.12.0, gix-archive v0.12.0, gix-config v0.36.1, gix-url v0.27.3, gix-index v0.32.0, gix-worktree v0.33.0, gix-diff v0.43.0, gix-pathspec v0.7.3, gix-dir v0.4.0, gix-pack v0.50.0, gix-odb v0.60.0, gix-transport v0.42.0, gix-protocol v0.45.0, gix-status v0.9.0, gix-worktree-state v0.10.0, gix v0.62.0, gix-fsck v0.4.0, gitoxide-core v0.37.0, gitoxide v0.35.0, safety bump 14 crates ([`095c673`](https://github.com/Byron/gitoxide/commit/095c6739b2722a8b9af90776b435ef2da454c0e6))
+ - Prepare changelogs prior to release ([`5755271`](https://github.com/Byron/gitoxide/commit/57552717f46f96c35ba4ddc0a64434354ef845e9))
+ - Merge branch 'add-topo-walk' ([`b590a9d`](https://github.com/Byron/gitoxide/commit/b590a9d2b6a273f76f0320d2b9fe1f679c08f549))
+ - Adapt to changes in `gix-traverse` ([`1cfeb11`](https://github.com/Byron/gitoxide/commit/1cfeb11f1fe9ad9c7b9084840ed7f5c5877f2f9a))
+ - Make `topo` more similar to `Ancestors`, but also rename `Ancestors` to `Simple` ([`2a9c178`](https://github.com/Byron/gitoxide/commit/2a9c178326b7f13ba6bc1f89fc2b9d9facbecf48))
+ - Adapt to changes in `gix-traverse` ([`6154bf3`](https://github.com/Byron/gitoxide/commit/6154bf3a346d69f9749271d50e4f3aacdcbad4d0))
+ - Thanks clippy ([`7f6bee5`](https://github.com/Byron/gitoxide/commit/7f6bee5452ee01638f89a0cec2d4ee2a6f0d0136))
+view details
+
+ * **[#1312](https://github.com/Byron/gitoxide/issues/1312)**
+ - Assure memory maps are created with `MAP_PRIVATE` ([`88061a1`](https://github.com/Byron/gitoxide/commit/88061a176b2f4b5a377a4cff513979ddb1e306a1))
+ * **Uncategorized**
+ - Release gix-date v0.8.5, gix-hash v0.14.2, gix-trace v0.1.8, gix-utils v0.1.11, gix-features v0.38.1, gix-actor v0.31.0, gix-validate v0.8.4, gix-object v0.42.0, gix-path v0.10.7, gix-glob v0.16.2, gix-quote v0.4.12, gix-attributes v0.22.2, gix-command v0.3.6, gix-filter v0.11.0, gix-fs v0.10.1, gix-chunk v0.4.8, gix-commitgraph v0.24.2, gix-hashtable v0.5.2, gix-revwalk v0.13.0, gix-traverse v0.38.0, gix-worktree-stream v0.11.0, gix-archive v0.11.0, gix-config-value v0.14.6, gix-tempfile v13.1.1, gix-lock v13.1.1, gix-ref v0.43.0, gix-sec v0.10.6, gix-config v0.36.0, gix-prompt v0.8.4, gix-url v0.27.2, gix-credentials v0.24.2, gix-ignore v0.11.2, gix-bitmap v0.2.11, gix-index v0.31.0, gix-worktree v0.32.0, gix-diff v0.42.0, gix-discover v0.31.0, gix-pathspec v0.7.1, gix-dir v0.2.0, gix-macros v0.1.4, gix-mailmap v0.23.0, gix-negotiate v0.13.0, gix-pack v0.49.0, gix-odb v0.59.0, gix-packetline v0.17.4, gix-transport v0.41.2, gix-protocol v0.44.2, gix-revision v0.27.0, gix-refspec v0.23.0, gix-status v0.7.0, gix-submodule v0.10.0, gix-worktree-state v0.9.0, gix v0.60.0, safety bump 26 crates ([`b050327`](https://github.com/Byron/gitoxide/commit/b050327e76f234b19be921b78b7b28e034319fdb))
+ - Prepare changelogs prior to release ([`52c3bbd`](https://github.com/Byron/gitoxide/commit/52c3bbd36b9e94a0f3a78b4ada84d0c08eba27f6))
+ - Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
+ - Merge pull request #1314 from avoidalone/main ([`5722e3a`](https://github.com/Byron/gitoxide/commit/5722e3aeeba5dd44e38a6cdbb70717a45345307e))
+ - Remove repetitive words ([`39879af`](https://github.com/Byron/gitoxide/commit/39879af6eaf2bf4fe159a5c6371c98d516c4febe))
+ - Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
+ - Merge branch 'mmap-mode' ([`9e9b9fe`](https://github.com/Byron/gitoxide/commit/9e9b9fe6f63759d3bf479a8ec2f9dd1fbef87a08))
+view details
* **Uncategorized**
+ - Release gix-date v0.8.4, gix-utils v0.1.10, gix-actor v0.30.1, gix-object v0.41.1, gix-path v0.10.6, gix-glob v0.16.1, gix-quote v0.4.11, gix-attributes v0.22.1, gix-command v0.3.5, gix-filter v0.10.0, gix-commitgraph v0.24.1, gix-worktree-stream v0.10.0, gix-archive v0.10.0, gix-config-value v0.14.5, gix-ref v0.42.0, gix-sec v0.10.5, gix-config v0.35.0, gix-prompt v0.8.3, gix-url v0.27.1, gix-credentials v0.24.1, gix-ignore v0.11.1, gix-index v0.30.0, gix-worktree v0.31.0, gix-diff v0.41.0, gix-discover v0.30.0, gix-pathspec v0.7.0, gix-dir v0.1.0, gix-pack v0.48.0, gix-odb v0.58.0, gix-transport v0.41.1, gix-protocol v0.44.1, gix-revision v0.26.1, gix-refspec v0.22.1, gix-status v0.6.0, gix-submodule v0.9.0, gix-worktree-state v0.8.0, gix v0.59.0, gix-fsck v0.3.0, gitoxide-core v0.36.0, gitoxide v0.34.0, safety bump 10 crates ([`45b4470`](https://github.com/Byron/gitoxide/commit/45b447045bc826f252129c300c531acde2652c64))
- Prepare changelogs prior to release ([`f2e111f`](https://github.com/Byron/gitoxide/commit/f2e111f768fc1bc6182355261c20b63610cffec7))
- Thanks clippy ([`13d5602`](https://github.com/Byron/gitoxide/commit/13d5602faa58aa6f520ebc6003ed54bc9c844f2b))
- Merge branch 'tempfile-permissions' ([`7b44c7f`](https://github.com/Byron/gitoxide/commit/7b44c7ff1dc0b8875214d2673c7f52948cf04ff0))
diff --git a/gix-pack/Cargo.toml b/gix-pack/Cargo.toml
index 4d353d7aa90..8803ef1642c 100644
--- a/gix-pack/Cargo.toml
+++ b/gix-pack/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gix-pack"
-version = "0.48.0"
+version = "0.51.0"
repository = "https://github.com/Byron/gitoxide"
authors = ["Sebastian Thiel "]
license = "MIT OR Apache-2.0"
@@ -32,16 +32,16 @@ serde = ["dep:serde", "gix-object/serde"]
wasm = ["gix-diff?/wasm"]
[dependencies]
-gix-features = { version = "^0.38.0", path = "../gix-features", features = ["crc32", "rustsha1", "progress", "zlib"] }
-gix-path = { version = "^0.10.6", path = "../gix-path" }
-gix-hash = { version = "^0.14.1", path = "../gix-hash" }
-gix-chunk = { version = "^0.4.7", path = "../gix-chunk" }
-gix-object = { version = "^0.41.1", path = "../gix-object" }
-gix-hashtable = { version = "^0.5.1", path = "../gix-hashtable" }
+gix-features = { version = "^0.38.2", path = "../gix-features", features = ["crc32", "rustsha1", "progress", "zlib"] }
+gix-path = { version = "^0.10.7", path = "../gix-path" }
+gix-hash = { version = "^0.14.2", path = "../gix-hash" }
+gix-chunk = { version = "^0.4.8", path = "../gix-chunk" }
+gix-object = { version = "^0.42.2", path = "../gix-object" }
+gix-hashtable = { version = "^0.5.2", path = "../gix-hashtable" }
# for streaming of packs (input, output)
-gix-traverse = { version = "^0.37.0", path = "../gix-traverse", optional = true }
-gix-diff = { version = "^0.41.0", path = "../gix-diff", default-features = false, optional = true }
+gix-traverse = { version = "^0.39.1", path = "../gix-traverse", optional = true }
+gix-diff = { version = "^0.44.0", path = "../gix-diff", default-features = false, optional = true }
memmap2 = "0.9.0"
smallvec = "1.3.0"
@@ -58,7 +58,7 @@ document-features = { version = "0.2.0", optional = true }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-gix-tempfile = { version = "^13.0.0", default-features = false, path = "../gix-tempfile" }
+gix-tempfile = { version = "^14.0.0", default-features = false, path = "../gix-tempfile" }
[dev-dependencies]
gix-testtools = { path = "../tests/tools"}
diff --git a/gix-pack/src/bundle/find.rs b/gix-pack/src/bundle/find.rs
index 98e28333d48..4a7fd23129d 100644
--- a/gix-pack/src/bundle/find.rs
+++ b/gix-pack/src/bundle/find.rs
@@ -37,7 +37,7 @@ impl crate::Bundle {
cache: &mut dyn crate::cache::DecodeEntry,
) -> Result<(gix_object::Data<'a>, crate::data::entry::Location), crate::data::decode::Error> {
let ofs = self.index.pack_offset_at_index(idx);
- let pack_entry = self.pack.entry(ofs);
+ let pack_entry = self.pack.entry(ofs)?;
let header_size = pack_entry.header_size();
self.pack
.decode_entry(
@@ -45,11 +45,11 @@ impl crate::Bundle {
out,
inflate,
&|id, _out| {
- self.index.lookup(id).map(|idx| {
- crate::data::decode::entry::ResolvedBase::InPack(
- self.pack.entry(self.index.pack_offset_at_index(idx)),
- )
- })
+ let idx = self.index.lookup(id)?;
+ self.pack
+ .entry(self.index.pack_offset_at_index(idx))
+ .ok()
+ .map(crate::data::decode::entry::ResolvedBase::InPack)
},
cache,
)
diff --git a/gix-pack/src/bundle/mod.rs b/gix-pack/src/bundle/mod.rs
index d8ef1107d70..473e51dbf72 100644
--- a/gix-pack/src/bundle/mod.rs
+++ b/gix-pack/src/bundle/mod.rs
@@ -1,4 +1,5 @@
///
+#[allow(clippy::empty_docs)]
pub mod init;
mod find;
@@ -7,12 +8,14 @@ mod find;
pub mod write;
///
+#[allow(clippy::empty_docs)]
pub mod verify {
use std::sync::atomic::AtomicBool;
use gix_features::progress::DynNestedProgress;
///
+ #[allow(clippy::empty_docs)]
pub mod integrity {
/// Returned by [`Bundle::verify_integrity()`][crate::Bundle::verify_integrity()].
pub struct Outcome {
diff --git a/gix-pack/src/bundle/write/mod.rs b/gix-pack/src/bundle/write/mod.rs
index 9ddd1b9d3a5..8f45090ab3e 100644
--- a/gix-pack/src/bundle/write/mod.rs
+++ b/gix-pack/src/bundle/write/mod.rs
@@ -51,8 +51,8 @@ impl crate::Bundle {
/// * `progress` provides detailed progress information which can be discarded with [`gix_features::progress::Discard`].
/// * `should_interrupt` is checked regularly and when true, the whole operation will stop.
/// * `thin_pack_base_object_lookup` If set, we expect to see a thin-pack with objects that reference their base object by object id which is
- /// expected to exist in the object database the bundle is contained within.
- /// `options` further configure how the task is performed.
+ /// expected to exist in the object database the bundle is contained within.
+ /// `options` further configure how the task is performed.
///
/// # Note
///
@@ -300,31 +300,46 @@ impl crate::Bundle {
)?;
drop(pack_entries_iter);
- let data_path = directory.join(format!("pack-{}.pack", outcome.data_hash.to_hex()));
- let index_path = data_path.with_extension("idx");
- let keep_path = data_path.with_extension("keep");
+ if outcome.num_objects == 0 {
+ WriteOutcome {
+ outcome,
+ data_path: None,
+ index_path: None,
+ keep_path: None,
+ }
+ } else {
+ let data_path = directory.join(format!("pack-{}.pack", outcome.data_hash.to_hex()));
+ let index_path = data_path.with_extension("idx");
+ let keep_path = if data_path.is_file() {
+ // avoid trying to overwrite existing files, we know they have the same content
+ // and this is likely to fail on Windows as negotiation opened the pack.
+ None
+ } else {
+ let keep_path = data_path.with_extension("keep");
- std::fs::write(&keep_path, b"")?;
- Arc::try_unwrap(data_file)
- .expect("only one handle left after pack was consumed")
- .into_inner()
- .into_inner()
- .map_err(|err| Error::from(err.into_error()))?
- .persist(&data_path)?;
- index_file
- .persist(&index_path)
- .map_err(|err| {
- progress.info(format!(
- "pack file at {} is retained despite failing to move the index file into place. You can use plumbing to make it usable.",
- data_path.display()
- ));
- err
- })?;
- WriteOutcome {
- outcome,
- data_path: Some(data_path),
- index_path: Some(index_path),
- keep_path: Some(keep_path),
+ std::fs::write(&keep_path, b"")?;
+ Arc::try_unwrap(data_file)
+ .expect("only one handle left after pack was consumed")
+ .into_inner()
+ .into_inner()
+ .map_err(|err| Error::from(err.into_error()))?
+ .persist(&data_path)?;
+ Some(keep_path)
+ };
+ if !index_path.is_file() {
+ index_file
+ .persist(&index_path)
+ .map_err(|err| {
+ gix_features::trace::warn!("pack file at \"{}\" is retained despite failing to move the index file into place. You can use plumbing to make it usable.",data_path.display());
+ err
+ })?;
+ }
+ WriteOutcome {
+ outcome,
+ data_path: Some(data_path),
+ index_path: Some(index_path),
+ keep_path,
+ }
}
}
None => WriteOutcome {
diff --git a/gix-pack/src/bundle/write/types.rs b/gix-pack/src/bundle/write/types.rs
index 9ade3ed0a52..e188d097b72 100644
--- a/gix-pack/src/bundle/write/types.rs
+++ b/gix-pack/src/bundle/write/types.rs
@@ -33,18 +33,20 @@ impl Default for Options {
#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct Outcome {
- /// The successful result of the index write operation
+ /// The successful result of the index write operation.
pub index: crate::index::write::Outcome,
- /// The version of the pack
+ /// The version of the pack.
pub pack_version: crate::data::Version,
- /// The kind of hash stored within the pack and indices
+ /// The kind of hash stored within the pack and indices.
pub object_hash: gix_hash::Kind,
- /// The path to the pack index file
+ /// The path to the pack index file.
pub index_path: Option,
- /// The path to the pack data file
+ /// The path to the pack data file.
pub data_path: Option,
/// The path to the `.keep` file to prevent collection of the newly written pack until refs are pointing to it.
+ /// It might be `None` if the file at `data_path` already existed, indicating that we have received a pack that
+ /// was already present locally.
///
/// The file is created right before moving the pack data and index data into place (i.e. `data_path` and `index_path`)
/// and is expected to be removed by the caller when ready.
diff --git a/gix-pack/src/cache/delta/from_offsets.rs b/gix-pack/src/cache/delta/from_offsets.rs
index d790dcc0f71..4b05bed4e56 100644
--- a/gix-pack/src/cache/delta/from_offsets.rs
+++ b/gix-pack/src/cache/delta/from_offsets.rs
@@ -1,5 +1,4 @@
use std::{
- convert::TryFrom,
fs, io,
io::{BufRead, Read, Seek, SeekFrom},
sync::atomic::{AtomicBool, Ordering},
@@ -32,13 +31,13 @@ const PACK_HEADER_LEN: usize = 12;
impl Tree {
/// Create a new `Tree` from any data sorted by offset, ascending as returned by the `data_sorted_by_offsets` iterator.
/// * `get_pack_offset(item: &T) -> data::Offset` is a function returning the pack offset of the given item, which can be used
- /// for obtaining the objects entry within the pack.
+ /// for obtaining the objects entry within the pack.
/// * `pack_path` is the path to the pack file itself and from which to read the entry data, which is a pack file matching the offsets
- /// returned by `get_pack_offset(…)`.
+ /// returned by `get_pack_offset(…)`.
/// * `progress` is used to track progress when creating the tree.
/// * `resolve_in_pack_id(gix_hash::oid) -> Option` takes an object ID and tries to resolve it to an object within this pack if
- /// possible. Failing to do so aborts the operation, and this function is not expected to be called in usual packs. It's a theoretical
- /// possibility though as old packs might have referred to their objects using the 20 bytes hash, instead of their encoded offset from the base.
+ /// possible. Failing to do so aborts the operation, and this function is not expected to be called in usual packs. It's a theoretical
+ /// possibility though as old packs might have referred to their objects using the 20 bytes hash, instead of their encoded offset from the base.
///
/// Note that the sort order is ascending. The given pack file path must match the provided offsets.
pub fn from_offsets_in_pack(
@@ -58,12 +57,14 @@ impl Tree {
})?,
);
- let anticipated_num_objects = if let Some(num_objects) = data_sorted_by_offsets.size_hint().1 {
- progress.init(Some(num_objects), progress::count("objects"));
- num_objects
- } else {
- 0
- };
+ let anticipated_num_objects = data_sorted_by_offsets
+ .size_hint()
+ .1
+ .map(|num_objects| {
+ progress.init(Some(num_objects), progress::count("objects"));
+ num_objects
+ })
+ .unwrap_or_default();
let mut tree = Tree::with_capacity(anticipated_num_objects)?;
{
diff --git a/gix-pack/src/cache/delta/mod.rs b/gix-pack/src/cache/delta/mod.rs
index c923b5d1078..161432e8c2b 100644
--- a/gix-pack/src/cache/delta/mod.rs
+++ b/gix-pack/src/cache/delta/mod.rs
@@ -12,9 +12,11 @@ pub enum Error {
}
///
+#[allow(clippy::empty_docs)]
pub mod traverse;
///
+#[allow(clippy::empty_docs)]
pub mod from_offsets;
/// Tree datastructure
diff --git a/gix-pack/src/cache/delta/traverse/mod.rs b/gix-pack/src/cache/delta/traverse/mod.rs
index ea0c9c93be9..290f389bbe4 100644
--- a/gix-pack/src/cache/delta/traverse/mod.rs
+++ b/gix-pack/src/cache/delta/traverse/mod.rs
@@ -26,6 +26,8 @@ pub enum Error {
},
#[error("The resolver failed to obtain the pack entry bytes for the entry at {pack_offset}")]
ResolveFailed { pack_offset: u64 },
+ #[error(transparent)]
+ EntryType(#[from] crate::data::entry::decode::Error),
#[error("One of the object inspectors failed")]
Inspect(#[from] Box),
#[error("Interrupted")]
diff --git a/gix-pack/src/cache/delta/traverse/resolve.rs b/gix-pack/src/cache/delta/traverse/resolve.rs
index 92bff6b03e8..56d7432e776 100644
--- a/gix-pack/src/cache/delta/traverse/resolve.rs
+++ b/gix-pack/src/cache/delta/traverse/resolve.rs
@@ -128,7 +128,7 @@ where
let bytes = resolve(slice.clone(), resolve_data).ok_or(Error::ResolveFailed {
pack_offset: slice.start,
})?;
- let entry = data::Entry::from_bytes(bytes, slice.start, hash_len);
+ let entry = data::Entry::from_bytes(bytes, slice.start, hash_len)?;
let compressed = &bytes[entry.header_size()..];
let decompressed_len = entry.decompressed_size as usize;
decompress_all_at_once_with(&mut inflate, compressed, decompressed_len, out)?;
@@ -304,7 +304,7 @@ where
let bytes = resolve(slice.clone(), resolve_data).ok_or(Error::ResolveFailed {
pack_offset: slice.start,
})?;
- let entry = data::Entry::from_bytes(bytes, slice.start, hash_len);
+ let entry = data::Entry::from_bytes(bytes, slice.start, hash_len)?;
let compressed = &bytes[entry.header_size()..];
let decompressed_len = entry.decompressed_size as usize;
decompress_all_at_once_with(&mut inflate, compressed, decompressed_len, out)?;
diff --git a/gix-pack/src/cache/lru.rs b/gix-pack/src/cache/lru.rs
index 4eef90306a1..f670037261d 100644
--- a/gix-pack/src/cache/lru.rs
+++ b/gix-pack/src/cache/lru.rs
@@ -133,7 +133,7 @@ mod _static {
if data.len() > self.mem_limit {
return;
}
- // If we could hold it but are are at limit, all we can do is make space.
+ // If we could hold it but are at limit, all we can do is make space.
let mem_free = self.mem_limit - self.mem_used;
if data.len() > mem_free {
// prefer freeing free-lists instead of clearing our cache
diff --git a/gix-pack/src/cache/mod.rs b/gix-pack/src/cache/mod.rs
index eabb6a3ed85..d41467c05b9 100644
--- a/gix-pack/src/cache/mod.rs
+++ b/gix-pack/src/cache/mod.rs
@@ -52,6 +52,7 @@ pub mod lru;
pub mod object;
///
+#[allow(clippy::empty_docs)]
pub(crate) mod delta;
/// Replaces content of the given `Vec` with the slice. The vec will have the same length
diff --git a/gix-pack/src/data/entry/decode.rs b/gix-pack/src/data/entry/decode.rs
index 37b8560ac03..6b38be0f33d 100644
--- a/gix-pack/src/data/entry/decode.rs
+++ b/gix-pack/src/data/entry/decode.rs
@@ -5,6 +5,14 @@ use gix_features::decode::{leb64, leb64_from_read};
use super::{BLOB, COMMIT, OFS_DELTA, REF_DELTA, TAG, TREE};
use crate::data;
+/// The error returned by [data::Entry::from_bytes()].
+#[derive(Debug, thiserror::Error)]
+#[allow(missing_docs)]
+#[error("Object type {type_id} is unsupported")]
+pub struct Error {
+ pub type_id: u8,
+}
+
/// Decoding
impl data::Entry {
/// Decode an entry from the given entry data `d`, providing the `pack_offset` to allow tracking the start of the entry data section.
@@ -12,7 +20,7 @@ impl data::Entry {
/// # Panics
///
/// If we cannot understand the header, garbage data is likely to trigger this.
- pub fn from_bytes(d: &[u8], pack_offset: data::Offset, hash_len: usize) -> data::Entry {
+ pub fn from_bytes(d: &[u8], pack_offset: data::Offset, hash_len: usize) -> Result {
let (type_id, size, mut consumed) = parse_header_info(d);
use crate::data::entry::Header::*;
@@ -36,21 +44,17 @@ impl data::Entry {
TREE => Tree,
COMMIT => Commit,
TAG => Tag,
- _ => panic!("We currently don't support any V3 features or extensions"),
+ other => return Err(Error { type_id: other }),
};
- data::Entry {
+ Ok(data::Entry {
header: object,
decompressed_size: size,
data_offset: pack_offset + consumed as u64,
- }
+ })
}
/// Instantiate an `Entry` from the reader `r`, providing the `pack_offset` to allow tracking the start of the entry data section.
- pub fn from_read(
- r: &mut dyn io::Read,
- pack_offset: data::Offset,
- hash_len: usize,
- ) -> Result {
+ pub fn from_read(r: &mut dyn io::Read, pack_offset: data::Offset, hash_len: usize) -> io::Result {
let (type_id, size, mut consumed) = streaming_parse_header_info(r)?;
use crate::data::entry::Header::*;
@@ -78,7 +82,12 @@ impl data::Entry {
TREE => Tree,
COMMIT => Commit,
TAG => Tag,
- _ => panic!("We currently don't support any V3 features or extensions"),
+ other => {
+ return Err(io::Error::new(
+ io::ErrorKind::Other,
+ format!("Object type {other} is unsupported"),
+ ))
+ }
};
Ok(data::Entry {
header: object,
diff --git a/gix-pack/src/data/entry/mod.rs b/gix-pack/src/data/entry/mod.rs
index 6225cbf0115..13788663b19 100644
--- a/gix-pack/src/data/entry/mod.rs
+++ b/gix-pack/src/data/entry/mod.rs
@@ -45,7 +45,9 @@ impl Entry {
}
}
-mod decode;
+///
+#[allow(clippy::empty_docs)]
+pub mod decode;
mod header;
pub use header::Header;
diff --git a/gix-pack/src/data/file/decode/entry.rs b/gix-pack/src/data/file/decode/entry.rs
index 2bec3efbd68..5613d70ee74 100644
--- a/gix-pack/src/data/file/decode/entry.rs
+++ b/gix-pack/src/data/file/decode/entry.rs
@@ -1,4 +1,4 @@
-use std::{convert::TryInto, ops::Range};
+use std::ops::Range;
use gix_features::zlib;
use smallvec::SmallVec;
@@ -100,18 +100,10 @@ impl File {
.map_err(Into::into)
}
- fn assure_v2(&self) {
- assert!(
- matches!(self.version, crate::data::Version::V2),
- "Only V2 is implemented"
- );
- }
-
/// Obtain the [`Entry`][crate::data::Entry] at the given `offset` into the pack.
///
/// The `offset` is typically obtained from the pack index file.
- pub fn entry(&self, offset: data::Offset) -> data::Entry {
- self.assure_v2();
+ pub fn entry(&self, offset: data::Offset) -> Result {
let pack_offset: usize = offset.try_into().expect("offset representable by machine");
assert!(pack_offset <= self.data.len(), "offset out of bounds");
@@ -246,7 +238,7 @@ impl File {
});
use crate::data::entry::Header;
cursor = match cursor.header {
- Header::OfsDelta { base_distance } => self.entry(cursor.base_pack_offset(base_distance)),
+ Header::OfsDelta { base_distance } => self.entry(cursor.base_pack_offset(base_distance))?,
Header::RefDelta { base_id } => match resolve(base_id.as_ref(), out) {
Some(ResolvedBase::InPack(entry)) => entry,
Some(ResolvedBase::OutOfPack { end, kind }) => {
diff --git a/gix-pack/src/data/file/decode/header.rs b/gix-pack/src/data/file/decode/header.rs
index fb23f482d0d..84568352a59 100644
--- a/gix-pack/src/data/file/decode/header.rs
+++ b/gix-pack/src/data/file/decode/header.rs
@@ -66,7 +66,7 @@ impl File {
if first_delta_decompressed_size.is_none() {
first_delta_decompressed_size = Some(self.decode_delta_object_size(inflate, &entry)?);
}
- entry = self.entry(entry.base_pack_offset(base_distance))
+ entry = self.entry(entry.base_pack_offset(base_distance))?
}
RefDelta { base_id } => {
num_deltas += 1;
diff --git a/gix-pack/src/data/file/decode/mod.rs b/gix-pack/src/data/file/decode/mod.rs
index aa4177424a5..5746dc8e000 100644
--- a/gix-pack/src/data/file/decode/mod.rs
+++ b/gix-pack/src/data/file/decode/mod.rs
@@ -1,8 +1,10 @@
use std::collections::TryReserveError;
///
+#[allow(clippy::empty_docs)]
pub mod entry;
///
+#[allow(clippy::empty_docs)]
pub mod header;
/// Returned by [`File::decode_header()`][crate::data::File::decode_header()],
@@ -15,6 +17,8 @@ pub enum Error {
ZlibInflate(#[from] gix_features::zlib::inflate::Error),
#[error("A delta chain could not be followed as the ref base with id {0} could not be found")]
DeltaBaseUnresolved(gix_hash::ObjectId),
+ #[error(transparent)]
+ EntryType(#[from] crate::data::entry::decode::Error),
#[error("Entry too large to fit in memory")]
OutOfMemory,
}
diff --git a/gix-pack/src/data/file/init.rs b/gix-pack/src/data/file/init.rs
index b160724175d..a005e517fd7 100644
--- a/gix-pack/src/data/file/init.rs
+++ b/gix-pack/src/data/file/init.rs
@@ -1,4 +1,4 @@
-use std::{convert::TryInto, path::Path};
+use std::path::Path;
use crate::data;
diff --git a/gix-pack/src/data/file/mod.rs b/gix-pack/src/data/file/mod.rs
index 6bfe0e2721b..936ab51ecb9 100644
--- a/gix-pack/src/data/file/mod.rs
+++ b/gix-pack/src/data/file/mod.rs
@@ -1,8 +1,10 @@
mod init;
///
+#[allow(clippy::empty_docs)]
pub mod verify;
///
+#[allow(clippy::empty_docs)]
pub mod decode;
/// The bytes used as header in a pack data file.
diff --git a/gix-pack/src/data/file/verify.rs b/gix-pack/src/data/file/verify.rs
index ea99144a1e9..9b12209e634 100644
--- a/gix-pack/src/data/file/verify.rs
+++ b/gix-pack/src/data/file/verify.rs
@@ -5,6 +5,7 @@ use gix_features::progress::Progress;
use crate::data::File;
///
+#[allow(clippy::empty_docs)]
pub mod checksum {
/// Returned by [`data::File::verify_checksum()`][crate::data::File::verify_checksum()].
pub type Error = crate::verify::checksum::Error;
diff --git a/gix-pack/src/data/header.rs b/gix-pack/src/data/header.rs
index 348a4ca24ec..c6c7b8350fd 100644
--- a/gix-pack/src/data/header.rs
+++ b/gix-pack/src/data/header.rs
@@ -37,6 +37,7 @@ pub fn encode(version: data::Version, num_objects: u32) -> [u8; 12] {
}
///
+#[allow(clippy::empty_docs)]
pub mod decode {
/// Returned by [`decode()`][super::decode()].
#[derive(thiserror::Error, Debug)]
diff --git a/gix-pack/src/data/input/lookup_ref_delta_objects.rs b/gix-pack/src/data/input/lookup_ref_delta_objects.rs
index f6036e20f0e..6b1995293e1 100644
--- a/gix-pack/src/data/input/lookup_ref_delta_objects.rs
+++ b/gix-pack/src/data/input/lookup_ref_delta_objects.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
use gix_hash::ObjectId;
use crate::data::{entry::Header, input};
diff --git a/gix-pack/src/data/mod.rs b/gix-pack/src/data/mod.rs
index 9808ae8530c..385aa3d719c 100644
--- a/gix-pack/src/data/mod.rs
+++ b/gix-pack/src/data/mod.rs
@@ -1,5 +1,5 @@
//! a pack data file
-use std::{convert::TryInto, path::Path};
+use std::path::Path;
/// The offset to an entry into the pack data file, relative to its beginning.
pub type Offset = u64;
@@ -26,14 +26,17 @@ pub struct Entry {
mod file;
pub use file::{decode, verify, Header};
///
+#[allow(clippy::empty_docs)]
pub mod header;
///
+#[allow(clippy::empty_docs)]
pub mod init {
pub use super::header::decode::Error;
}
///
+#[allow(clippy::empty_docs)]
pub mod entry;
///
diff --git a/gix-pack/src/data/output/count/mod.rs b/gix-pack/src/data/output/count/mod.rs
index 481ff65d3c3..c10ec1e51a6 100644
--- a/gix-pack/src/data/output/count/mod.rs
+++ b/gix-pack/src/data/output/count/mod.rs
@@ -44,6 +44,7 @@ mod objects_impl;
pub use objects_impl::{objects, objects_unthreaded};
///
+#[allow(clippy::empty_docs)]
pub mod objects {
pub use super::objects_impl::{Error, ObjectExpansion, Options, Outcome};
}
diff --git a/gix-pack/src/data/output/entry/iter_from_counts.rs b/gix-pack/src/data/output/entry/iter_from_counts.rs
index c65f29ced49..5760bbb22fe 100644
--- a/gix-pack/src/data/output/entry/iter_from_counts.rs
+++ b/gix-pack/src/data/output/entry/iter_from_counts.rs
@@ -40,7 +40,7 @@ pub(crate) mod function {
///
/// * ~~currently there is no way to easily write the pack index, even though the state here is uniquely positioned to do
/// so with minimal overhead (especially compared to `gix index-from-pack`)~~ Probably works now by chaining Iterators
- /// or keeping enough state to write a pack and then generate an index with recorded data.
+ /// or keeping enough state to write a pack and then generate an index with recorded data.
///
pub fn iter_from_counts(
mut counts: Vec,
diff --git a/gix-pack/src/data/output/entry/mod.rs b/gix-pack/src/data/output/entry/mod.rs
index 4ab4879eb69..188ecf51174 100644
--- a/gix-pack/src/data/output/entry/mod.rs
+++ b/gix-pack/src/data/output/entry/mod.rs
@@ -1,10 +1,11 @@
-use std::{convert::TryFrom, io::Write};
+use std::io::Write;
use gix_hash::ObjectId;
use crate::{data, data::output, find};
///
+#[allow(clippy::empty_docs)]
pub mod iter_from_counts;
pub use iter_from_counts::function::iter_from_counts;
@@ -37,6 +38,8 @@ pub enum Kind {
pub enum Error {
#[error("{0}")]
ZlibDeflate(#[from] std::io::Error),
+ #[error(transparent)]
+ EntryType(#[from] crate::data::entry::decode::Error),
}
impl output::Entry {
@@ -73,7 +76,11 @@ impl output::Entry {
};
let pack_offset_must_be_zero = 0;
- let pack_entry = data::Entry::from_bytes(&entry.data, pack_offset_must_be_zero, count.id.as_slice().len());
+ let pack_entry = match data::Entry::from_bytes(&entry.data, pack_offset_must_be_zero, count.id.as_slice().len())
+ {
+ Ok(e) => e,
+ Err(err) => return Some(Err(err.into())),
+ };
use crate::data::entry::Header::*;
match pack_entry.header {
diff --git a/gix-pack/src/data/output/mod.rs b/gix-pack/src/data/output/mod.rs
index 338bb92b3ea..0e1b97256aa 100644
--- a/gix-pack/src/data/output/mod.rs
+++ b/gix-pack/src/data/output/mod.rs
@@ -1,6 +1,7 @@
use gix_hash::ObjectId;
///
+#[allow(clippy::empty_docs)]
pub mod count;
/// An item representing a future Entry in the leanest way possible.
@@ -35,7 +36,9 @@ pub struct Entry {
}
///
+#[allow(clippy::empty_docs)]
pub mod entry;
///
+#[allow(clippy::empty_docs)]
pub mod bytes;
diff --git a/gix-pack/src/index/mod.rs b/gix-pack/src/index/mod.rs
index 8d880744241..f83eb51fd0e 100644
--- a/gix-pack/src/index/mod.rs
+++ b/gix-pack/src/index/mod.rs
@@ -136,6 +136,7 @@ impl File {
const V2_SIGNATURE: &[u8] = b"\xfftOc";
///
+#[allow(clippy::empty_docs)]
pub mod init;
pub(crate) mod access;
@@ -143,9 +144,11 @@ pub use access::Entry;
pub(crate) mod encode;
///
+#[allow(clippy::empty_docs)]
pub mod traverse;
mod util;
///
+#[allow(clippy::empty_docs)]
pub mod verify;
///
#[cfg(feature = "streaming-input")]
diff --git a/gix-pack/src/index/traverse/error.rs b/gix-pack/src/index/traverse/error.rs
index 2310c3babca..f6cc7506548 100644
--- a/gix-pack/src/index/traverse/error.rs
+++ b/gix-pack/src/index/traverse/error.rs
@@ -12,6 +12,8 @@ pub enum Error {
Tree(#[from] crate::cache::delta::from_offsets::Error),
#[error("The tree traversal failed")]
TreeTraversal(#[from] crate::cache::delta::traverse::Error),
+ #[error(transparent)]
+ EntryType(#[from] crate::data::entry::decode::Error),
#[error("Object {id} at offset {offset} could not be decoded")]
PackDecode {
id: gix_hash::ObjectId,
diff --git a/gix-pack/src/index/traverse/mod.rs b/gix-pack/src/index/traverse/mod.rs
index 1edf0b1d5dd..e6731554a0a 100644
--- a/gix-pack/src/index/traverse/mod.rs
+++ b/gix-pack/src/index/traverse/mod.rs
@@ -6,8 +6,10 @@ use crate::index;
mod reduce;
///
+#[allow(clippy::empty_docs)]
pub mod with_index;
///
+#[allow(clippy::empty_docs)]
pub mod with_lookup;
use reduce::Reducer;
@@ -159,7 +161,7 @@ impl index::File {
C: crate::cache::DecodeEntry,
E: std::error::Error + Send + Sync + 'static,
{
- let pack_entry = pack.entry(index_entry.pack_offset);
+ let pack_entry = pack.entry(index_entry.pack_offset)?;
let pack_entry_data_offset = pack_entry.data_offset;
let entry_stats = pack
.decode_entry(
@@ -167,9 +169,10 @@ impl index::File {
buf,
inflate,
&|id, _| {
- self.lookup(id).map(|index| {
- crate::data::decode::entry::ResolvedBase::InPack(pack.entry(self.pack_offset_at_index(index)))
- })
+ let index = self.lookup(id)?;
+ pack.entry(self.pack_offset_at_index(index))
+ .ok()
+ .map(crate::data::decode::entry::ResolvedBase::InPack)
},
cache,
)
diff --git a/gix-pack/src/index/verify.rs b/gix-pack/src/index/verify.rs
index 0ee4259a8fc..6dfa817e08e 100644
--- a/gix-pack/src/index/verify.rs
+++ b/gix-pack/src/index/verify.rs
@@ -6,6 +6,7 @@ use gix_object::WriteTo;
use crate::index;
///
+#[allow(clippy::empty_docs)]
pub mod integrity {
use std::marker::PhantomData;
@@ -88,6 +89,7 @@ pub mod integrity {
}
///
+#[allow(clippy::empty_docs)]
pub mod checksum {
/// Returned by [`index::File::verify_checksum()`][crate::index::File::verify_checksum()].
pub type Error = crate::verify::checksum::Error;
diff --git a/gix-pack/src/index/write/mod.rs b/gix-pack/src/index/write/mod.rs
index 3ecb7347b8f..ca3d8348088 100644
--- a/gix-pack/src/index/write/mod.rs
+++ b/gix-pack/src/index/write/mod.rs
@@ -1,4 +1,4 @@
-use std::{convert::TryInto, io, sync::atomic::AtomicBool};
+use std::{io, sync::atomic::AtomicBool};
pub use error::Error;
use gix_features::progress::{self, prodash::DynNestedProgress, Count, Progress};
@@ -78,9 +78,9 @@ impl crate::index::File {
///
/// * neither in-pack nor out-of-pack Ref Deltas are supported here, these must have been resolved beforehand.
/// * `make_resolver()` will only be called after the iterator stopped returning elements and produces a function that
- /// provides all bytes belonging to a pack entry writing them to the given mutable output `Vec`.
- /// It should return `None` if the entry cannot be resolved from the pack that produced the `entries` iterator, causing
- /// the write operation to fail.
+ /// provides all bytes belonging to a pack entry writing them to the given mutable output `Vec`.
+ /// It should return `None` if the entry cannot be resolved from the pack that produced the `entries` iterator, causing
+ /// the write operation to fail.
#[allow(clippy::too_many_arguments)]
pub fn write_data_iter_to_stream(
version: crate::index::Version,
diff --git a/gix-pack/src/lib.rs b/gix-pack/src/lib.rs
index b56d1fe983e..34c9e1c9d55 100755
--- a/gix-pack/src/lib.rs
+++ b/gix-pack/src/lib.rs
@@ -19,6 +19,7 @@
#![deny(missing_docs, rust_2018_idioms, unsafe_code)]
///
+#[allow(clippy::empty_docs)]
pub mod bundle;
/// A bundle of pack data and the corresponding pack index
pub struct Bundle {
@@ -29,22 +30,28 @@ pub struct Bundle {
}
///
+#[allow(clippy::empty_docs)]
pub mod find;
///
+#[allow(clippy::empty_docs)]
pub mod cache;
///
+#[allow(clippy::empty_docs)]
pub mod data;
mod find_traits;
pub use find_traits::{Find, FindExt};
///
+#[allow(clippy::empty_docs)]
pub mod index;
///
+#[allow(clippy::empty_docs)]
pub mod multi_index;
///
+#[allow(clippy::empty_docs)]
pub mod verify;
mod mmap {
@@ -55,13 +62,11 @@ mod mmap {
// SAFETY: we have to take the risk of somebody changing the file underneath. Git never writes into the same file.
#[allow(unsafe_code)]
unsafe {
- memmap2::Mmap::map(&file)
+ memmap2::MmapOptions::new().map_copy_read_only(&file)
}
}
}
-use std::convert::TryInto;
-
#[inline]
fn read_u32(b: &[u8]) -> u32 {
u32::from_be_bytes(b.try_into().unwrap())
diff --git a/gix-pack/src/multi_index/chunk.rs b/gix-pack/src/multi_index/chunk.rs
index e9a9aac9cdb..81c640bbf57 100644
--- a/gix-pack/src/multi_index/chunk.rs
+++ b/gix-pack/src/multi_index/chunk.rs
@@ -8,6 +8,7 @@ pub mod index_names {
pub const ID: gix_chunk::Id = *b"PNAM";
///
+ #[allow(clippy::empty_docs)]
pub mod decode {
use gix_object::bstr::BString;
@@ -105,8 +106,6 @@ pub mod index_names {
/// Information for the chunk with the fanout table
pub mod fanout {
- use std::convert::TryInto;
-
use crate::multi_index;
/// The size of the fanout table
@@ -173,7 +172,7 @@ pub mod lookup {
/// Information about the offsets table.
pub mod offsets {
- use std::{convert::TryInto, ops::Range};
+ use std::ops::Range;
use crate::multi_index;
diff --git a/gix-pack/src/multi_index/init.rs b/gix-pack/src/multi_index/init.rs
index 190b40a7b04..beccf78e403 100644
--- a/gix-pack/src/multi_index/init.rs
+++ b/gix-pack/src/multi_index/init.rs
@@ -1,4 +1,4 @@
-use std::{convert::TryFrom, path::Path};
+use std::path::Path;
use crate::multi_index::{chunk, File, Version};
diff --git a/gix-pack/src/multi_index/mod.rs b/gix-pack/src/multi_index/mod.rs
index d88ae0baed1..6fbb53676a9 100644
--- a/gix-pack/src/multi_index/mod.rs
+++ b/gix-pack/src/multi_index/mod.rs
@@ -37,16 +37,21 @@ pub struct File {
}
///
+#[allow(clippy::empty_docs)]
pub mod write;
///
+#[allow(clippy::empty_docs)]
mod access;
///
+#[allow(clippy::empty_docs)]
pub mod verify;
///
+#[allow(clippy::empty_docs)]
pub mod chunk;
///
+#[allow(clippy::empty_docs)]
pub mod init;
diff --git a/gix-pack/src/multi_index/verify.rs b/gix-pack/src/multi_index/verify.rs
index 0903b3568cf..2f645e6c881 100644
--- a/gix-pack/src/multi_index/verify.rs
+++ b/gix-pack/src/multi_index/verify.rs
@@ -5,6 +5,7 @@ use gix_features::progress::{Count, DynNestedProgress, Progress};
use crate::{index, multi_index::File};
///
+#[allow(clippy::empty_docs)]
pub mod integrity {
use crate::multi_index::EntryIndex;
@@ -68,6 +69,7 @@ pub mod integrity {
}
///
+#[allow(clippy::empty_docs)]
pub mod checksum {
/// Returned by [`multi_index::File::verify_checksum()`][crate::multi_index::File::verify_checksum()].
pub type Error = crate::verify::checksum::Error;
@@ -284,6 +286,7 @@ impl File {
TreeTraversal(err) => TreeTraversal(err),
PackDecode { id, offset, source } => PackDecode { id, offset, source },
PackMismatch { expected, actual } => PackMismatch { expected, actual },
+ EntryType(err) => EntryType(err),
PackObjectMismatch {
expected,
actual,
diff --git a/gix-pack/src/multi_index/write.rs b/gix-pack/src/multi_index/write.rs
index 881033091bc..3625cc47c7a 100644
--- a/gix-pack/src/multi_index/write.rs
+++ b/gix-pack/src/multi_index/write.rs
@@ -1,5 +1,4 @@
use std::{
- convert::TryInto,
path::PathBuf,
sync::atomic::{AtomicBool, Ordering},
time::{Instant, SystemTime},
diff --git a/gix-pack/src/verify.rs b/gix-pack/src/verify.rs
index fff99c75d12..3fad0e2467f 100644
--- a/gix-pack/src/verify.rs
+++ b/gix-pack/src/verify.rs
@@ -3,6 +3,7 @@ use std::{path::Path, sync::atomic::AtomicBool};
use gix_features::progress::Progress;
///
+#[allow(clippy::empty_docs)]
pub mod checksum {
/// Returned by various methods to verify the checksum of a memory mapped file that might also exist on disk.
#[derive(thiserror::Error, Debug)]
diff --git a/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo.tar.xz b/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo.tar.xz
index ea3241474a0..5c209dc3d51 100644
Binary files a/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo.tar.xz and b/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo.tar.xz differ
diff --git a/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo_multi_index.tar.xz b/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo_multi_index.tar.xz
index e587341dc92..f3d16ee0d90 100644
Binary files a/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo_multi_index.tar.xz and b/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo_multi_index.tar.xz differ
diff --git a/gix-pack/tests/fixtures/make_pack_gen_repo.sh b/gix-pack/tests/fixtures/make_pack_gen_repo.sh
index 6e8c91e4bf0..1be6adc7a48 100755
--- a/gix-pack/tests/fixtures/make_pack_gen_repo.sh
+++ b/gix-pack/tests/fixtures/make_pack_gen_repo.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-pack/tests/fixtures/make_pack_gen_repo_multi_index.sh b/gix-pack/tests/fixtures/make_pack_gen_repo_multi_index.sh
index 45444a7b49e..ee6a13ec6dc 100755
--- a/gix-pack/tests/fixtures/make_pack_gen_repo_multi_index.sh
+++ b/gix-pack/tests/fixtures/make_pack_gen_repo_multi_index.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu -o pipefail
git init -q
diff --git a/gix-pack/tests/pack/data/file.rs b/gix-pack/tests/pack/data/file.rs
index 6a279fa84c0..a4967570e75 100644
--- a/gix-pack/tests/pack/data/file.rs
+++ b/gix-pack/tests/pack/data/file.rs
@@ -103,7 +103,7 @@ mod decode_entry {
}
let p = pack_at(SMALL_PACK);
- let entry = p.entry(offset);
+ let entry = p.entry(offset).expect("valid object type");
let mut buf = Vec::new();
p.decode_entry(
entry,
@@ -159,7 +159,7 @@ mod resolve_header {
}
let p = pack_at(SMALL_PACK);
- let entry = p.entry(offset);
+ let entry = p.entry(offset).expect("valid object type");
p.decode_header(entry, &mut Default::default(), &resolve_with_panic)
.expect("valid offset provides valid entry")
}
@@ -208,7 +208,7 @@ mod decompress_entry {
fn decompress_entry_at_offset(offset: u64) -> Vec {
let p = pack_at(SMALL_PACK);
- let entry = p.entry(offset);
+ let entry = p.entry(offset).expect("valid object type");
let size = entry.decompressed_size as usize;
let mut buf = vec![0; size];
diff --git a/gix-pack/tests/pack/data/header.rs b/gix-pack/tests/pack/data/header.rs
index 45132c9f8a5..8c05e24302e 100644
--- a/gix-pack/tests/pack/data/header.rs
+++ b/gix-pack/tests/pack/data/header.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
use crate::pack::fixture_path;
#[test]
diff --git a/gix-pack/tests/pack/data/output/count_and_entries.rs b/gix-pack/tests/pack/data/output/count_and_entries.rs
index a98f02d387e..edb4783224a 100644
--- a/gix-pack/tests/pack/data/output/count_and_entries.rs
+++ b/gix-pack/tests/pack/data/output/count_and_entries.rs
@@ -9,7 +9,6 @@ use gix_pack::data::{
output,
output::{count, entry},
};
-use gix_traverse::commit;
use crate::pack::{
data::output::{db, DbKind},
@@ -241,7 +240,7 @@ fn traversals() -> crate::Result {
.copied()
{
let head = hex_to_id("dfcb5e39ac6eb30179808bbab721e8a28ce1b52e");
- let mut commits = commit::Ancestors::new(Some(head), commit::ancestors::State::default(), db.clone())
+ let mut commits = gix_traverse::commit::Simple::new(Some(head), db.clone())
.map(Result::unwrap)
.map(|c| c.id)
.collect::>();
@@ -323,13 +322,18 @@ fn traversals() -> crate::Result {
#[test]
fn empty_pack_is_allowed() {
- write_and_verify(
- db(DbKind::DeterministicGeneratedContent).unwrap(),
- vec![],
- hex_to_id("029d08823bd8a8eab510ad6ac75c823cfd3ed31e"),
- None,
- )
- .unwrap();
+ assert_eq!(
+ write_and_verify(
+ db(DbKind::DeterministicGeneratedContent).unwrap(),
+ vec![],
+ hex_to_id("029d08823bd8a8eab510ad6ac75c823cfd3ed31e"),
+ None,
+ )
+ .unwrap_err()
+ .to_string(),
+ "pack data directory should be set",
+ "empty packs are not actually written as they would be useless"
+ );
}
fn write_and_verify(
@@ -393,7 +397,7 @@ fn write_and_verify(
pack::bundle::write::Options::default(),
)?
.data_path
- .expect("directory set"),
+ .ok_or("pack data directory should be set")?,
object_hash,
)?;
// TODO: figure out why these hashes change, also depending on the machine, even though they are indeed stable.
diff --git a/gix-pack/tests/pack/index.rs b/gix-pack/tests/pack/index.rs
index 1a168b28e79..bb440b76ced 100644
--- a/gix-pack/tests/pack/index.rs
+++ b/gix-pack/tests/pack/index.rs
@@ -108,7 +108,7 @@ mod version {
}
}
- #[cfg(feature = "internal-testing-gix-features-parallel")]
+ #[cfg(feature = "gix-features-parallel")]
mod any {
use std::{fs, io, sync::atomic::AtomicBool};
@@ -133,7 +133,7 @@ mod version {
index_path: &&str,
data_path: &&str,
) -> Result<(), Box> {
- let pack_iter = pack::data::input::BytesToEntriesIter::new_from_header(
+ let mut pack_iter = pack::data::input::BytesToEntriesIter::new_from_header(
io::BufReader::new(fs::File::open(fixture_path(data_path))?),
*mode,
*compressed,
@@ -148,12 +148,12 @@ mod version {
desired_kind,
|| {
let file = std::fs::File::open(fixture_path(data_path))?;
- let map = unsafe { memmap2::Mmap::map(&file)? };
+ let map = unsafe { memmap2::MmapOptions::new().map_copy_read_only(&file)? };
Ok((slice_map, map))
},
- pack_iter,
+ &mut pack_iter,
None,
- progress::Discard,
+ &mut progress::Discard,
&mut actual,
&AtomicBool::new(false),
gix_hash::Kind::Sha1,
@@ -210,7 +210,7 @@ mod version {
assert_eq!(outcome.index_version, desired_kind);
assert_eq!(
outcome.index_hash,
- gix_hash::ObjectId::from(&expected[end_of_pack_hash..end_of_index_hash])
+ gix_hash::ObjectId::try_from(&expected[end_of_pack_hash..end_of_index_hash])?
);
Ok(())
}
@@ -227,7 +227,7 @@ mod version {
#[test]
fn lookup_missing() {
let file = index::File::at(&fixture_path(INDEX_V2), gix_hash::Kind::Sha1).unwrap();
- let prefix = gix_hash::Prefix::new(gix_hash::ObjectId::null(gix_hash::Kind::Sha1), 7).unwrap();
+ let prefix = gix_hash::Prefix::new(&gix_hash::Kind::Sha1.null(), 7).unwrap();
assert!(file.lookup_prefix(prefix, None).is_none());
let mut candidates = 1..1;
@@ -363,8 +363,8 @@ fn pack_lookup() -> Result<(), Box> {
},
),
] {
- let idx = index::File::at(&fixture_path(index_path), gix_hash::Kind::Sha1)?;
- let pack = pack::data::File::at(&fixture_path(pack_path), gix_hash::Kind::Sha1)?;
+ let idx = index::File::at(fixture_path(index_path), gix_hash::Kind::Sha1)?;
+ let pack = pack::data::File::at(fixture_path(pack_path), gix_hash::Kind::Sha1)?;
assert_eq!(pack.version(), pack::data::Version::V2);
assert_eq!(pack.num_objects(), idx.num_objects());
@@ -398,7 +398,7 @@ fn pack_lookup() -> Result<(), Box> {
let sorted_offsets = idx.sorted_offsets();
assert_eq!(num_objects, sorted_offsets.len());
for idx_entry in idx.iter() {
- let pack_entry = pack.entry(idx_entry.pack_offset);
+ let pack_entry = pack.entry(idx_entry.pack_offset)?;
assert_ne!(pack_entry.data_offset, idx_entry.pack_offset);
assert!(sorted_offsets.binary_search(&idx_entry.pack_offset).is_ok());
}
@@ -410,7 +410,7 @@ fn pack_lookup() -> Result<(), Box> {
);
let mut buf = vec![0u8; entry.decompressed_size as usize];
- let pack_entry = pack.entry(offset_from_index);
+ let pack_entry = pack.entry(offset_from_index)?;
assert_eq!(
pack_entry.pack_offset(),
entry.pack_offset,
@@ -471,7 +471,7 @@ fn iter() -> Result<(), Box> {
"0f3ea84cd1bba10c2a03d736a460635082833e59",
),
] {
- let idx = index::File::at(&fixture_path(path), gix_hash::Kind::Sha1)?;
+ let idx = index::File::at(fixture_path(path), gix_hash::Kind::Sha1)?;
assert_eq!(idx.version(), *kind);
assert_eq!(idx.num_objects(), *num_objects);
assert_eq!(
diff --git a/gix-pack/tests/pack/iter.rs b/gix-pack/tests/pack/iter.rs
index e814e2c4b6e..c9dd7d445c6 100644
--- a/gix-pack/tests/pack/iter.rs
+++ b/gix-pack/tests/pack/iter.rs
@@ -37,7 +37,7 @@ mod new_from_header {
let mut buf = Vec::::new();
entry.header.write_to(entry.decompressed_size, &mut buf)?;
let new_entry =
- pack::data::Entry::from_bytes(&buf, entry.pack_offset, gix_hash::Kind::Sha1.len_in_bytes());
+ pack::data::Entry::from_bytes(&buf, entry.pack_offset, gix_hash::Kind::Sha1.len_in_bytes())?;
assert_eq!(
new_entry.header_size(),
diff --git a/gix-packetline-blocking/CHANGELOG.md b/gix-packetline-blocking/CHANGELOG.md
index 6ee679fb395..be570bf7c6f 100644
--- a/gix-packetline-blocking/CHANGELOG.md
+++ b/gix-packetline-blocking/CHANGELOG.md
@@ -5,6 +5,32 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## 0.17.4 (2024-04-13)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+
+
+ - 4 commits contributed to the release over the course of 4 calendar days.
+ - 84 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+
+
+view details
+
+ * **Uncategorized**
+ - Prepare changelogs prior to release ([`5755271`](https://github.com/Byron/gitoxide/commit/57552717f46f96c35ba4ddc0a64434354ef845e9))
+ - Merge branch 'copy-packetline' ([`a9b783d`](https://github.com/Byron/gitoxide/commit/a9b783df45948eb0adf538251315f808f38008f6))
+ - Rerun script to get `//` instead of `//!` comments ([`ec2427f`](https://github.com/Byron/gitoxide/commit/ec2427fc78df81901a5636fb1213999a3a5ed969))
+ - Replace gix-packetline-blocking/src with generated files ([`a793bde`](https://github.com/Byron/gitoxide/commit/a793bde062553288bfc045bfda75addb25a7be76))
+view details
* **Uncategorized**
+ - Release gix-utils v0.1.9, gix-features v0.38.0, gix-actor v0.30.0, gix-object v0.41.0, gix-path v0.10.4, gix-glob v0.16.0, gix-attributes v0.22.0, gix-command v0.3.3, gix-packetline-blocking v0.17.3, gix-filter v0.9.0, gix-fs v0.10.0, gix-commitgraph v0.24.0, gix-revwalk v0.12.0, gix-traverse v0.37.0, gix-worktree-stream v0.9.0, gix-archive v0.9.0, gix-config-value v0.14.4, gix-tempfile v13.0.0, gix-lock v13.0.0, gix-ref v0.41.0, gix-sec v0.10.4, gix-config v0.34.0, gix-url v0.27.0, gix-credentials v0.24.0, gix-ignore v0.11.0, gix-index v0.29.0, gix-worktree v0.30.0, gix-diff v0.40.0, gix-discover v0.29.0, gix-mailmap v0.22.0, gix-negotiate v0.12.0, gix-pack v0.47.0, gix-odb v0.57.0, gix-pathspec v0.6.0, gix-packetline v0.17.3, gix-transport v0.41.0, gix-protocol v0.44.0, gix-revision v0.26.0, gix-refspec v0.22.0, gix-status v0.5.0, gix-submodule v0.8.0, gix-worktree-state v0.7.0, gix v0.58.0, safety bump 39 crates ([`eb6aa8f`](https://github.com/Byron/gitoxide/commit/eb6aa8f502314f886fc4ea3d52ab220763968208))
- Prepare changelogs prior to release ([`6a2e0be`](https://github.com/Byron/gitoxide/commit/6a2e0bebfdf012dc2ed0ff2604086081f2a0f96d))
- Release gix-trace v0.1.7, gix-features v0.37.2, gix-commitgraph v0.23.2, gix-traverse v0.36.2, gix-index v0.28.2 ([`b6c04c8`](https://github.com/Byron/gitoxide/commit/b6c04c87b426bf36a059df8dc52b56d384b27b79))