refactor!: move prefix argument handling into LsRefsCommand::new()

Author: djc

gix-protocol/src/fetch/refmap/init.rs

@@ -77,12 +77,10 @@ impl RefMap {
     {
         let _span = gix_trace::coarse!("gix_protocol::fetch::RefMap::new()");
         let all_refspecs = context.aggregate_refspecs();
-        let mut refs_cmd = crate::LsRefsCommand::new(capabilities, user_agent);
-        if prefix_from_spec_as_filter_on_remote {
-            refs_cmd.push_prefix_arguments(&all_refspecs);
-        }
-
-        let remote_refs = refs_cmd.invoke(transport, &mut progress, trace_packetlines).await?;
+        let prefix_refspecs = prefix_from_spec_as_filter_on_remote.then_some(&all_refspecs[..]);
+        let remote_refs = crate::LsRefsCommand::new(prefix_refspecs, capabilities, user_agent)
+            .invoke(transport, &mut progress, trace_packetlines)
+            .await?;
         Self::from_refs(remote_refs, capabilities, context)
     }
 

gix-protocol/src/ls_refs.rs

@@ -58,7 +58,11 @@ pub(crate) mod function {
     impl<'a> LsRefsCommand<'a> {
         /// Build a command to list refs from the given server `capabilities`,
         /// using `agent` information to identify ourselves.
-        pub fn new(capabilities: &'a Capabilities, agent: (&'static str, Option<Cow<'static, str>>)) -> Self {
+        pub fn new(
+            prefix_refspecs: Option<&[gix_refspec::RefSpec]>,
+            capabilities: &'a Capabilities,
+            agent: (&'static str, Option<Cow<'static, str>>),
+        ) -> Self {
             let _span =
                 gix_features::trace::detail!("gix_protocol::LsRefsCommand::new()", capabilities = ?capabilities);
             let ls_refs = Command::LsRefs;
@@ -73,6 +77,21 @@ pub(crate) mod function {
                 arguments.push("unborn".into());
             }
 
+            if let Some(refspecs) = prefix_refspecs {
+                let mut seen = HashSet::new();
+                for spec in refspecs {
+                    let spec = spec.to_ref();
+                    if seen.insert(spec.instruction()) {
+                        let mut prefixes = Vec::with_capacity(1);
+                        spec.expand_prefixes(&mut prefixes);
+                        for mut prefix in prefixes {
+                            prefix.insert_str(0, "ref-prefix ");
+                            arguments.push(prefix);
+                        }
+                    }
+                }
+            }
+
             Self {
                 capabilities,
                 features,
@@ -114,20 +133,5 @@ pub(crate) mod function {
                 .await?;
             Ok(from_v2_refs(&mut remote_refs).await?)
         }
-
-        pub(crate) fn push_prefix_arguments(&mut self, all_refspecs: &[gix_refspec::RefSpec]) {
-            let mut seen = HashSet::new();
-            for spec in all_refspecs {
-                let spec = spec.to_ref();
-                if seen.insert(spec.instruction()) {
-                    let mut prefixes = Vec::with_capacity(1);
-                    spec.expand_prefixes(&mut prefixes);
-                    for mut prefix in prefixes {
-                        prefix.insert_str(0, "ref-prefix ");
-                        self.arguments.push(prefix);
-                    }
-                }
-            }
-        }
     }
 }

gix-protocol/tests/protocol/fetch/_impl.rs

@@ -106,7 +106,7 @@ mod fetch_fn {
             None => match delegate.action() {
                 Ok(RefsAction::Skip) => Vec::new(),
                 Ok(RefsAction::Continue) => {
-                    LsRefsCommand::new(&capabilities, ("agent", Some(Cow::Owned(agent.clone()))))
+                    LsRefsCommand::new(None, &capabilities, ("agent", Some(Cow::Owned(agent.clone()))))
                         .invoke(&mut transport, &mut progress, trace)
                         .await?
                 }