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

edenapi_server: hg_id conversion utilities

Browse Source 
Summary: Conversions between `HgChangsetId` and `HgId`.

Reviewed By: kulshrax

Differential Revision: D26289619

fbshipit-source-id: 3d973f48783c6d9baf213eeff65304a5f098934b
This commit is contained in:
Stefan Filip 2021-02-09 11:27:51 -08:00 committed by Facebook GitHub Bot
parent 8266b7015f
commit 0cf36b82b4
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eden/mononoke/edenapi_service/src/handlers/commit.rs
View File

@ -16,7 +16,7 @@ use edenapi_types::{
CommitRevlogDataRequest,
};
use gotham_ext::{error::HttpError, response::TryIntoResponse};
use mercurial_types::{HgChangesetId, HgNodeHash};
use mercurial_types::HgChangesetId;
use mononoke_api_hg::HgRepoContext;
use types::HgId;
@ -89,18 +89,16 @@ async fn translate_location(
hg_repo_ctx: HgRepoContext,
location: CommitLocation,
) -> Result<CommitLocationToHash, Error> {
let known_descendant = HgChangesetId::new(HgNodeHash::from(location.known_descendant));
let ancestors: Vec<HgChangesetId> = hg_repo_ctx
.location_to_hg_changeset_id(
known_descendant,
location.known_descendant.into(),
location.distance_to_descendant,
location.count,
)
.await
.with_context(|| ErrorKind::CommitLocationToHashRequestFailed)?;
let converted = ancestors.iter().map(|a| a.into_nodehash().into()).collect();
let answer = CommitLocationToHash::new(location, converted);
let hgids = ancestors.into_iter().map(|x| x.into()).collect();
let answer = CommitLocationToHash::new(location, hgids);
Ok(answer)
}
@ -109,11 +107,10 @@ async fn commit_revlog_data(
hg_repo_ctx: HgRepoContext,
hg_id: HgId,
) -> Result<CommitRevlogData, Error> {
let hg_cs_id = HgChangesetId::new(HgNodeHash::from(hg_id));
let bytes = hg_repo_ctx
.revlog_commit_data(hg_cs_id)
.revlog_commit_data(hg_id.into())
.await
.with_context(|| ErrorKind::CommitRevlogDataRequestFailed)?
.context(ErrorKind::CommitRevlogDataRequestFailed)?
.ok_or_else(|| ErrorKind::HgIdNotFound(hg_id))?;
let answer = CommitRevlogData::new(hg_id, bytes);
Ok(answer)

12
eden/mononoke/mercurial/types/src/nodehash.rs
View File

@ -325,6 +325,18 @@ impl Arbitrary for HgChangesetId {
}
}
impl From<HgId> for HgChangesetId {
fn from(hgid: HgId) -> Self {
HgChangesetId::new(HgNodeHash::from(hgid))
}
}
impl From<HgChangesetId> for HgId {
fn from(hg_cs_id: HgChangesetId) -> HgId {
hg_cs_id.into_nodehash().into()
}
}
/// An identifier for a changeset hash prefix in Nercurial.
#[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Debug, Hash)]
#[derive(Abomonation)]