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

Move lfs_import to block_execute

Browse Source 
Summary: This is more prep for new futures work

Reviewed By: krallin

Differential Revision: D19473968

fbshipit-source-id: c509d22eff8758587d05d8d8b1bb96178d29c3c5
This commit is contained in:
Simon Farnsworth 2020-01-21 16:10:07 -08:00 committed by Facebook Github Bot
parent fde27f5cb2
commit 2d4fef54c0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mononoke/cmds/lfs_import.rs
View File

@ -9,11 +9,12 @@
use anyhow::{Error, Result};
use bytes::Bytes;
use clap::Arg;
use cmdlib::args;
use cmdlib::{args, helpers::block_execute};
use context::CoreContext;
use fbinit::FacebookInit;
use futures::{stream, Future, IntoFuture, Stream};
use futures_ext::FutureExt;
use futures_preview::compat::Future01CompatExt;
use lfs_import_lib::lfs_upload;
use mercurial_types::blobs::File;
@ -95,8 +96,5 @@ fn main(fb: FacebookInit) -> Result<()> {
.for_each(|_| Ok(()))
});
let mut runtime = args::init_runtime(&matches)?;
let result = runtime.block_on(import);
runtime.shutdown_on_idle();
result
block_execute(import.compat(), fb, NAME, &logger, &matches)
}

6
mononoke/tests/integration/test-lfs-import.t
View File

@ -42,7 +42,8 @@
lfs: d6c9160e8ac378413dd55fba213970bbf55afdddaf85999dc3cf8d941f08fb38 128
* lfs_upload: importing blob Sha256(d6c9160e8ac378413dd55fba213970bbf55afdddaf85999dc3cf8d941f08fb38) (glob)
lfs: d6c9160e8ac378413dd55fba213970bbf55afdddaf85999dc3cf8d941f08fb38 128
Error: Invalid Sha256: InvalidHash { expected: Sha256(d6c9160e8ac378413dd55fba213970bbf55afdddaf85999dc3cf8d941f08fb38), effective: Sha256(14217d6d598954662767fb151ff41cc10261f233d60d92aba9fdaa8534c2db33) }
E* Execution error: Invalid Sha256: InvalidHash { expected: Sha256(d6c9160e8ac378413dd55fba213970bbf55afdddaf85999dc3cf8d941f08fb38), effective: Sha256(14217d6d598954662767fb151ff41cc10261f233d60d92aba9fdaa8534c2db33) } (glob)
Error: Execution failed
[1]
$ cat > bad_size << EOF
@ -66,7 +67,8 @@
lfs: d6c9160e8ac378413dd55fba213970bbf55afdddaf85999dc3cf8d941f08fb38 128
* lfs_upload: importing blob Sha256(d6c9160e8ac378413dd55fba213970bbf55afdddaf85999dc3cf8d941f08fb38) (glob)
lfs: d6c9160e8ac378413dd55fba213970bbf55afdddaf85999dc3cf8d941f08fb38 128
Error: Invalid Sha256: InvalidHash { expected: Sha256(d6c9160e8ac378413dd55fba213970bbf55afdddaf85999dc3cf8d941f08fb38), effective: Sha256(14217d6d598954662767fb151ff41cc10261f233d60d92aba9fdaa8534c2db33) }
E* Execution error: Invalid Sha256: InvalidHash { expected: Sha256(d6c9160e8ac378413dd55fba213970bbf55afdddaf85999dc3cf8d941f08fb38), effective: Sha256(14217d6d598954662767fb151ff41cc10261f233d60d92aba9fdaa8534c2db33) } (glob)
Error: Execution failed
[1]
$ cat > ok << EOF