adapt to changes in git-refspec (#450)

Author: Byron

git-repository/src/remote/connection/ref_map.rs

@@ -19,7 +19,7 @@ pub enum Error {
     MappingValidation(#[from] git_refspec::match_group::validate::Error),
 }
 
-impl<'a, 'repo, T, P> Connection<'a, 'repo, T, P>
+impl<'remote, 'repo, T, P> Connection<'remote, 'repo, T, P>
 where
     T: Transport,
     P: Progress,
@@ -32,14 +32,14 @@ where
     ///
     /// Note that this doesn't fetch the objects mentioned in the tips nor does it make any change to underlying repository.
     #[git_protocol::maybe_async::maybe_async]
-    pub async fn ref_map(mut self) -> Result<fetch::RefMap, Error> {
+    pub async fn ref_map(mut self) -> Result<fetch::RefMap<'remote>, Error> {
         let res = self.ref_map_inner().await;
         git_protocol::fetch::indicate_end_of_interaction(&mut self.transport).await?;
         res
     }
 
     #[git_protocol::maybe_async::maybe_async]
-    async fn ref_map_inner(&mut self) -> Result<fetch::RefMap, Error> {
+    async fn ref_map_inner(&mut self) -> Result<fetch::RefMap<'remote>, Error> {
         let remote = self.fetch_refs().await?;
         let group = git_refspec::MatchGroup::from_fetch_specs(self.remote.fetch_specs.iter().map(|s| s.to_ref()));
         let (res, fixes) = group

git-repository/src/remote/mod.rs

@@ -32,11 +32,11 @@ pub mod fetch {
 
     /// Information about the relationship between our refspecs, and remote references with their local counterparts.
     #[derive(Debug, Clone)]
-    pub struct RefMap {
+    pub struct RefMap<'spec> {
         /// A mapping between a remote reference and a local tracking branch.
         pub mappings: Vec<Mapping>,
         /// Information about the fixes applied to the `mapping` due to validation and sanitization.
-        pub fixes: Vec<git_refspec::match_group::validate::Fix>,
+        pub fixes: Vec<git_refspec::match_group::validate::Fix<'spec>>,
         /// All refs advertised by the remote.
         pub remote_refs: Vec<git_protocol::fetch::Ref>,
         /// Additional information provided by the server as part of the handshake.

gitoxide-core/src/repository/remote.rs

@@ -3,6 +3,7 @@ mod refs_impl {
     use anyhow::bail;
     use git_repository as git;
     use git_repository::protocol::fetch;
+    use git_repository::refspec::RefSpec;
 
     use crate::OutputFormat;
 
@@ -65,7 +66,9 @@ mod refs_impl {
             .await?;
 
         match kind {
-            refs::Kind::Tracking { .. } => print_refmap(&repo, remote, map, out, err),
+            refs::Kind::Tracking { .. } => {
+                print_refmap(&repo, remote.refspecs(git::remote::Direction::Fetch), map, out, err)
+            }
             refs::Kind::Remote => {
                 match format {
                     OutputFormat::Human => drop(print(out, &map.remote_refs)),
@@ -82,8 +85,8 @@ mod refs_impl {
 
     fn print_refmap(
         repo: &git::Repository,
-        remote: git::Remote<'_>,
-        mut map: git::remote::fetch::RefMap,
+        refspecs: &[RefSpec],
+        mut map: git::remote::fetch::RefMap<'_>,
         mut out: impl std::io::Write,
         mut err: impl std::io::Write,
     ) -> anyhow::Result<()> {
@@ -92,7 +95,7 @@ mod refs_impl {
         for mapping in &map.mappings {
             if mapping.spec_index != last_spec_index {
                 last_spec_index = mapping.spec_index;
-                let spec = &remote.refspecs(git::remote::Direction::Fetch)[mapping.spec_index];
+                let spec = &refspecs[mapping.spec_index];
                 spec.to_ref().write_to(&mut out)?;
                 writeln!(out)?;
             }