From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com []) by mx.groups.io with SMTP id smtpd.web10.82.1573079991915392445 for ; Wed, 06 Nov 2019 14:39:52 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: ashley.e.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Nov 2019 14:39:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,275,1569308400"; d="scan'208";a="205481878" Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga003.jf.intel.com with ESMTP; 06 Nov 2019 14:39:51 -0800 From: "Desimone, Ashley E" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya Subject: [edk2-devel][edk2-staging/EdkRepo][PATCH v2 3/8] EdkRepo: Argument String Refactor - Combo Command Date: Wed, 6 Nov 2019 14:39:39 -0800 Message-Id: <20191106223944.18036-3-ashley.e.desimone@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20191106223944.18036-1-ashley.e.desimone@intel.com> References: <20191106223944.18036-1-ashley.e.desimone@intel.com> Move all argumenet strings for combo_command.py to edkrepo/commands/arguments/combo_args.py Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya --- edkrepo/commands/arguments/combo_args.py | 14 ++++++++++++++ edkrepo/commands/combo_command.py | 5 ++--- edkrepo/common/argument_strings.py | 3 --- 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 edkrepo/commands/arguments/combo_args.py diff --git a/edkrepo/commands/arguments/combo_args.py b/edkrepo/commands/arguments/combo_args.py new file mode 100644 index 0000000..bcb5d37 --- /dev/null +++ b/edkrepo/commands/arguments/combo_args.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python3 +# +## @file +# combo_args.py +# +# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +# + +''' Contains the help and description strings for arguments in the +combo command meta data. +''' + +COMMAND_DESCRIPTION = 'Displays the currently checked out combination and lists all available combinations.' \ No newline at end of file diff --git a/edkrepo/commands/combo_command.py b/edkrepo/commands/combo_command.py index 3c456c2..68d6854 100644 --- a/edkrepo/commands/combo_command.py +++ b/edkrepo/commands/combo_command.py @@ -8,10 +8,9 @@ # from colorama import Fore -# Our modules from edkrepo.commands.edkrepo_command import EdkrepoCommand from edkrepo.commands.edkrepo_command import ColorArgument -from edkrepo.common.argument_strings import COMBO_COMMAND_DESCRIPTION +import edkrepo.commands.arguments.combo_args as arguments from edkrepo.common.ui_functions import init_color_console from edkrepo.config.config_factory import get_workspace_manifest @@ -23,7 +22,7 @@ class ComboCommand(EdkrepoCommand): def get_metadata(self): metadata = {} metadata['name'] = 'combo' - metadata['help-text'] = COMBO_COMMAND_DESCRIPTION + metadata['help-text'] = arguments.COMMAND_DESCRIPTION args = [] metadata['arguments'] = args args.append(ColorArgument) diff --git a/edkrepo/common/argument_strings.py b/edkrepo/common/argument_strings.py index fd74f37..e42d5b1 100644 --- a/edkrepo/common/argument_strings.py +++ b/edkrepo/common/argument_strings.py @@ -46,9 +46,6 @@ CHECKOUT_COMMAND_DESCRIPTION = 'The checkout command enables checking out a spec CHECKOUT_COMBINATION_DESCRIPTION = 'EdkRepo checkout \n' CHECKOUT_COMBINATION_HELP = 'Combination: The name of the combination as defined in the workspace manifest file to checkout or the sha of the revision to checkout\n' -#Args for combos_command.py -COMBO_COMMAND_DESCRIPTION = 'Displays the list of combinations and the currently checked out combination' - #Args for sparse_command.py SPARSE_COMMAND_DESCRIPTION = 'Displays the current sparse checkout status and allows for changing the sparse checkout state.' SPARSE_ENABLE_HELP = 'Enables sparse checkout if supported by the manifest.' -- 2.16.2.windows.1