facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity

factor out code to put manifest and file blobs

Browse Source 
Summary:
copy_changeset was getting a bit too long, and linknode stuff would
have made it even longer.

Reviewed By: StanislavGlebik

Differential Revision: D6097840

fbshipit-source-id: 00800cf9516adf69f2ca19244d3e14268f148ae4
This commit is contained in:
Siddharth Agarwal 2017-10-19 09:23:51 -07:00 committed by Facebook Github Bot
parent 92eb9c6e6a
commit 3269b802a4
1 changed files with 54 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
cmds/blobimport/convert.rs
View File

@ -16,6 +16,7 @@ use blobrepo::BlobChangeset;
use futures_ext::{FutureExt, StreamExt};
use heads::Heads;
use mercurial::{RevlogManifest, RevlogRepo};
use mercurial::revlog::RevIdx;
use mercurial_types::{Changeset, Manifest, NodeHash};
use stats::Timeseries;
@ -126,48 +127,7 @@ where
let mfid = *cs.manifestid();
let linkrev = entry.linkrev;
// fetch the blob for the (root) manifest
revlog_repo
.get_manifest_blob_by_nodeid(&mfid)
.from_err()
.and_then(move |blob| {
let putmf = manifest::put_entry(
sender.clone(),
mfid,
blob.as_blob().clone(),
blob.parents().clone(),
);
// Get the listing of entries and fetch each of those
let files = RevlogManifest::new(revlog_repo.clone(), blob)
.map_err(|err| {
Error::with_chain(Error::from(err), "Parsing manifest to get list")
})
.map(|mf| mf.list().map_err(Error::from))
.map(|entry_stream| {
entry_stream
.map({
let revlog_repo = revlog_repo.clone();
move |entry| {
manifest::get_entry_stream(
entry,
revlog_repo.clone(),
linkrev.clone(),
)
}
})
.flatten()
.for_each(move |entry| manifest::copy_entry(entry, sender.clone()))
})
.into_future()
.flatten();
_assert_sized(&files);
// Huh? No idea why this is needed to avoid an error below.
let files = files.boxify();
putmf.join(files)
})
put_blobs(revlog_repo, sender, mfid, linkrev)
})
.map_err(move |err| {
Error::with_chain(err, format!("Can't copy manifest for cs {}", csid))
@ -179,4 +139,56 @@ where
put.join(manifest).map(|_| ())
}
/// Copy manifest and filelog entries into the blob store.
///
/// See the help for copy_changeset for a full description.
fn put_blobs(
revlog_repo: RevlogRepo,
sender: SyncSender<BlobstoreEntry>,
mfid: NodeHash,
linkrev: RevIdx,
) -> impl Future<Item = (), Error = Error> + Send + 'static {
revlog_repo
.get_manifest_blob_by_nodeid(&mfid)
.from_err()
.and_then(move |blob| {
let putmf = manifest::put_entry(
sender.clone(),
mfid,
blob.as_blob().clone(),
blob.parents().clone(),
);
// Get the listing of entries and fetch each of those
let files = RevlogManifest::new(revlog_repo.clone(), blob)
.map_err(|err| {
Error::with_chain(Error::from(err), "Parsing manifest to get list")
})
.map(|mf| mf.list().map_err(Error::from))
.map(|entry_stream| {
entry_stream
.map({
let revlog_repo = revlog_repo.clone();
move |entry| {
manifest::get_entry_stream(
entry,
revlog_repo.clone(),
linkrev.clone(),
)
}
})
.flatten()
.for_each(move |entry| manifest::copy_entry(entry, sender.clone()))
})
.into_future()
.flatten();
_assert_sized(&files);
// Huh? No idea why this is needed to avoid an error below.
let files = files.boxify();
putmf.join(files).map(|_| ())
})
}
fn _assert_sized<T: Sized>(_: &T) {}