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

update repo configuration

Browse Source 
Summary: Update repo configuration with latest format from configerator.

Reviewed By: yancouto

Differential Revision: D40600540

fbshipit-source-id: be725db2f96793f5a76d9caf5b4896c7c4fbfcae
This commit is contained in:
Mark Juggurnauth-Thomas 2022-10-25 05:47:41 -07:00 committed by Facebook GitHub Bot
parent c13709fda8
commit 50d5431ac2
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configerator/structs/scm/mononoke/repos/repos.thrift
View File

@ -1,4 +1,4 @@
// @generated SignedSource<<c0bb5ff6cebc1cec59e4fbdc82f92cb8>>
// @generated SignedSource<<42c584de36ad80df10f6f80a5754d573>>
// DO NOT EDIT THIS FILE MANUALLY!
// This file is a mechanical copy of the version in the configerator repo. To
// modify it, edit the copy in the configerator repo instead and copy it over by
@ -445,7 +445,7 @@ struct RawStorageConfig {
struct RawPushParams {
1: optional bool pure_push_allowed;
// (NOTE: will be replaced by update_logging_config.public_commit_logging_destination)
// (NOTE: will be replaced by update_logging_config.new_commit_logging_destination)
2: optional string commit_scribe_category;
} (rust.exhaustive)
@ -466,7 +466,7 @@ union RawPushrebaseRemoteMode {
struct RawPushrebaseParams {
1: optional bool rewritedates;
2: optional i64 recursion_limit;
// (NOTE: will be replaced by update_logging_config.public_commit_logging_destination)
// (NOTE: will be replaced by update_logging_config.new_commit_logging_destination)
3: optional string commit_scribe_category;
4: optional bool block_merges;
5: optional bool forbid_p2_root_rebases;
@ -657,7 +657,7 @@ struct RawInfinitepushParams {
2: optional string namespace_pattern;
3: optional bool hydrate_getbundle_response;
// 4: deleted
// (NOTE: will be replaced by update_logging_config.draft_commit_logging_destination)
// (NOTE: will be replaced by update_logging_config.new_commit_logging_destination)
5: optional string commit_scribe_category;
// 6: deleted
// 7: deleted
@ -893,8 +893,6 @@ union RawLoggingDestination {
struct RawUpdateLoggingConfig {
// Destination to log bookmark updates to
4: optional RawLoggingDestination bookmark_logging_destination;
// Destiantion to log new public commits to
5: optional RawLoggingDestination public_commit_logging_destination;
// Destination to log new draft commits to
6: optional RawLoggingDestination draft_commit_logging_destination;
// Destination to log new commits to
7: optional RawLoggingDestination new_commit_logging_destination;
} (rust.exhaustive)

5
eden/mononoke/metaconfig/parser/src/config.rs
View File

@ -897,7 +897,7 @@ mod test {
darkstorm_backup_repo_id = 1001
[update_logging_config]
public_commit_logging_destination = { scribe = { scribe_category = "cat" } }
new_commit_logging_destination = { scribe = { scribe_category = "cat" } }
"#;
let fbsource_repo_def = r#"
repo_id=0
@ -1264,10 +1264,9 @@ mod test {
}),
update_logging_config: UpdateLoggingConfig {
bookmark_logging_destination: None,
public_commit_logging_destination: Some(LoggingDestination::Scribe {
new_commit_logging_destination: Some(LoggingDestination::Scribe {
scribe_category: "cat".to_string(),
}),
draft_commit_logging_destination: None,
},
},
);

3
eden/mononoke/metaconfig/parser/src/convert/repo.rs
View File

@ -683,8 +683,7 @@ impl Convert for RawUpdateLoggingConfig {
fn convert(self) -> Result<Self::Output> {
Ok(UpdateLoggingConfig {
bookmark_logging_destination: self.bookmark_logging_destination.convert()?,
public_commit_logging_destination: self.public_commit_logging_destination.convert()?,
draft_commit_logging_destination: self.draft_commit_logging_destination.convert()?,
new_commit_logging_destination: self.new_commit_logging_destination.convert()?,
})
}
}

6
eden/mononoke/metaconfig/types/src/lib.rs
View File

@ -1718,8 +1718,6 @@ pub enum LoggingDestination {
pub struct UpdateLoggingConfig {
/// Destination where bookmark updates are logged to
pub bookmark_logging_destination: Option<LoggingDestination>,
/// Destination where new public commits are logged to
pub public_commit_logging_destination: Option<LoggingDestination>,
/// Destination where new draft commits are logged to
pub draft_commit_logging_destination: Option<LoggingDestination>,
/// Destination where new commits are logged to
pub new_commit_logging_destination: Option<LoggingDestination>,
}