refactor!: store fetch refspecs in Options

Author: djc

gitoxide-core/src/pack/receive.rs

@@ -84,12 +84,11 @@ where
     let user_agent = ("agent", Some(agent.clone().into()));
     let refmap = gix::protocol::fetch::RefMap::new(
         &mut progress,
-        &fetch_refspecs,
         &mut handshake,
         &mut transport.inner,
         user_agent.clone(),
         trace_packetlines,
-        gix::protocol::fetch::refmap::init::Options::default(),
+        gix::protocol::fetch::refmap::init::Options::fetch(fetch_refspecs.clone()),
     )
     .await?;
 

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

@@ -32,6 +32,9 @@ pub enum Error {
 /// For use in [`RefMap::new()`].
 #[derive(Debug, Clone)]
 pub struct Options {
+    /// All explicit refspecs to identify references on the remote that you are interested in.
+    /// Note that these are copied to [`RefMap::refspecs`] for convenience, as `RefMap::mappings` refer to them by index.
+    pub fetch_refspecs: Vec<gix_refspec::RefSpec>,
     /// Use a two-component prefix derived from the ref-spec's source, like `refs/heads/`  to let the server pre-filter refs
     /// with great potential for savings in traffic and local CPU time. Defaults to `true`.
     pub prefix_from_spec_as_filter_on_remote: bool,
@@ -41,9 +44,11 @@ pub struct Options {
     pub extra_refspecs: Vec<gix_refspec::RefSpec>,
 }
 
-impl Default for Options {
-    fn default() -> Self {
+impl Options {
+    /// Create options to fetch the given `fetch_refspecs`.
+    pub fn fetch(fetch_refspecs: Vec<gix_refspec::RefSpec>) -> Self {
         Options {
+            fetch_refspecs,
             prefix_from_spec_as_filter_on_remote: true,
             extra_refspecs: Vec::new(),
         }
@@ -58,18 +63,16 @@ impl RefMap {
     /// and [options](Options) are used to further configure the call.
     ///
     /// * `progress` is used if `ls-refs` is invoked on the remote. Always the case when V2 is used.
-    /// * `fetch_refspecs` are all explicit refspecs to identify references on the remote that you are interested in.
-    ///    Note that these are copied to [`RefMap::refspecs`] for convenience, as `RefMap::mappings` refer to them by index.
     #[allow(clippy::result_large_err)]
     #[maybe_async::maybe_async]
     pub async fn new<T>(
         mut progress: impl Progress,
-        fetch_refspecs: &[gix_refspec::RefSpec],
         handshake: &mut Outcome,
         transport: &mut T,
         user_agent: (&'static str, Option<Cow<'static, str>>),
         trace_packetlines: bool,
         Options {
+            fetch_refspecs,
             prefix_from_spec_as_filter_on_remote,
             extra_refspecs,
         }: Options,
@@ -126,7 +129,7 @@ impl RefMap {
     fn from_refs(
         remote_refs: Vec<Ref>,
         capabilities: &Capabilities,
-        fetch_refspecs: &[RefSpec],
+        fetch_refspecs: Vec<RefSpec>,
         all_refspecs: Vec<RefSpec>,
         extra_refspecs: Vec<RefSpec>,
     ) -> Result<Self, Error> {
@@ -182,7 +185,7 @@ impl RefMap {
 
         Ok(Self {
             mappings,
-            refspecs: fetch_refspecs.to_vec(),
+            refspecs: fetch_refspecs,
             extra_refspecs,
             fixes,
             remote_refs,

gix/src/remote/connection/ref_map.rs

@@ -152,12 +152,12 @@ where
         .await?;
         let refmap = gix_protocol::fetch::RefMap::new(
             progress,
-            &self.remote.fetch_specs,
             &mut handshake,
             &mut self.transport.inner,
             self.remote.repo.config.user_agent_tuple(),
             self.trace,
             gix_protocol::fetch::refmap::init::Options {
+                fetch_refspecs: self.remote.fetch_specs.clone(),
                 prefix_from_spec_as_filter_on_remote,
                 extra_refspecs,
             },