recursive cache git submodules

  - creates GitSource for each submodules
  - replaces fetch inside update_submodule by GitSource::update_db and db.copy_to
  - removes recursive update_submodules calls cos db.copy_to already recursive.
  - adjust git testsuite

Author: avnyu

src/cargo/sources/git/utils.rs

@@ -1,10 +1,12 @@
 //! Utilities for handling git repositories, mainly around
 //! authentication/cloning.
 
-use crate::core::{GitReference, Verbosity};
+use crate::core::{GitReference, SourceId, Verbosity};
 use crate::sources::git::fetch::RemoteKind;
 use crate::sources::git::oxide;
 use crate::sources::git::oxide::cargo_config_to_gitoxide_overrides;
+use crate::sources::git::source::GitSource;
+use crate::sources::source::Source as _;
 use crate::util::HumanBytes;
 use crate::util::errors::{CargoResult, GitCliError};
 use crate::util::{GlobalContext, IntoUrl, MetricsCounter, Progress, network};
@@ -447,7 +449,7 @@ impl<'a> GitCheckout<'a> {
                 let target = repo.head()?.target();
                 Ok((target, repo))
             });
-            let mut repo = match head_and_repo {
+            let repo = match head_and_repo {
                 Ok((head, repo)) => {
                     if child.head_id() == head {
                         return update_submodules(&repo, gctx, &child_remote_url);
@@ -461,24 +463,23 @@ impl<'a> GitCheckout<'a> {
                 }
             };
             // Fetch data from origin and reset to the head commit
-            let reference = GitReference::Rev(head.to_string());
             gctx.shell()
                 .status("Updating", format!("git submodule `{child_remote_url}`"))?;
-            fetch(
-                &mut repo,
-                &child_remote_url,
-                &reference,
+            let mut source = GitSource::new(
+                SourceId::from_url(&format!("git+{child_remote_url}#{head}"))?,
                 gctx,
-                RemoteKind::GitDependency,
             )
             .with_context(|| {
                 let name = child.name().unwrap_or("");
                 format!("failed to fetch submodule `{name}` from {child_remote_url}",)
             })?;
+            source.set_quiet(true);
+
+            let (db, actual_rev) = source.update_db()?;
+            db.copy_to(actual_rev, &repo.path(), gctx)?;
 
             let obj = repo.find_object(head, None)?;
-            reset(&repo, &obj, gctx)?;
-            update_submodules(&repo, gctx, &child_remote_url)
+            reset(&repo, &obj, gctx)
         }
     }
 }

tests/testsuite/git.rs

@@ -1060,7 +1060,7 @@ Caused by:
   failed to update submodule `src`
 
 Caused by:
-  object not found - no match for id ([..]); class=Odb (9); code=NotFound (-3)
+  revspec '[..]' not found; class=Reference (4); code=NotFound (-3)
 
 "#]];