From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web08.15252.1605408885943199476 for ; Sat, 14 Nov 2020 18:54:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=aPJkSaVG; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: yrF1g2yQRJcrkbtv10/cTKzdQx3YtbpNZsnA1o720sTpZZTanSsn59x8q4n1A+ZGGFUJo5wiOu PBj9UeGlbhZQ== X-IronPort-AV: E=McAfee;i="6000,8403,9805"; a="169832619" X-IronPort-AV: E=Sophos;i="5.77,479,1596524400"; d="scan'208";a="169832619" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2020 18:54:38 -0800 IronPort-SDR: JNse6XuW+QwDLkiKbBah/sAD5kdMhPSYAGLtU+T5x0Sjv/HQsdhVEcTcXAAy1mnsrqJ187SDLT m4zG0tfuciaA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,479,1596524400"; d="scan'208";a="531472372" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga006.fm.intel.com with ESMTP; 14 Nov 2020 18:54:37 -0800 Received: from orsmsx605.amr.corp.intel.com (10.22.229.18) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sat, 14 Nov 2020 18:54:37 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Sat, 14 Nov 2020 18:54:37 -0800 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.100) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Sat, 14 Nov 2020 18:54:36 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nXQe7j5E8KRqlgpPjIsMzVWzmC/CNqYlUDAMCR5EnrG6ZoeugO2sufwEPojgPhLadIQcC1Dr2wXeRe1KDCEi6uXIL3E2VflfMNodi8O4KPbMaPiTKgu7v3d9Z912rh1IQlA0SsanPuA7QmieMmF47F3VBa6HEoOpzamGN8GjxELk/Q4/2Q5UoCgp9AHN5BP3R+QuUt6SDwlsg9NcZCWn0a/UMVhRl60KlEiTKNx79JN1PbtoetBpP+eEfnet+8zhdkrNO+8aFe+chrVSITlCgpKUAb+3HG9s+91OmTvj5dJohHsSlnOheU4peEyRecCTBDXUfq1iQ5yeCLjSGqu/TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DyS6rk3HQNPp4kchfB4g9V+O48KYyZJbXzKqLDkEOF0=; b=OEpvIouiG22BolOb3J/dpmZ7Zs85j5biPZ86Ym6kVGx6T/miBo6PkzdCMP1mzVQYN1VhaTdafXk5Bm3rlboljXVR0kCTE9D3CfOzmD2c/kLCeOuazxTCjSN73Jhrxw9ryHMVhMclZS4Q1tSpDBhDZnt4TnFJAjNneWVlFWsZ7LI4QtjJDjbV8g2w+RY+FWU7Ms0VDoiHpSXE1mE+DeFORObUtNJRYHMx+phTPuVyfS3oZDxwU6BHBgOEdRklCJl04QvsZIbkTHiYLMUlt7hkC4IM/bK7avJVX17xE3DN23oZx4BVbRTcR81QI+rfN3wM6khdODL+3ezOoCnwf28Bog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DyS6rk3HQNPp4kchfB4g9V+O48KYyZJbXzKqLDkEOF0=; b=aPJkSaVG7sxYOUPQyObaoBfQuLXL8sTQ8LjiUr3Ws7GweqN3QIaAXouQAgkGQA5eN4H2CeVen/TeC7/ME5eOqqr41TxGNH6eCtI8oczi7CiPK49AxnlqdnX9PWYJJelxa66WDhrmS68g3P+afTWfX7v+W/q9Vto0DBX+UpKMn+A= Received: from MWHPR1101MB2160.namprd11.prod.outlook.com (2603:10b6:301:5b::12) by MWHPR11MB0061.namprd11.prod.outlook.com (2603:10b6:301:65::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.25; Sun, 15 Nov 2020 02:54:35 +0000 Received: from MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::3161:c00f:c5c5:f710]) by MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::3161:c00f:c5c5:f710%8]) with mapi id 15.20.3564.028; Sun, 15 Nov 2020 02:54:35 +0000 From: "Nate DeSimone" To: "Desimone, Ashley E" , "devel@edk2.groups.io" CC: "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" , "Bjorge, Erik C" Subject: Re: [edk2-staging/EdkRepo][PATCH] EdkRepo: Remove unused checkout sha functionality Thread-Topic: [edk2-staging/EdkRepo][PATCH] EdkRepo: Remove unused checkout sha functionality Thread-Index: AQHWuHo0WjI9XbBbxUO6nQCO7krWaKnIhEBg Date: Sun, 15 Nov 2020 02:54:34 +0000 Message-ID: References: <20201111222939.1433-1-ashley.e.desimone@intel.com> In-Reply-To: <20201111222939.1433-1-ashley.e.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [50.53.190.176] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2ec85455-9258-4bca-4ea5-08d88911c8f8 x-ms-traffictypediagnostic: MWHPR11MB0061: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3826; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 4gu8lFqoIWJ80AyyI/rT2eJ6Suxa6lO6b/XIxPpKdHKe1nrEnfFP7B+Vyd/6Wr/eSqqgZbcILBhoSDZ2/R0N828cN16LeTyBOit6b8qEgmYCvkdfRpMztJm6fIjVjhTtOJ56/cmRxYV/hZvaP3lNdAPXGQuAA/SwYfA07SJI2W7pqbbF9wTveMKg9E1OQkX9ycZS7T9V9DQG6mM8cv2wxBV3DBvh8dVa6r628UrHKx9Z8J1/oGuqzZ+lR1glToWreofzX/SicDnIrB8a4m0KSOqaEgIojL37OVsTM9uTK87pgsgiE/0GznnGZLH+sDSNeZnrWjvbRHdz9SD/ED+9QA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2160.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(136003)(396003)(376002)(346002)(366004)(64756008)(54906003)(66556008)(66476007)(186003)(2906002)(6506007)(7696005)(4326008)(478600001)(9686003)(8676002)(33656002)(55016002)(86362001)(66946007)(8936002)(53546011)(5660300002)(316002)(107886003)(83380400001)(110136005)(76116006)(26005)(71200400001)(52536014)(66446008);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: HoWafAo48Y97PhvJHJ8hw1o9ZdVSw5/h8NrjB30sYEjx+hxpUguyG+6kcpQ3MtNYJ7TlNc6krvUbTG+eH5AQJthlCXmnLOefeASEv2Bsvx5UzKGJUTFSM2c/YUDnVskS+KZC37zvPz161odG8MRtVjDEQ5Lc9paQ9upZhiJC6JCJ1/J5JWJvA9OaS4QKO4H9yWKkOoquABf1n61uIsX0TZBJLDTRSRIGnfcGrAJCri2gGuw5GD+VD9nErMD3KDrxveUGCjPI4cOvZZgj/aSHd9auf2sKw95UFRhij9bGONzZTODT3yvZ5bJapsoT160LIi/kbcZuiyiV+shEV7An+PGC/3nlZH677iGQfU0dzXLpQHF23xxSAqUWnyf8/dwg1FllwCXdaF4V4hHGPVZ0MSKNMGp+fx2s1fQDK6gQMl4xiIxumGR3WKkRhVf9/0QB0CruOFfX/rJaMOdzOKvfRFCOAkYK0OT+XdCgsTiSlCvVWRF6BVjxP8ge6ZWww8RJXCji6lw87nn4mLw3EVCnyaWWOFXPJ5Mk9TgqfJahLVBwib3vLBQw+9aJvGIZNCGwrEiBJgVksPYiZzz1FMQswbnHHleRshiYj9XGS8XJYB1nDjeViSi+xTgVFzG0BkoxQ5jkNB7n+JHAhdJRC5p4VzpYa0ItQI6HosyTmLQJwWmBHa7eUPz0cSrdgM0PcJ6L1ZFRoZvb0HpDKbqzmfE7iXNoUcOA5qTQQKX+tgScxOZwRkyEP2WOKE/VRs2sdQG+vVlxf829fC+WjSMGu7miALPG/o8eUn0K62NpK5kevlGUXkt8A4plNcAy6cVqbGznMYgRrKlfosDUMewLAzYr/PtSsxSq6C8HuQPtERxS0Il7WViYx5zeqPJ/8ZbBDWoJoqFTUBagyvcydmr1XKu3Mg== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2160.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ec85455-9258-4bca-4ea5-08d88911c8f8 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2020 02:54:35.0291 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: re5WCHN+9cpMpJwVNcE//m4Ry6aqn8pTNjPHOgMg1rkAgSdUEeCViXorCMNrS1tooyQQ2tsJ0bxNWFsMQ/OUx6OuGiwwa1IKIUj7sQBUEGM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB0061 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone > -----Original Message----- > From: Ashley E Desimone > Sent: Wednesday, November 11, 2020 2:30 PM > To: devel@edk2.groups.io > Cc: Desimone, Nathaniel L ; Pandya, Puja > ; Bret Barkelew ; > Agyeman, Prince ; Bjorge, Erik C > > Subject: [edk2-staging/EdkRepo][PATCH] EdkRepo: Remove unused > checkout sha functionality >=20 > The SHA parameter for the checkout command has been removed > previously. This commit removes the calculations which supported this > functionality and amends the checkout function to raise an > EdkRepoInvalidParameters exception if a valid combo name is not passed in= . >=20 > Cc: Ashley E Desimone > Cc: Nate DeSimone > Cc: Puja Pandya > Cc: Bret Barkelew > Cc: Prince Agyeman > Cc: Erik Bjorge > Signed-off-by: Ashley E Desimone > --- > edkrepo/common/common_repo_functions.py | 78 ++++--------------------- > 1 file changed, 12 insertions(+), 66 deletions(-) >=20 > diff --git a/edkrepo/common/common_repo_functions.py > b/edkrepo/common/common_repo_functions.py > index 0d54bbf..2277c1e 100644 > --- a/edkrepo/common/common_repo_functions.py > +++ b/edkrepo/common/common_repo_functions.py > @@ -427,76 +427,22 @@ def combination_is_in_manifest(combination, > manifest): > return combination in combination_names >=20 >=20 > -def get_target_sources(combination_or_sha, manifest, workspace_path, > log=3DNone): > - if combination_is_in_manifest(combination_or_sha, manifest): > - return manifest.get_repo_sources(combination_or_sha) > - > - current_combo =3D manifest.general_config.current_combo > - # look for a pin file that is named combination_or_sha.xml > - pin_filename =3D os.path.join( > - workspace_path, > - 'repo', > - combination_or_sha+'.xml') > - if os.path.exists(pin_filename): > - return ManifestXml(pin_filename).get_repo_sources(current_combo) > - > - print ("Search repositories for '{}'".format(combination_or_sha)) > - commit_map =3D { > - x.root : None > - for x in manifest.get_repo_sources(current_combo) > - } > - found =3D False > - if not log: > - log =3D sort_commits(manifest, workspace_path) > - for commit in log: > - root =3D os.path.basename(commit.repo.working_dir) > - if combination_or_sha =3D=3D commit.hexsha: > - found =3D True > - commit_map[root] =3D commit.hexsha > - continue > - if not found: > - continue > - if not commit_map[root]: > - commit_map[root] =3D commit.hexsha > - if not found: > - raise > EdkrepoInvalidParametersException(CHECKOUT_INVALID_COMBO) > - > - # Create a new pin file > - old_sources =3D manifest.get_repo_sources(current_combo) > - new_sources =3D [] > - for repo_source in old_sources: > - new_sources.append( > - repo_source._replace(commit=3Dcommit_map[repo_source.root])) > - manifest.generate_pin_xml( > - combination_or_sha, > - current_combo, > - new_sources, > - filename=3Dpin_filename) > - > - return ManifestXml(pin_filename).get_repo_sources(current_combo) > - > - > -def checkout(combination_or_sha, verbose=3DFalse, override=3DFalse, > log=3DNone): > +def checkout(combination, verbose=3DFalse, override=3DFalse, log=3DNone)= : > workspace_path =3D get_workspace_path() > manifest =3D get_workspace_manifest() >=20 > - # Create combo_or_sha so we have original input and do not introduce > any > + # Create combo so we have original input and do not introduce any > # unintended behavior by messing with parameters. > - combo_or_sha =3D combination_or_sha > + combo =3D combination > submodule_combo =3D manifest.general_config.current_combo > try: > # Try to handle normalize combo name to match the manifest file. > - combo_or_sha =3D case_insensitive_single_match(combo_or_sha, > combinations_in_manifest(manifest)) > - submodule_combo =3D combo_or_sha > + combo =3D case_insensitive_single_match(combo, > combinations_in_manifest(manifest)) > + submodule_combo =3D combo > except: > - # No match so leave it alone. It must be a SHA1 or a bad combo = name. > - pass > + raise > EdkrepoInvalidParametersException(CHECKOUT_INVALID_COMBO) >=20 > - repo_sources =3D get_target_sources( > - combo_or_sha, > - manifest, > - workspace_path, > - log=3Dlog) > + repo_sources =3D manifest.get_repo_sources(combo) > initial_repo_sources =3D > manifest.get_repo_sources(manifest.general_config.current_combo) >=20 > # Disable sparse checkout > @@ -523,7 +469,7 @@ def checkout(combination_or_sha, verbose=3DFalse, > override=3DFalse, log=3DNone): >=20 > # Deinit all submodules due to the potential for issues when switchi= ng > # branches. > - if combo_or_sha !=3D manifest.general_config.current_combo: > + if combo !=3D manifest.general_config.current_combo: > try: > deinit_full(workspace_path, manifest, verbose) > except Exception as e: > @@ -531,19 +477,19 @@ def checkout(combination_or_sha, verbose=3DFalse, > override=3DFalse, log=3DNone): > if verbose: > print(e) >=20 > - print(CHECKING_OUT_COMBO.format(combo_or_sha)) > + print(CHECKING_OUT_COMBO.format(combo)) >=20 > try: > checkout_repos(verbose, override, repo_sources, workspace_path, > manifest) > current_repos =3D repo_sources > # Update the current checkout combo in the manifest only if this > # combination exists in the manifest > - if combination_is_in_manifest(combo_or_sha, manifest): > - manifest.write_current_combo(combo_or_sha) > + if combination_is_in_manifest(combo, manifest): > + manifest.write_current_combo(combo) > except: > if verbose: > traceback.print_exc() > - print (CHECKOUT_COMBO_UNSUCCESSFULL.format(combo_or_sha)) > + print (CHECKOUT_COMBO_UNSUCCESSFULL.format(combo)) > # Return to the initial combo, since there was an issue with che= king out > the selected combo > checkout_repos(verbose, override, initial_repo_sources, > workspace_path, manifest) > finally: > -- > 2.26.2.windows.1