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

fetch file content by bookmark

Browse Source 
Summary: The content-fetch subcommand will try to lookup a changeset by bookmark first and then falls back to a hash.

Reviewed By: StanislavGlebik

Differential Revision: D9110531

fbshipit-source-id: 3bd0e452739fc1c8b41dc559864f73e3a1f3f782
This commit is contained in:
Lucas Waye 2018-08-02 07:50:30 -07:00 committed by Facebook Github Bot
parent 6a33e51971
commit 2b21e28790
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmds/admin/main.rs
View File

@ -17,6 +17,7 @@ extern crate tokio_process;
extern crate blobrepo;
extern crate blobstore;
extern crate bookmarks;
extern crate cmdlib;
#[macro_use]
extern crate futures_ext;
@ -42,6 +43,7 @@ use futures::stream::iter_ok;
use blobrepo::BlobRepo;
use blobstore::{new_memcache_blobstore, Blobstore, CacheBlobstoreExt, PrefixBlobstore};
use bookmarks::Bookmark;
use cmdlib::args;
use futures_ext::{BoxFuture, FutureExt};
use manifoldblob::ManifoldBlob;
@ -135,10 +137,22 @@ fn fetch_content(
rev: &str,
path: &str,
) -> BoxFuture<Content, Error> {
let cs_id = try_boxfuture!(HgChangesetId::from_str(rev));
let path = try_boxfuture!(MPath::new(path));
let book = Bookmark::new(&rev).unwrap();
let hash = HgChangesetId::from_str(rev);
let mf = repo.get_changeset_by_changesetid(&cs_id)
let resolved_cs_id = repo.get_bookmark(&book).and_then({
move |r| match r {
Some(cs) => Ok(cs),
None => hash,
}
});
let mf = resolved_cs_id
.and_then({
cloned!(repo);
move |cs_id| repo.get_changeset_by_changesetid(&cs_id)
})
.map(|cs| cs.manifestid().clone())
.and_then({
cloned!(repo);