mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

node: Make sure we have all refs in staging copy 

Previous to this change, we just created a clone, which was missing
all the refs.
This commit is contained in:
Alexis Sellier 2023-04-12 11:43:43 +02:00
parent 097b5b4ca4
commit c8e548fb1d
No known key found for this signature in database
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
radicle-node/src/worker/fetch.rs
View File

@ -13,7 +13,7 @@ use radicle::storage::git::Repository;
use radicle::storage::refs::{SignedRefs, IDENTITY_BRANCH}; use radicle::storage::refs::{SignedRefs, IDENTITY_BRANCH};
use radicle::storage::{Namespaces, RefUpdate, Remote, RemoteId}; use radicle::storage::{Namespaces, RefUpdate, Remote, RemoteId};
use radicle::storage::{ReadRepository, ReadStorage, WriteRepository, WriteStorage}; use radicle::storage::{ReadRepository, ReadStorage, WriteRepository, WriteStorage};
use radicle::{git, storage, Storage}; use radicle::{git, Storage};
/// The initial phase of staging a fetch from a remote. /// The initial phase of staging a fetch from a remote.
/// ///
@ -169,12 +169,27 @@ impl<'a> StagingPhaseInitial<'a> {
Ok(true) => { Ok(true) => {
let url = url::File::new(production.path_of(&rid)).to_string(); let url = url::File::new(production.path_of(&rid)).to_string();
log::debug!(target: "worker", "Setting up fetch for existing repository: {}", url); log::debug!(target: "worker", "Setting up fetch for existing repository: {}", url);
let to = storage::git::paths::repository(&staging, &rid);
let to = staging.path_of(&rid);
let copy = git::raw::build::RepoBuilder::new() let copy = git::raw::build::RepoBuilder::new()
.bare(true) .bare(true)
.clone_local(git::raw::build::CloneLocal::Local) .clone_local(git::raw::build::CloneLocal::Local)
.clone(&url, &to)?; .clone(&url, &to)?;
{
// The clone doesn't actually clone all refs, it only creates a ref for the
// default branch; so we explicitly fetch the rest of the refs, so they
// don't need to be re-fetched from the remote.
let mut remote = copy.remote_anonymous(&url)?;
let refspecs: Vec<_> = Namespaces::All
.into_refspecs()
.into_iter()
.map(|s| s.to_string())
.collect();
remote.fetch(&refspecs, None, None)?;
}
log::debug!(target: "worker", "Local clone successful for {rid}");
Ok(StagedRepository::Fetching(Repository { Ok(StagedRepository::Fetching(Repository {
id: rid, id: rid,
backend: copy, backend: copy,
@ -183,6 +198,7 @@ impl<'a> StagingPhaseInitial<'a> {
Ok(false) => { Ok(false) => {
log::debug!(target: "worker", "Setting up clone for new repository {}", rid); log::debug!(target: "worker", "Setting up clone for new repository {}", rid);
let repo = staging.create(rid)?; let repo = staging.create(rid)?;
Ok(StagedRepository::Cloning(repo)) Ok(StagedRepository::Cloning(repo))
} }
Err(e) => Err(e.into()), Err(e) => Err(e.into()),