feat!: use git-credentials in git-protocol (#386)

Makefile

@@ -90,6 +90,7 @@ check: ## Build all code in suitable configurations
                   && cargo check --features verbose-object-parsing-errors
 	cd git-index && cargo check --features serde1
 	cd git-credentials && cargo check --features serde1
+	cd git-sec && cargo check --features serde1
 	cd git-revision && cargo check --features serde1
 	cd git-attributes && cargo check --features serde1
 	cd git-glob && cargo check --features serde1

git-protocol/Cargo.toml

@@ -42,6 +42,7 @@ required-features = ["async-client"]
 git-features = { version = "^0.20.0", path = "../git-features", features = ["progress"] }
 git-transport = { version = "^0.16.0", path = "../git-transport" }
 git-hash = { version = "^0.9.3", path = "../git-hash" }
+git-credentials = { version = "^0.1.0", path = "../git-credentials" }
 
 quick-error = "2.0.0"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}

git-protocol/src/fetch/error.rs

@@ -18,7 +18,7 @@ quick_error! {
             from()
             source(err)
         }
-        Credentials(err: credentials::Error) {
+        Credentials(err: credentials::helper::Error) {
             display("Failed to obtain, approve or reject credentials")
             from()
             source(err)

git-protocol/src/fetch_fn.rs

@@ -58,7 +58,7 @@ pub async fn fetch<F, D, T>(
     fetch_mode: FetchConnection,
 ) -> Result<(), Error>
 where
-    F: FnMut(credentials::Action<'_>) -> credentials::Result,
+    F: FnMut(credentials::helper::Action<'_>) -> credentials::helper::Result,
     D: Delegate,
     T: client::Transport,
 {
@@ -85,8 +85,8 @@ where
                 drop(result); // needed to workaround this: https://github.com/rust-lang/rust/issues/76149
                 let url = transport.to_url();
                 progress.set_name("authentication");
-                let credentials::Outcome { identity, next } =
-                    authenticate(credentials::Action::Fill(&url))?.expect("FILL provides an identity");
+                let credentials::helper::Outcome { identity, next } =
+                    authenticate(credentials::helper::Action::Fill(&url))?.expect("FILL provides an identity");
                 transport.set_identity(identity)?;
                 progress.step();
                 progress.set_name("handshake (authenticated)");

git-protocol/src/lib.rs

@@ -10,11 +10,10 @@
 #![deny(unsafe_code)]
 #![deny(rust_2018_idioms, missing_docs)]
 
+pub use git_credentials as credentials;
 /// A convenience export allowing users of git-protocol to use the transport layer without their own cargo dependency.
 pub use git_transport as transport;
 
-///
-pub mod credentials;
 ///
 #[cfg(any(feature = "blocking-client", feature = "async-client"))]
 pub mod fetch;

git-protocol/tests/async-protocol.rs

@@ -5,6 +5,5 @@ pub fn fixture_bytes(path: &str) -> Vec<u8> {
         .expect("fixture to be present and readable")
 }
 
-mod credentials;
 mod fetch;
 mod remote_progress;

git-protocol/tests/blocking-protocol.rs

@@ -5,6 +5,5 @@ pub fn fixture_bytes(path: &str) -> Vec<u8> {
         .expect("fixture to be present and readable")
 }
 
-mod credentials;
 mod fetch;
 mod remote_progress;