adapt to changes in `git-protocol`

Sebastian Thiel committed 4 years ago

Commit 121c93f1 parent 68dc86f2 files · +9 −2Browse files

Unified · Split

2 files

@@ -1,5 +1,9 @@
1	1	use std::str::FromStr;
2	2
	3	+pub fn agent() -> &'static str {
	4	+ concat!("oxide-", env!("CARGO_PKG_VERSION"))
	5	+}
	6	+
3	7	#[derive(Eq, PartialEq, Debug)]
4	8	pub enum Protocol {
5	9	V1,

@@ -1,3 +1,4 @@
	1	+use std::borrow::Cow;
1	2	use std::{
2	3	io,
3	4	path::PathBuf,
@@ -51,7 +52,7 @@ impl<W> protocol::fetch::DelegateBlocking for CloneDelegate<W> { · 47 unmodified lines
51	52	&mut self,
52	53	server: &Capabilities,
53	54	arguments: &mut Vec<BString>,
54		− _features: &mut Vec<(&str, Option<&str>)>,
	55	+ _features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
55	56	) -> io::Result<LsRefsAction> {
56	57	if server.contains("ls-refs") {
57	58	arguments.extend(FILTER.iter().map(\|r\| format!("ref-prefix {}", r).into()));
@@ -67,7 +68,7 @@ impl<W> protocol::fetch::DelegateBlocking for CloneDelegate<W> { · 9 unmodified lines
67	68	&mut self,
68	69	version: transport::Protocol,
69	70	server: &Capabilities,
70		− _features: &mut Vec<(&str, Option<&str>)>,
	71	+ _features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
71	72	_refs: &[Ref],
72	73	) -> io::Result<Action> {
73	74	if !self.wanted_refs.is_empty() && !remote_supports_ref_in_want(server) {
@@ -172,6 +173,7 @@ mod blocking_io { · 98 unmodified lines
172	173	protocol::credentials::builtin,
173	174	progress,
174	175	protocol::FetchConnection::TerminateOnSuccessfulCompletion,
	176	+ crate::net::agent(),
175	177	)?;
176	178	Ok(())
177	179	}
@@ -245,6 +247,7 @@ mod async_io { · 67 unmodified lines
245	247	protocol::credentials::builtin,
246	248	progress,
247	249	protocol::FetchConnection::TerminateOnSuccessfulCompletion,
	250	+ crate::net::agent(),
248	251	))
249	252	})
250	253	.await?;