From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web12.1792.1587514510043040638 for ; Tue, 21 Apr 2020 17:15:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=MtHHroBY; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: JlWrGM5CGRXtUyv01klX9wWjj/Hi8Ppl9HJ+W9gw8KdDvLtHaTbIonlrQj+oVqzc7WfZFOb8QW OF39iYK3uevA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2020 17:15:09 -0700 IronPort-SDR: OedgWwu25ErhgwoOTpvVEsjNaDgIJ2ZnLvy78G5fA49AmhFDZzbqz6UTvBFMzJmHLscOdFUUYY +Ys8iL+OAeUA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,412,1580803200"; d="scan'208";a="291765850" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga008.jf.intel.com with ESMTP; 21 Apr 2020 17:15:08 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 Apr 2020 17:15:02 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 21 Apr 2020 17:15:01 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 21 Apr 2020 17:15:01 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.172) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 Apr 2020 17:15:00 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Co9Wr+lmHkRwYbt7DwHEjooIRarS/lx+ySqh6boo9xE1Ukzolujk2b+AefN6ZvKQ9NZjd5OvTzFrhXqS8thY7RkUivQinJL2weBhsFmKmVOHwCOzME833s2UOhUGDxt3nU00EkO3yXJ4E3F2nWP2IWEfB4KXDMd4ermUl5hWHuQzrvlzkLWwOUYm5bDd1+tSZD5gkq7r57G8lCmyMZIEojr1N7uOSKdZ5jL8WNgfs/y2v9Nzivx4pTifIIS+yGCzjoGRcNMR2CH7FEfky1WLCOvS7E4gpiMbU9suDdo/r2nnezYCdWx5gl8MzWYufZt7CqiU7fUV5jaoSnFnZU/XLQ== 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=csjfz7f17xIME7k6hQH7Yk9ipw78NLZ+6iZcNqM5cbk=; b=REswvffWQTUhJNy6jNhiAkWcDnwcqlCA/jdJ1w5NrNxjjrKhiYA1C26TW2dC1kATxDwaJPXIWv4F80GiCnN4g1THDLcvt4ZBQs26e+yPCVEWQOBQn4NIRiCeYLqsuAScn930e/T3C1TahFct1Am7Ier50aYBqUtPOVWtKIbCKW9m7MIlecjcSQHGQH3uXixEbRBK8MA9s8Jb84jDCLaAi+WFZZvMIq+QtRui8W1XwGv7cS+op+JlGyeGCQZ8K2aMaih/T5M5pt9BHvwu5EboekO7yAcWeeDTkK5NFnskmovpB4CAf2W3LkyGlUuUKvhcfKDSqzNfDjOhbRCAUU5bVQ== 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=csjfz7f17xIME7k6hQH7Yk9ipw78NLZ+6iZcNqM5cbk=; b=MtHHroBY7nhxgFZQPBOZRrSjgY/HBWdwVy8GvujpkyrovwR9/ahgcMToQF+Z8RtT42ovI9swyuOOqr2CV4sHAcE9AuOmm8NkR4g9X5GYdhSLbiVqFY+SaU6D6B8s1OsgkEiNMjeH96drh4XTTOclW166NtE0sUkiFLPuOjLK2GE= Received: from DM6PR11MB3628.namprd11.prod.outlook.com (2603:10b6:5:144::25) by DM6PR11MB2538.namprd11.prod.outlook.com (2603:10b6:5:be::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.29; Wed, 22 Apr 2020 00:14:59 +0000 Received: from DM6PR11MB3628.namprd11.prod.outlook.com ([fe80::2c41:705f:b0ee:e36c]) by DM6PR11MB3628.namprd11.prod.outlook.com ([fe80::2c41:705f:b0ee:e36c%5]) with mapi id 15.20.2921.030; Wed, 22 Apr 2020 00:14:59 +0000 From: "Ashley E Desimone" To: "Bjorge, Erik C" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" , "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Improve removal of content with AlwaysExclude Thread-Topic: [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Improve removal of content with AlwaysExclude Thread-Index: AQHWGDR3pkjP0emCmkmS5XIAxCiaOqiERaZQ Date: Wed, 22 Apr 2020 00:14:59 +0000 Message-ID: References: <5612a4e98256fbb2230393845632116b5a10729e.1587511536.git.erik.c.bjorge@intel.com> In-Reply-To: <5612a4e98256fbb2230393845632116b5a10729e.1587511536.git.erik.c.bjorge@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: spf=none (sender IP is ) smtp.mailfrom=ashley.e.desimone@intel.com; x-originating-ip: [134.134.136.213] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5c927f00-3962-46db-292b-08d7e65231b8 x-ms-traffictypediagnostic: DM6PR11MB2538: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-forefront-prvs: 03818C953D x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB3628.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10019020)(366004)(33656002)(110136005)(53546011)(55016002)(8936002)(26005)(6506007)(54906003)(81156014)(7696005)(107886003)(498600001)(86362001)(4326008)(186003)(2906002)(8676002)(5660300002)(9686003)(71200400001)(66556008)(66476007)(66446008)(66946007)(52536014)(76116006)(64756008);DIR:OUT;SFP:1102; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zTDfORD+iCQK42AFVTuopV3hZLEVLLDxNL8YH92E7RELFwtt0MNP75DLf2SP4xAPRj7Oah3lrsgmfbzdDbSe78i/8k77eNJrCgItjVgUciWVrb/NnE7dBIWews39K7YJKkDih6nu46Z/BhMRLUYDOmcWQGiz1xURR/ol3C9Azs0n2z74BW2ZuNUyjULTTM1QG4P4m/8dwziVESNo94GSfDlLvT4XNtpBsE9zR/EFr4POSOhQQ88VfEsKZsh8+uIwtVocL/FgeqIZOXVI/DyVoCtq8qoGU6DrpggdV2u1gi9G0ERQE4wZkkWqttHQTDdWrOB7tbKG6Y1wDOn4uaWvK543xGvHOQmxNpDfF/+tUESZPA+Bg2DfRmjemv6RoIwGqeQqSVpr3EVaKjZA/56gc4OEEOY0b38Hi4+T3xr8w7qVmJvGwoG2U6uIx/E+AF5R x-ms-exchange-antispam-messagedata: yOh5W/siCbX55mZixiFwB3vI8stBmazeU91Ha1UjuFu3dQMZ9EEj4xo/1YttvTkfb6SNbwt1nB+F6FbMH7wCgd9hNYJwEiRz+o0FROdhDA9TEXZn44ThtRVEujqEG1t/w+R0fDeK5s+X+/ZhggmvQ+jeo+3Z/SJw3hZqcUEoltSn9pZenoZ06NrNNFwVn17LGPaHkkPRBckMRO0SjfOhty9jsGJhI/CXy/wWcDJosky7LEJeoY1Q8+NzBlUuTyGU2Scx0prvsaFbpu75uqeZDlwXFSEbsCSfPTYUYPRstdjYfmnlHWdAT8NAHlBuHVDdUdP/aXFMKStUtwpSk7V3ytIT8Zq9zLui+g+UF5O7NDkz3KkkL2RITg74QSLGOhccgWeBRR24E545jSw4jTbSQXNfigThJE+ZP+PclVNK1AJWVcVqCwv51QIf5IDz77sDclDSKO3GmhasNGbKZ55R6OCyhQdIJN6W/OuxVoA1Ma0PLyOL4NEyFJ1zoFk/vC0U6eYjGkk4b0G79As8mEsbcYkEyfuo1JeZqO1IUujpboyZ+2IJDxbTaPwN/BViSFMyE7c2CXzcQTmbSBhbdGDylKvJ/jeXvcE0kbCeAvUw+78ERC1aRnVh/IM4gtOsoEvk6V2ZqzPlgBSE88OCduV/jOI0FYAZftsBE1VWltc0KTWavu9mfZtVYLMHZRLnSj0MxdDB/PDQ/7O1J1IE0i8fmANhfZujiO5SAwrD3F87nYf5XExK2G1K5/ugo0Zzl6ty7q7oJlYwrF7CRPFYtosm70chRfag4F74fcAi1E6CkRGGaNo5UY1Wzijd9wp8TuOi MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 5c927f00-3962-46db-292b-08d7e65231b8 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Apr 2020 00:14:59.0764 (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: yRqdRMly/EBVaTpvI4SXRWcZQ5s1APJkRlqlVgCze6shWMImhrzoidNpRKcn/g7j4dYZdDwVh8m6dXDy1OaEi4OLgRIYuDmVLkxG97YoiYk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2538 Return-Path: ashley.e.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: Ashley DeSimone -----Original Message----- From: Bjorge, Erik C =20 Sent: Tuesday, April 21, 2020 4:27 PM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Desimone, Ashle= y E ; Pandya, Puja ; Br= et Barkelew ; Agyeman, Prince Subject: [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Improve removal of cont= ent with AlwaysExclude The AlwaysExclude XML tag has existed but only removed entries from the lis= t of sparse objects. Now items in the AlwaysExclude tag will be actively r= emoved by prefixing '!' to the entry. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Ashley DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman --- project_utils/sparse.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/project_utils/sparse.py b/project_utils/sparse.py index b17d68= 8..dbe2d80 100644 --- a/project_utils/sparse.py +++ b/project_utils/sparse.py @@ -3,7 +3,7 @@ ## @file # sparse.py # -# Copyright (c) 2017- 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2017- 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # import os @@ -552,11 +5= 52,11 @@ class BuildInfo: =20 def sparse_checkout(self, root=3DNone, always_include=3D[], always_exc= lude=3D[]): """Performs a sparse checkout operation on a single repository""" - local_prune_data =3D set() + local_prune_data =3D [] for item in always_include: - local_prune_data.add('/{}'.format(item)) + local_prune_data.append('/{}'.format(item)) for item in always_exclude: - local_prune_data.discard('/{}'.format(item)) + local_prune_data.append('!/{}'.format(item)) try: repo =3D git.Repo(root) except: @@ -578,7 +578,11 @@ def process_sparse_checkout(workspace_root, repo_list,= current_combo, manifest): workspace_list.extend([os.path.join(workspace_root, os.path.normpath(x= .root)) for x in repo_list]) =20 # Filter sparse data entries that apply to the current combo or all co= mbos - sparse_data =3D [x for x in manifest.sparse_data if x.combination is N= one or x.combination =3D=3D current_combo] + # Build list in three steps (all, repo, combo) to make sure the priori= ty is correct + sparse_data =3D [] + sparse_data.extend([x for x in manifest.sparse_data if x.remote_name i= s None and x.combination is None]) + sparse_data.extend([x for x in manifest.sparse_data if x.remote_name i= s not None and x.combination is None]) + sparse_data.extend([x for x in manifest.sparse_data if=20 + x.remote_name is not None and x.combination =3D=3D current_combo]) =20 # Create object that processes build information. build_info =3D BuildInfo(workspace_list) @@ -602,8 +606,8 @@ if __name= __ =3D=3D "__main__": # Program Information # __title__ =3D 'Sparse Checkout' - __version__ =3D '0.02.00' - __copyright__ =3D 'Copyright (c) 2017, Intel Corporation. All rights r= eserved.' + __version__ =3D '0.03.00' + __copyright__ =3D 'Copyright (c) 2017 - 2020, Intel Corporation. All r= ights reserved.' =20 # # Processes command line arguments -- 2.21.0.windows.1