Skip to content

Commit 6461c3d

Browse files
committed
Merge branch 'rename-crates'
Conflicts: git-repository/Cargo.toml
2 parents 6f16a27 + 7bed2a9 commit 6461c3d

File tree

334 files changed

+5391
-5459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

334 files changed

+5391
-5459
lines changed

Diff for: CHANGELOG.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,12 @@ This release also fixes compatibility issues that formerly prevented to fetch or
130130
- upgrade to prodash v22 for API improvements ([`77ab98d`](https://github.com/Byron/gitoxide/commit/77ab98dd41c3849b674d8b3794ef29219ca1447d))
131131
- auto-enabled verbosity for `gix fetch/clone` and add `--no-verbose`. ([`9814369`](https://github.com/Byron/gitoxide/commit/98143699bb9481b010e21647f64dcb8a74bd80ad))
132132
- switch from `atty` to `is-terminal` ([`7304bc1`](https://github.com/Byron/gitoxide/commit/7304bc1c0efaad64a39520962072343ef02f6c25))
133-
- adapt to changes in `git-repository` ([`c4f68bf`](https://github.com/Byron/gitoxide/commit/c4f68bf775b854625d901fe0bfcbdd38f656d408))
133+
- adapt to changes in `gix` ([`c4f68bf`](https://github.com/Byron/gitoxide/commit/c4f68bf775b854625d901fe0bfcbdd38f656d408))
134134
- represent object cache configuration like `GITOXIDE_PACK_CACHE_MEMORY` in git-configuration. ([`becbd8d`](https://github.com/Byron/gitoxide/commit/becbd8d896a1663f1607be4e86e632773e926f1f))
135135
- represent `GIT_(COMMITTER|AUTHOR)_(NAME|EMAIL|DATE)` with git configuration. ([`a4ac9cf`](https://github.com/Byron/gitoxide/commit/a4ac9cf3e667a3059e33aac8188150529578622d))
136136
- `open::ReplacementObjects` is removed in favor of two custom git-configuration flags. ([`49f39d6`](https://github.com/Byron/gitoxide/commit/49f39d6bb487c0254176a5082f2c7851b83952a1))
137137
- apply related environment variables as config overrides ([`9441c26`](https://github.com/Byron/gitoxide/commit/9441c261bcae61d1d1e674b5e783f38b0471be29))
138-
- adapt to changes in `git-repository` ([`f1a4c8b`](https://github.com/Byron/gitoxide/commit/f1a4c8b42ed8c94e7fe3a61eb222cf6b0886f4ee))
138+
- adapt to changes in `gix` ([`f1a4c8b`](https://github.com/Byron/gitoxide/commit/f1a4c8b42ed8c94e7fe3a61eb222cf6b0886f4ee))
139139
- update progress of http.proxyAuthMethod ([`872dc1a`](https://github.com/Byron/gitoxide/commit/872dc1ab43ce626b4166dae3dc8bddf8e85c9409))
140140
- add `--strict` option to enforce strict checking of configuration. ([`aeb4a1d`](https://github.com/Byron/gitoxide/commit/aeb4a1d5cb76316058c7d687e26f5c7db351c09c))
141141
- don't lock stdout/stderr as it will deadlock on dbg-printing ([`62cae0e`](https://github.com/Byron/gitoxide/commit/62cae0e6bfe8113c0225152a896338017c8de474))
@@ -150,7 +150,7 @@ This release also fixes compatibility issues that formerly prevented to fetch or
150150
- <csr-id-3ddbd2de369b521fa3f21935f10fe9c248840893/> Make `reqwest` TLS backend configuration easy.
151151
We provide the choice of `native-tls` or `rust-tls`. If none is
152152
provided, the user can configure on their on similar to how it's done
153-
in `git-repository`.
153+
in `gix`.
154154

155155
Please note that a choice now has to be made or HTTPS will not be
156156
available, so use one of…
@@ -786,11 +786,11 @@ to the `clap-derive` crate.
786786

787787
## v0.9.0 (2021-10-15)
788788

789-
A first usable version of `git-repository` to make using `gitoxide` from your applications so much easier. It serves as a one-stop shop for application developers without sacrificing performance by default while making common use-cases more convenient.
789+
A first usable version of `gix` to make using `gitoxide` from your applications so much easier. It serves as a one-stop shop for application developers without sacrificing performance by default while making common use-cases more convenient.
790790

791791
### Feature list
792792

793-
* `git-repository` as hub crate for application development with focus on usability without sacrificing any knob to tune performance.
793+
* `gix` as hub crate for application development with focus on usability without sacrificing any knob to tune performance.
794794
* opt-in `async` for `git-packetline`, `git-transport` and `git-protocol` for fully async git clients, along with the `light-async` feature toggle to build a `gix pack-receive` with an async client instead of a blocking one.
795795
* Statistics for `gix pack-create` with the `-s/--statistics` flag to have data indicating the cost of the operation. Currently it's doing a lot of work that has to be avoided in order to be useable in production and the numbers underline that. Future iterations will cause key metrics to go down.
796796
* Packs are now reproducible by default, which means that the same tip will always generate a pack with the same hash. This may be a desirable property for some kinds of packs, but not for others which is why it can be turned off for a considerable speed boost.

Diff for: Cargo.lock

+59-63
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+8-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ repository = "https://github.com/Byron/gitoxide"
55
authors = ["Sebastian Thiel <[email protected]>"]
66
edition = "2021"
77
license = "MIT OR Apache-2.0"
8-
version = "0.21.0"
8+
version = "0.22.0"
99
default-run = "gix"
1010
include = ["src/**/*", "LICENSE-*", "README.md", "CHANGELOG.md"]
1111
resolver = "2"
@@ -28,7 +28,7 @@ default = ["max"]
2828
## Makes the crate execute as fast as possible by supporting parallel computation of otherwise long-running functions
2929
## as well as fast, hardware accelerated hashing, along with a faster zlib backend.
3030
## If disabled, the binary will be visibly smaller.
31-
fast = ["git-repository/max-performance"]
31+
fast = ["gix/max-performance"]
3232

3333
## Use `clap` 3.0 to build the prettiest, best documented and most user-friendly CLI at the expense of binary size.
3434
## Provides a terminal user interface for detailed and exhaustive progress.
@@ -43,7 +43,7 @@ prodash-render-line-crossterm = ["prodash-render-line", "prodash/render-line-cro
4343
#! These combine common choices of the above features to represent typical builds
4444

4545
## *fast* + *prodash-render-tui-crossterm* + *prodash-render-line-crossterm* + *http* + *gitoxide-core-tools* + *client-networking*
46-
max = ["fast", "pretty-cli", "http-client-curl", "gitoxide-core-tools", "gitoxide-core-blocking-client", "prodash-render-line", "prodash-render-tui", "prodash/render-line-autoconfigure", "git-repository/regex" ]
46+
max = ["fast", "pretty-cli", "http-client-curl", "gitoxide-core-tools", "gitoxide-core-blocking-client", "prodash-render-line", "prodash-render-tui", "prodash/render-line-autoconfigure", "gix/regex" ]
4747

4848
## *fast* + *prodash-render-line-crossterm* + *gitoxide-core-tools* + *client-networking*.
4949
lean = ["fast", "pretty-cli", "http-client-curl", "gitoxide-core-tools", "gitoxide-core-blocking-client", "prodash-render-line" ]
@@ -57,7 +57,7 @@ lean-async = ["fast", "pretty-cli", "gitoxide-core-tools", "gitoxide-core-async-
5757
small = ["pretty-cli", "git-features/rustsha1", "git-features/zlib-rust-backend", "prodash-render-line", "is-terminal" ]
5858

5959
## Makes the crate execute as fast as possible without pulling in C libraries, while keeping everything else minimal akin to the `small` build.
60-
max-pure = ["pretty-cli", "git-features/rustsha1", "git-features/zlib-rust-backend", "prodash-render-line", "prodash-render-tui", "git-repository/max-performance-safe", "http-client-reqwest", "gitoxide-core-blocking-client", "gitoxide-core-tools", "prodash/render-line-autoconfigure" ]
60+
max-pure = ["pretty-cli", "git-features/rustsha1", "git-features/zlib-rust-backend", "prodash-render-line", "prodash-render-tui", "gix/max-performance-safe", "http-client-reqwest", "gitoxide-core-blocking-client", "gitoxide-core-tools", "prodash/render-line-autoconfigure" ]
6161

6262
#! ### `gitoxide-core` Configuration
6363

@@ -70,9 +70,9 @@ gitoxide-core-tools = ["gitoxide-core/organize", "gitoxide-core/estimate-hours"]
7070
## Use blocking client networking.
7171
gitoxide-core-blocking-client = ["gitoxide-core/blocking-client"]
7272
## Support synchronous 'http' and 'https' transports (e.g. for clone, fetch and push) using **curl**.
73-
http-client-curl = ["git-repository/blocking-http-transport-curl"]
73+
http-client-curl = ["gix/blocking-http-transport-curl"]
7474
## Support synchronous 'http' and 'https' transports (e.g. for clone, fetch and push) using **reqwest**.
75-
http-client-reqwest = ["git-repository/blocking-http-transport-reqwest-rust-tls"]
75+
http-client-reqwest = ["gix/blocking-http-transport-reqwest-rust-tls"]
7676
## Use async client networking.
7777
gitoxide-core-async-client = ["gitoxide-core/async-client", "futures-lite"]
7878

@@ -84,9 +84,9 @@ cache-efficiency-debug = ["git-features/cache-efficiency-debug"]
8484
[dependencies]
8585
anyhow = "1.0.42"
8686

87-
gitoxide-core = { version = "^0.23.0", path = "gitoxide-core" }
87+
gitoxide-core = { version = "^0.24.0", path = "gitoxide-core" }
8888
git-features = { version = "^0.26.2", path = "git-features" }
89-
git-repository = { version = "^0.34.0", path = "git-repository", default-features = false }
89+
gix = { version = "^0.35.0", path = "gix", default-features = false }
9090

9191
clap = { version = "4.1.1", features = ["derive", "cargo"] }
9292
prodash = { version = "23.0", optional = true, default-features = false }
@@ -172,7 +172,6 @@ members = [
172172
"git-pathspec",
173173
"git-refspec",
174174
"git-path",
175-
"git-repository",
176175
"gix",
177176
"gitoxide-core",
178177
"git-hashtable",

Diff for: DEVELOPMENT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ A bunch of notes collected to keep track of what's needed to eventually support
192192

193193
In _plumbing_ crates, prefer to default to keeping references if this is feasible to avoid typically expensive clones.
194194

195-
In _porcelain_ crates, like `git-repository`, we have `Platforms` which are typically cheap enough to create on demand as they configure one or more method calls. These
195+
In _porcelain_ crates, like `gix`, we have `Platforms` which are typically cheap enough to create on demand as they configure one or more method calls. These
196196
should keep a reference to the `Repository` instance that created them as the user is expected to clone the `Repository` if there is the need.
197197
However, if these structures are more expensive, call them `Cache` or `<NotPlatform>` and prefer to clone the `Repository` into them or otherwise keep them free of lifetimes
198198
to allow the user to keep this structure around for repeated calls. References for this paragraph are [this PR](https://github.com/Canop/bacon/pull/98) and

Diff for: Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ clippy: ## Run cargo clippy on all crates
5555
cargo clippy --all --no-default-features --features lean-async --tests
5656

5757
check-msrv: ## run cargo msrv to validate the current msrv requirements, similar to what CI does
58-
cd git-repository && cargo check --package git-repository --no-default-features --features async-network-client,max-performance
58+
cd gix && cargo check --package gix --no-default-features --features async-network-client,max-performance
5959

6060
check: ## Build all code in suitable configurations
6161
cargo check --all
@@ -124,7 +124,7 @@ check: ## Build all code in suitable configurations
124124
&& cargo check --features blocking-client \
125125
&& cargo check --features async-client
126126
cd git-protocol && if cargo check --all-features 2>/dev/null; then false; else true; fi
127-
cd git-repository && cargo check --no-default-features --features async-network-client \
127+
cd gix && cargo check --no-default-features --features async-network-client \
128128
&& cargo check --no-default-features --features async-network-client-async-std \
129129
&& cargo check --no-default-features --features blocking-network-client \
130130
&& cargo check --no-default-features --features blocking-http-transport-curl \
@@ -157,7 +157,7 @@ unit-tests: ## run all unit tests
157157
cd git-protocol && cargo test --features blocking-client \
158158
&& cargo test --features async-client \
159159
&& cargo test
160-
cd git-repository && cargo test \
160+
cd gix && cargo test \
161161
&& cargo test --features async-network-client \
162162
&& cargo test --features blocking-network-client \
163163
&& cargo test --features regex
@@ -288,12 +288,12 @@ bench-git-config:
288288

289289
check-msrv-on-ci: ## Check the minimal support rust version for currently installed Rust version
290290
rustc --version
291-
cargo check --package git-repository
292-
cargo check --package git-repository --no-default-features --features async-network-client,max-performance
291+
cargo check --package gix
292+
cargo check --package gix --no-default-features --features async-network-client,max-performance
293293

294294
##@ Maintenance
295295

296-
baseline_asset_dir = git-repository/src/assets/baseline-init
296+
baseline_asset_dir = gix/src/assets/baseline-init
297297
baseline_asset_fixture = tests/fixtures/baseline-init
298298

299299
$(baseline_asset_fixture):

Diff for: README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
performance while providing a pleasant and unsurprising developer experience.
77

88
`gitoxide` provides the `gix` and `ein` binaries for use on the command-line to allow experimentation with key features
9-
like `fetch` and `clone`, and to validate the usability and control of the API offered by the [`git-repository`] crate.
9+
like `fetch` and `clone`, and to validate the usability and control of the API offered by the [`gix`] crate.
1010

1111
`gitoxide` aspires to be a production-grade server implementation and the `ein` binary aspires to become the default way to interact with git repositories.
1212

1313
[![asciicast](https://asciinema.org/a/542159.svg)](https://asciinema.org/a/542159)
1414

15-
[`git-repository`]: https://docs.rs/git-repository
15+
[`gix`]: https://docs.rs/gix
1616

1717
## Development Status
1818

1919
The command-line tools as well as the status of each crate is described in
2020
[the crate status document](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-mailmap).
2121

22-
For use in applications, look for the [`git-repository`](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-repository) crate,
22+
For use in applications, look for the [`gix`](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix) crate,
2323
which serves as entrypoint to the functionality provided by various lower-level plumbing crates like
2424
[`git-config`](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-config).
2525

@@ -74,7 +74,7 @@ is usable to some extent.
7474
* [git-quote](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-quote)
7575
* [git-discover](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-discover)
7676
* [git-path](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-path)
77-
* [git-repository](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-repository)
77+
* [gix](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix)
7878
* [git-attributes](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-attributes)
7979
* [git-pathspec](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-pathspec)
8080
* [git-index](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-index)

0 commit comments

Comments
 (0)