adapt to changes in `git-protocol`

Sebastian Thiel committed 3 years ago

Commit bd708471 parent 09070a74 files · +11 −18Browse files

Unified · Split

4 files

git-repository/src/config/cache/access.rs +1 −1
git-repository/src/remote/connection/fetch/mod.rs +2 −2
git-repository/src/remote/connection/fetch/receive_pack.rs +4 −10
git-repository/src/remote/connection/ref_map.rs +4 −5

git-repository/src/config/cache/access.rs+1−1

@@ -55,7 +55,7 @@ impl Cache { · 54 unmodified lines
55	.unwrap_or_else(\|\| crate::env::agent().into())	55	.unwrap_or_else(\|\| crate::env::agent().into())
56	})	56	})
57	.to_owned();	57	.to_owned();
58	("agent", Some(git_protocol::fetch::agent(agent).into()))	58	("agent", Some(git_protocol::agent(agent).into()))
59	}	59	}
60		60
61	pub(crate) fn personas(&self) -> &identity::Personas {	61	pub(crate) fn personas(&self) -> &identity::Personas {

git-repository/src/remote/connection/fetch/mod.rs+2−2

@@ -187,14 +187,14 @@ where · 186 unmodified lines
187	// Right now we block the executor by forcing this communication, but that only	187	// Right now we block the executor by forcing this communication, but that only
188	// happens if the user didn't actually try to receive a pack, which consumes the	188	// happens if the user didn't actually try to receive a pack, which consumes the
189	// connection in an async context.	189	// connection in an async context.
190	git_protocol::futures_lite::future::block_on(git_protocol::fetch::indicate_end_of_interaction(	190	git_protocol::futures_lite::future::block_on(git_protocol::indicate_end_of_interaction(
191	&mut con.transport,	191	&mut con.transport,
192	))	192	))
193	.ok();	193	.ok();
194	}	194	}
195	#[cfg(not(feature = "async-network-client"))]	195	#[cfg(not(feature = "async-network-client"))]
196	{	196	{
197	git_protocol::fetch::indicate_end_of_interaction(&mut con.transport).ok();	197	git_protocol::indicate_end_of_interaction(&mut con.transport).ok();
198	}	198	}
199	}	199	}
200	}	200	}

git-repository/src/remote/connection/fetch/receive_pack.rs+4−10

         let handshake = &self.ref_map.handshake;
         let protocol_version = handshake.server_protocol_version;
-        let fetch = git_protocol::fetch::Command::Fetch;
+        let fetch = git_protocol::Command::Fetch;
         let progress = &mut con.progress;
         let repo = con.remote.repo;
         let fetch_features = {
                 previous_response.as_ref(),
             ) {
                 Ok(_) if arguments.is_empty() => {
-                    git_protocol::fetch::indicate_end_of_interaction(&mut con.transport)
+                    git_protocol::indicate_end_of_interaction(&mut con.transport).await.ok();
-                        .await
-                        .ok();
                     return Ok(Outcome {
                         ref_map: std::mem::take(&mut self.ref_map),
                         status: Status::NoChange,
                 }
                 Ok(is_done) => is_done,
                 Err(err) => {
-                    git_protocol::fetch::indicate_end_of_interaction(&mut con.transport)
+                    git_protocol::indicate_end_of_interaction(&mut con.transport).await.ok();
-                        .await
-                        .ok();
                     return Err(err.into());
                 }
             };
         };
         if matches!(protocol_version, git_protocol::transport::Protocol::V2) {
-            git_protocol::fetch::indicate_end_of_interaction(&mut con.transport)
+            git_protocol::indicate_end_of_interaction(&mut con.transport).await.ok();
-                .await
-                .ok();
         }
         let update_refs = refs::update(

git-repository/src/remote/connection/ref_map.rs+4−5

     #[error("The object format {format:?} as used by the remote is unsupported")]
     UnknownObjectFormat { format: BString },
     #[error(transparent)]
-    ListRefs(#[from] git_protocol::fetch::refs::Error),
+    ListRefs(#[from] git_protocol::ls_refs::Error),
     #[error(transparent)]
     Transport(#[from] git_protocol::transport::client::Error),
     #[error(transparent)]
     #[git_protocol::maybe_async::maybe_async]
     pub async fn ref_map(mut self, options: Options) -> Result<fetch::RefMap, Error> {
         let res = self.ref_map_inner(options).await;
-        git_protocol::fetch::indicate_end_of_interaction(&mut self.transport)
+        git_protocol::indicate_end_of_interaction(&mut self.transport)
             .await
             .ok();
         res
             None => {
                 let specs = &self.remote.fetch_specs;
                 let agent_feature = self.remote.repo.config.user_agent_tuple();
-                git_protocol::fetch::refs(
+                git_protocol::ls_refs(
                     &mut self.transport,
-                    outcome.server_protocol_version,
                     &outcome.capabilities,
                     move |_capabilities, arguments, features| {
                         features.push(agent_feature);
                                 }
                             }
                         }
-                        Ok(git_protocol::fetch::delegate::LsRefsAction::Continue)
+                        Ok(git_protocol::ls_refs::Action::Continue)
                     },
                     &mut self.progress,
                 )