From d844814697d1a4d056fdf21c6bb665b214485010 Mon Sep 17 00:00:00 2001 From: Stanislau Hlebik Date: Tue, 12 Jan 2021 03:56:00 -0800 Subject: [PATCH] mononoke: sort params lexicographically in megarepo tool Summary: This is a bit nicer to read Reviewed By: ahornby Differential Revision: D25881919 fbshipit-source-id: 3c97390a96410a18e8fdc6cb6279b2d46e407cd3 --- .../commit_rewriting/megarepo/tool/cli.rs | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/eden/mononoke/commit_rewriting/megarepo/tool/cli.rs b/eden/mononoke/commit_rewriting/megarepo/tool/cli.rs index 9c89aed3e1..b112f27c98 100644 --- a/eden/mononoke/commit_rewriting/megarepo/tool/cli.rs +++ b/eden/mononoke/commit_rewriting/megarepo/tool/cli.rs @@ -14,52 +14,52 @@ use futures_old::future::{err, ok}; use megarepolib::common::{ChangesetArgs, ChangesetArgsFactory, StackPosition}; use mononoke_types::DateTime; +pub const BACKFILL_NOOP_MAPPING: &str = "backfill-noop-mapping"; pub const BASE_COMMIT_HASH: &str = "base-commit-hash"; -pub const COMMIT_HASH: &str = "commit-hash"; -pub const GRADUAL_MERGE: &str = "gradual-merge"; -pub const GRADUAL_MERGE_PROGRESS: &str = "gradual-merge-progress"; -pub const MOVE: &str = "move"; -pub const MERGE: &str = "merge"; -pub const MARK_PUBLIC: &str = "mark-public"; -pub const ORIGIN_REPO: &str = "origin-repo"; +pub const BONSAI_MERGE_P1: &str = "bonsai-merge-p1"; +pub const BONSAI_MERGE_P2: &str = "bonsai-merge-p2"; +pub const BONSAI_MERGE: &str = "bonsai-merge"; +pub const CATCHUP_DELETE_HEAD: &str = "create-catchup-head-deletion-commits"; +pub const CATCHUP_VALIDATE_COMMAND: &str = "catchup-validate"; pub const CHANGESET: &str = "commit"; -pub const FIRST_PARENT: &str = "first-parent"; -pub const SECOND_PARENT: &str = "second-parent"; -pub const COMMIT_MESSAGE: &str = "commit-message"; +pub const CHECK_PUSH_REDIRECTION_PREREQS: &str = "check-push-redirection-prereqs"; +pub const CHUNKING_HINT_FILE: &str = "chunking-hint-file"; pub const COMMIT_AUTHOR: &str = "commit-author"; -pub const COMMIT_DATE_RFC3339: &str = "commit-date-rfc3339"; pub const COMMIT_BOOKMARK: &str = "bookmark"; +pub const COMMIT_DATE_RFC3339: &str = "commit-date-rfc3339"; +pub const COMMIT_HASH: &str = "commit-hash"; +pub const COMMIT_MESSAGE: &str = "commit-message"; +pub const DELETION_CHUNK_SIZE: &str = "deletion-chunk-size"; pub const DRY_RUN: &str = "dry-run"; +pub const EVEN_CHUNK_SIZE: &str = "even-chunk-size"; +pub const FIRST_PARENT: &str = "first-parent"; +pub const GRADUAL_MERGE_PROGRESS: &str = "gradual-merge-progress"; +pub const GRADUAL_MERGE: &str = "gradual-merge"; +pub const HEAD_BOOKMARK: &str = "head-bookmark"; +pub const INPUT_FILE: &str = "input-file"; pub const LAST_DELETION_COMMIT: &str = "last-deletion-commit"; pub const LIMIT: &str = "limit"; pub const MANUAL_COMMIT_SYNC: &str = "manual-commit-sync"; -pub const PRE_DELETION_COMMIT: &str = "pre-deletion-commit"; -pub const SYNC_DIAMOND_MERGE: &str = "sync-diamond-merge"; -pub const MAX_NUM_OF_MOVES_IN_COMMIT: &str = "max-num-of-moves-in-commit"; -pub const CHUNKING_HINT_FILE: &str = "chunking-hint-file"; -pub const PARENTS: &str = "parents"; -pub const PRE_MERGE_DELETE: &str = "pre-merge-delete"; -pub const CATCHUP_DELETE_HEAD: &str = "create-catchup-head-deletion-commits"; -pub const EVEN_CHUNK_SIZE: &str = "even-chunk-size"; -pub const BONSAI_MERGE: &str = "bonsai-merge"; -pub const BONSAI_MERGE_P1: &str = "bonsai-merge-p1"; -pub const BONSAI_MERGE_P2: &str = "bonsai-merge-p2"; -pub const HEAD_BOOKMARK: &str = "head-bookmark"; -pub const TO_MERGE_CS_ID: &str = "to-merge-cs-id"; -pub const PATH_REGEX: &str = "path-regex"; -pub const DELETION_CHUNK_SIZE: &str = "deletion-chunk-size"; -pub const WAIT_SECS: &str = "wait-secs"; -pub const CATCHUP_VALIDATE_COMMAND: &str = "catchup-validate"; -pub const MARK_NOT_SYNCED_COMMAND: &str = "mark-not-synced"; -pub const INPUT_FILE: &str = "input-file"; -pub const CHECK_PUSH_REDIRECTION_PREREQS: &str = "check-push-redirection-prereqs"; -pub const VERSION: &str = "version"; -pub const RUN_MOVER: &str = "run-mover"; -pub const PATH: &str = "path"; -pub const BACKFILL_NOOP_MAPPING: &str = "backfill-noop-mapping"; pub const MAPPING_VERSION_NAME: &str = "mapping-version-name"; +pub const MARK_NOT_SYNCED_COMMAND: &str = "mark-not-synced"; +pub const MARK_PUBLIC: &str = "mark-public"; +pub const MAX_NUM_OF_MOVES_IN_COMMIT: &str = "max-num-of-moves-in-commit"; +pub const MERGE: &str = "merge"; +pub const MOVE: &str = "move"; +pub const ORIGIN_REPO: &str = "origin-repo"; +pub const PARENTS: &str = "parents"; +pub const PATH_REGEX: &str = "path-regex"; +pub const PATH: &str = "path"; +pub const PRE_DELETION_COMMIT: &str = "pre-deletion-commit"; +pub const PRE_MERGE_DELETE: &str = "pre-merge-delete"; +pub const RUN_MOVER: &str = "run-mover"; +pub const SECOND_PARENT: &str = "second-parent"; pub const SOURCE_CHANGESET: &str = "source-changeset"; +pub const SYNC_DIAMOND_MERGE: &str = "sync-diamond-merge"; pub const TARGET_CHANGESET: &str = "target-changeset"; +pub const TO_MERGE_CS_ID: &str = "to-merge-cs-id"; +pub const VERSION: &str = "version"; +pub const WAIT_SECS: &str = "wait-secs"; pub fn cs_args_from_matches<'a>(sub_m: &ArgMatches<'a>) -> BoxFuture { let message = try_boxfuture!(