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

mononoke: put the name of the source in the move and merge commits

Browse Source 
Summary: This makes it easier to understand what each move and merge commits are for.

Reviewed By: mitrandir77

Differential Revision: D28839677

fbshipit-source-id: 1a42205c164224b64c773cff80b690b251a48381
This commit is contained in:
Stanislau Hlebik 2021-06-03 05:23:37 -07:00 committed by Facebook GitHub Bot
parent 7156f5cd9f
commit 530f8279b8
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
eden/mononoke/megarepo_api/src/add_sync_target.rs
View File

@ -176,7 +176,14 @@ impl<'a> AddSyncTarget<'a> {
let linkfiles = self.upload_linkfiles(ctx, linkfiles, repo).await?;
// TODO(stash): it assumes that commit is present in target
let moved = self
.create_single_move_commit(ctx, repo, changeset_id, &mover, linkfiles)
.create_single_move_commit(
ctx,
repo,
changeset_id,
&mover,
linkfiles,
&source_name,
)
.await?;
Result::<_, Error>::Ok((source_name, moved))
@ -325,13 +332,14 @@ impl<'a> AddSyncTarget<'a> {
let mut merges = vec![];
let mut cur_parents = vec![];
for (_, css) in first_moved_commits {
for (source_name, css) in first_moved_commits {
cur_parents.push(css.moved.get_changeset_id());
if cur_parents.len() > 1 {
let bcs = self.create_merge_commit(
message.clone(),
cur_parents,
sync_target_config.version.clone(),
&source_name,
)?;
let merge = bcs.freeze()?;
cur_parents = vec![merge.get_changeset_id()];
@ -339,9 +347,14 @@ impl<'a> AddSyncTarget<'a> {
}
}
cur_parents.push(last_moved_commit.1.moved.get_changeset_id());
let mut final_merge =
self.create_merge_commit(message, cur_parents, sync_target_config.version.clone())?;
let (last_source_name, last_moved_commit) = last_moved_commit;
cur_parents.push(last_moved_commit.moved.get_changeset_id());
let mut final_merge = self.create_merge_commit(
message,
cur_parents,
sync_target_config.version.clone(),
&last_source_name,
)?;
state.save_in_changeset(ctx, repo, &mut final_merge).await?;
let final_merge = final_merge.freeze()?;
merges.push(final_merge.clone());
@ -355,6 +368,7 @@ impl<'a> AddSyncTarget<'a> {
message: Option<String>,
parents: Vec<ChangesetId>,
version: SyncConfigVersion,
source_name: &SourceName,
) -> Result<BonsaiChangesetMut, Error> {
// TODO(stash, mateusz, simonfar): figure out what fields
// we need to set here
@ -364,7 +378,10 @@ impl<'a> AddSyncTarget<'a> {
author_date: DateTime::now(),
committer: None,
committer_date: None,
message: message.unwrap_or(format!("Add new sync target with version {}", version)),
message: message.unwrap_or(format!(
"Merging source {} for target version {}",
source_name.0, version
)),
extra: SortedVectorMap::new(),
file_changes: SortedVectorMap::new(),
};
@ -379,6 +396,7 @@ impl<'a> AddSyncTarget<'a> {
cs_id: ChangesetId,
mover: &MultiMover,
linkfiles: BTreeMap<MPath, Option<FileChange>>,
source_name: &SourceName,
) -> Result<SourceAndMovedChangesets, MegarepoError> {
let root_fsnode_id = RootFsnodeId::derive(ctx, repo, cs_id)
.await
@ -419,7 +437,7 @@ impl<'a> AddSyncTarget<'a> {
author_date: DateTime::now(),
committer: None,
committer_date: None,
message: "move commit".to_string(),
message: format!("move commit for source {}", source_name.0),
extra: SortedVectorMap::new(),
file_changes: file_changes.into_iter().collect(),
}