Merge branch 'max-pure'

Author: Byron

Diff for: Cargo.lock

@@ -57,7 +57,7 @@ lean-async = ["fast", "pretty-cli", "gitoxide-core-tools", "gitoxide-core-async-
 small = ["pretty-cli", "git-features/rustsha1", "git-features/zlib-rust-backend", "prodash-render-line", "atty"  ]
 
 ## Makes the crate execute as fast as possible without pulling in C libraries, while keeping everything else minimal akin to the `small` build.
-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-curl", "gitoxide-core-blocking-client", "gitoxide-core-tools", "prodash/render-line-autoconfigure" ]
+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" ]
 
 #! ### `gitoxide-core` Configuration
 
@@ -69,8 +69,10 @@ gitoxide-core-tools = ["gitoxide-core/organize", "gitoxide-core/estimate-hours"]
 
 ## Use blocking client networking.
 gitoxide-core-blocking-client = ["gitoxide-core/blocking-client"]
-## Support synchronous 'http' and 'https' transports (e.g. for clone, fetch and push) at the expense of compile times and binary size.
-http-client-curl = ["git-repository/blocking-http-transport"]
+## Support synchronous 'http' and 'https' transports (e.g. for clone, fetch and push) using **curl**.
+http-client-curl = ["git-repository/blocking-http-transport-curl"]
+## Support synchronous 'http' and 'https' transports (e.g. for clone, fetch and push) using **reqwest**.
+http-client-reqwest = ["git-repository/blocking-http-transport-reqwest", "reqwest-for-configuration-only", "reqwest-for-configuration-only/rustls-tls", "reqwest-for-configuration-only/trust-dns"]
 ## Use async client networking.
 gitoxide-core-async-client = ["gitoxide-core/async-client", "futures-lite"]
 
@@ -85,6 +87,7 @@ anyhow = "1.0.42"
 gitoxide-core = { version = "^0.20.0", path = "gitoxide-core" }
 git-features = { version = "^0.23.1", path = "git-features" }
 git-repository = { version = "^0.28.0", path = "git-repository", default-features = false }
+reqwest-for-configuration-only = { package = "reqwest", version = "0.11.13", default-features = false, optional = true }
 
 clap = { version = "3.2.5", features = ["derive", "cargo"] }
 prodash = { version = "21", optional = true, default-features = false }

Diff for: Cargo.toml

@@ -127,7 +127,8 @@ check: ## Build all code in suitable configurations
 	cd git-repository && cargo check --no-default-features --features async-network-client \
 					  && cargo check --no-default-features --features async-network-client-async-std \
 					  && cargo check --no-default-features --features blocking-network-client \
-					  && cargo check --no-default-features --features blocking-network-client,blocking-http-transport \
+					  && cargo check --no-default-features --features blocking-http-transport-curl \
+					  && cargo check --no-default-features --features blocking-http-transport-reqwest \
 					  && cargo check --no-default-features --features max-performance \
 					  && cargo check --no-default-features --features max-performance-safe \
 					  && cargo check --no-default-features
@@ -178,7 +179,7 @@ journey-tests: always  ## run journey tests (max)
 	./tests/journey.sh target/debug/ein target/debug/gix $(jtt) max
 
 journey-tests-pure: always  ## run journey tests (max-pure)
-	cargo build
+	cargo build --no-default-features --features max-pure
 	cargo build --package git-testtools --bin jtt
 	./tests/journey.sh target/debug/ein target/debug/gix $(jtt) max-pure
 

Diff for: Makefile

@@ -41,6 +41,7 @@ allow = [
     "MIT",
     "ISC",
     "Unicode-DFS-2016",
+    "LicenseRef-ring"
 ]
 # Lint level for licenses considered copyleft
 copyleft = "allow"
@@ -61,3 +62,12 @@ confidence-threshold = 0.8
 [bans]
 # Lint level for when multiple versions of the same crate are detected
 multiple-versions = "allow"
+
+
+[[licenses.clarify]]
+name = "ring"
+expression = "LicenseRef-ring"
+license-files = [
+    { path = "LICENSE", hash = 0xbd0eed23 },
+]
+

Diff for: deny.toml

@@ -36,8 +36,10 @@ async-network-client = ["git-protocol/async-client"]
 async-network-client-async-std = ["async-std", "async-network-client", "git-transport/async-std"]
 ## Make `git-protocol` available along with a blocking client.
 blocking-network-client = ["git-protocol/blocking-client"]
-## Stacks with `blocking-network-client` to provide support for HTTP/S, and implies blocking networking as a whole.
-blocking-http-transport = ["git-transport/http-client-curl"]
+## Stacks with `blocking-network-client` to provide support for HTTP/S using **curl**, and implies blocking networking as a whole.
+blocking-http-transport-curl = ["blocking-network-client", "git-transport/http-client-curl"]
+## Stacks with `blocking-network-client` to provide support for HTTP/S using **reqwest**, and implies blocking networking as a whole.
+blocking-http-transport-reqwest = ["blocking-network-client", "git-transport/http-client-reqwest"]
 
 
 #! ### Other

Diff for: git-repository/Cargo.toml

@@ -16,11 +16,17 @@ impl crate::Repository {
 
         match &url.scheme {
             Http | Https => {
-                #[cfg(not(feature = "blocking-http-transport"))]
+                #[cfg(not(any(
+                    feature = "blocking-http-transport-reqwest",
+                    feature = "blocking-http-transport-curl"
+                )))]
                 {
                     Ok(None)
                 }
