From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.183.1573080294913303056 for ; Wed, 06 Nov 2019 14:44:54 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: nathaniel.l.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Nov 2019 14:44:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,276,1569308400"; d="scan'208";a="233043220" Received: from orsmsx105.amr.corp.intel.com ([10.22.225.132]) by fmsmga002.fm.intel.com with ESMTP; 06 Nov 2019 14:44:52 -0800 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.28]) by ORSMSX105.amr.corp.intel.com ([169.254.2.232]) with mapi id 14.03.0439.000; Wed, 6 Nov 2019 14:44:24 -0800 From: "Nate DeSimone" To: "Desimone, Ashley E" , "devel@edk2.groups.io" CC: "Pandya, Puja" Subject: Re: [edk2-devel][edk2-staging/EdkRepo][PATCH v2 3/8] EdkRepo: Argument String Refactor - Combo Command Thread-Topic: [edk2-devel][edk2-staging/EdkRepo][PATCH v2 3/8] EdkRepo: Argument String Refactor - Combo Command Thread-Index: AQHVlPMcJtFI/kjUd0ufi3pMzzSYa6d+vPjw Date: Wed, 6 Nov 2019 22:44:24 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AB5BA487E@ORSMSX113.amr.corp.intel.com> References: <20191106223944.18036-1-ashley.e.desimone@intel.com> <20191106223944.18036-3-ashley.e.desimone@intel.com> In-Reply-To: <20191106223944.18036-3-ashley.e.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZDE5YjJiNmEtNGRjMy00ODAzLThlOWYtMTQ4ZjE3MGVkYjk2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiU2pDelpLQkl1Rlp6N2I4dmdqa1J5clhcL1ZucXViVjg4U1hoajl2enlaOThWcG9FRG9Yc3Y0bXl1dGd6d2VQRGUifQ== x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone -----Original Message----- From: Desimone, Ashley E =20 Sent: Wednesday, November 6, 2019 2:40 PM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Pandya, Puja Subject: [edk2-devel][edk2-staging/EdkRepo][PATCH v2 3/8] EdkRepo: Argument= String Refactor - Combo Command Move all argumenet strings for combo_command.py to edkrepo/commands/argumen= ts/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 edkr= epo/commands/arguments/combo_args.py diff --git a/edkrepo/commands/arguments/combo_args.py b/edkrepo/commands/ar= guments/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.
#=20 +SPDX-License-Identifier: BSD-2-Clause-Patent # + +''' Contains the help and description strings for arguments in the=20 +combo command meta data. +''' + +COMMAND_DESCRIPTION =3D 'Displays the currently checked out combination an= d lists all available combinations.' \ No newline at end of file diff --git a/edkrepo/commands/combo_command.py b/edkrepo/commands/combo_com= mand.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 =20 -# 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.c= onfig.config_factory import get_workspace_manifest =20 @@ -23,7 +22,7 @@ class ComboCommand(EdkrepoCommand): def get_metadata(self): metadata =3D {} metadata['name'] =3D 'combo' - metadata['help-text'] =3D COMBO_COMMAND_DESCRIPTION + metadata['help-text'] =3D arguments.COMMAND_DESCRIPTION args =3D [] metadata['arguments'] =3D args args.append(ColorArgument) diff --git a/edkrepo/common/argument_strings.py b/edkrepo/common/argument_s= trings.py index fd74f37..e42d5b1 100644 --- a/edkrepo/common/argument_strings.py +++ b/edkrepo/common/argument_strings.py @@ -46,9 +46,6 @@ CHECKOUT_COMMAND_DESCRIPTION =3D 'The checkout command en= ables checking out a spec CHECKOUT_COMBINATION_DESCRIPTION =3D 'EdkRepo ch= eckout \n' CHECKOUT_COMBINATION_HELP =3D 'Combination: The name of the combination as= defined in the workspace manifest file to checkout or the sha of the revis= ion to checkout\n' =20 -#Args for combos_command.py -COMBO_COMMAND_DESCRIPTION =3D 'Displays the list of combinations and the c= urrently checked out combination' - #Args for sparse_command.py SPARSE_COMMAND_DESCRIPTION =3D 'Displays the current sparse checkout statu= s and allows for changing the sparse checkout state.' SPARSE_ENABLE_HELP =3D 'Enables sparse checkout if supported by the manife= st.' -- 2.16.2.windows.1