-                #[cfg(feature = "blocking-http-transport")]
+                #[cfg(any(
+                    feature = "blocking-http-transport-reqwest",
+                    feature = "blocking-http-transport-curl"
+                ))]
                 {
                     use crate::bstr::ByteVec;
                     use crate::config::cache::util::{ApplyLeniency, ApplyLeniencyDefault};

Diff for: git-repository/src/repository/config/transport.rs

@@ -1,4 +1,7 @@
-#[cfg(feature = "blocking-http-transport")]
+#[cfg(any(
+    feature = "blocking-http-transport-reqwest",
+    feature = "blocking-http-transport-curl"
+))]
 mod http {
     use git_repository as git;
 

Diff for: git-repository/tests/repository/config/transport_options.rs

@@ -75,7 +75,7 @@ base64 = { version = "0.13.0", optional = true }
 curl = { version = "0.4", optional = true, features = ["static-curl", "static-ssl", "zlib-ng-compat"] }
 
 # for http-client-reqwest
-reqwest = { version = "0.11.12", optional = true, features = ["blocking"] }
+reqwest = { version = "0.11.12", optional = true, default-features = false, features = ["blocking"] }
 
 ## If used in conjunction with `async-client`, the `connect()` method will become available along with supporting the git protocol over TCP,
 ## where the TCP stream is created using this crate.

Diff for: git-transport/Cargo.toml

@@ -10,18 +10,18 @@ pub struct Remote {
     config: crate::client::http::Options,
 }
 
+/// A function to configure a single request prior to sending it, support most complex configuration beyond what's possible with
+/// basic `git` http configuration.
+pub type ConfigureRequestFn = dyn FnMut(&mut reqwest::blocking::Request) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>>
+    + Send
+    + Sync
+    + 'static;
+
 /// Options to configure the reqwest HTTP handler.
 #[derive(Default)]
 pub struct Options {
     /// A function to configure the request that is about to be made.
-    pub configure_request: Option<
-        Box<
-            dyn FnMut(&mut reqwest::blocking::Request) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>>
-                + Send
-                + Sync
-                + 'static,
-        >,
-    >,
+    pub configure_request: Option<Box<ConfigureRequestFn>>,
 }
 
 mod remote;

Diff for: git-transport/src/client/blocking_io/http/reqwest/mod.rs

@@ -38,7 +38,7 @@ title "git-tempfile crate"
 
   (when "running the example program to check order of signal handlers"
     it "fails as the process aborts" && {
-      expect_run $ABORTED cargo run --example interrupt-handler-allows-graceful-shutdown
+      expect_run $ABORTED cargo run --no-default-features --example interrupt-handler-allows-graceful-shutdown
     }
     it "cleans up the tempfile it created" && {
       expect_run $WITH_FAILURE test -e "example-file.tmp"

Diff for: tests/journey/gix.sh

@@ -36,8 +36,6 @@
 │   └── 48234cfc7b4f0c9475d24d4c386783533a8034
 ├── 88
 │   └── 58983d81b0eef76eb55d21a0d96b7b16846eca
-├── a2
-│   └── 9ebd0e0fcbcd2a0842dd44cc7c22a90a310a3a
 ├── af
 │   └── 4f6405296dec699321ca59d48583ffa0323b0e
 ├── b2
@@ -53,4 +51,4 @@
 └── e8
     └── 00b9c207e17f9b11e321cc1fba5dfe08af4222
 
-26 directories, 27 files
+25 directories, 26 files