From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.943.1585778416920802895 for ; Wed, 01 Apr 2020 15:00:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=QQcNcGXG; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: Be3lTjL+Q0PefCAwzGiqs1fCgYBqF2EV8nkeueoG7zZGJ8JsWccJFM1lT3J+Vwb1+sFZsEC33T /1wWuYCp1kuQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2020 15:00:16 -0700 IronPort-SDR: I2Dh3W7S92GVnFOO+XbUL1dkMEERIs0/i0FxFiheSWAWkDl1tXaoebqlY/Sfhj2sg0ulXhEoaE 20Kv2Ze+7IXQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,333,1580803200"; d="scan'208";a="240644831" Received: from orsmsx108.amr.corp.intel.com ([10.22.240.6]) by fmsmga007.fm.intel.com with ESMTP; 01 Apr 2020 15:00:16 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by ORSMSX108.amr.corp.intel.com (10.22.240.6) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 15:00:15 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.169) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 1 Apr 2020 15:00:15 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ftAQHIcf2yyhcg9qShFjFjEq28X76KNcVlp4K4sgFk1n0gv6RlMo8ObSYjCZXWcPrt40IlgOq71GpwwrJw5VqD7XczoZrZHPgx1Zt1oMQlGXQ1vSoPFZ0sT11YIQJ+eMw8+aV6m9KnJuabflQQyT3vzt9GZcQiiEyNn4doZbZp3STdal2+ok10PSbH9a95t6qYvH4bt5DijPsIk6RqoXoqZIpVdvZIq42S/X7N4HhPLaZ4ZD/u8iP0LxDRe1V83sJwHWssYYWdO2no/xLm3nRzdnwvI/ri7DuB9yD/Fqhiwmy4RdP5YX5xqvGwlJE4M4ACyhgTA87O6VwASw7A75LA== 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=b7Sa0Yquke3+s6ZXUcOceDqujWUbskrWTeLxLKCzscQ=; b=hOujVfTULZmDhbgDLCJLDV9gKzi+NeGhwe1KXk/XcTMV69+86X3m0moxfWEhaFI9+IT+D1A/fClYvV+ZDoB52oMqxE/KXVK7Ydhyj+D/SvwFVFetT/SAs8NaD3RruokyoPhJuvd3tn4DkYn48m4UxWMjncIi1mg2LQBoLIDRE7nwXJpj8FtcUF8o3oc9JgJlSvXqBmnofG4eJXkOrDoC3PFQEhlU2Afg+OOkdTDD3LVxsGBRemGVl6pOS1y4vO25YueQTlvMZM5Qe12HAXNSexH0rRg1mbAv2pZAQG9k5j1kjNcWod7wOUEZdcUIcfygzAaduIOXV3vo3osqddRW7g== 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=b7Sa0Yquke3+s6ZXUcOceDqujWUbskrWTeLxLKCzscQ=; b=QQcNcGXGz+VnecDUFheyeN+eWechNPUkqlECiTNrZ5V8plIvE0/TMgvXRYu6gH65yalF8bl5qfH7JkXZWvZBJM1lNZRDGtSlHwcGVGKgFkYaKfbLRSqfePrhPGVNoWlNLdeoIe+/5q8fjW+OjRrrjotC/Mn7GpyetIt8Bwp2RIk= Received: from DM6PR11MB3628.namprd11.prod.outlook.com (2603:10b6:5:144::25) by DM6PR11MB2859.namprd11.prod.outlook.com (2603:10b6:5:c9::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.20; Wed, 1 Apr 2020 22:00:14 +0000 Received: from DM6PR11MB3628.namprd11.prod.outlook.com ([fe80::5904:e7d9:f64d:9a7e]) by DM6PR11MB3628.namprd11.prod.outlook.com ([fe80::5904:e7d9:f64d:9a7e%3]) with mapi id 15.20.2878.014; Wed, 1 Apr 2020 22:00:14 +0000 From: "Desimone, Ashley E" To: "devel@edk2.groups.io" , "Bjorge, Erik C" CC: "Desimone, Nathaniel L" , "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 3/7] EdkRepo: Update Checkout for archived combos Thread-Topic: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 3/7] EdkRepo: Update Checkout for archived combos Thread-Index: AQHWB63goxfOu2der0COwY6x2nimSKhk0mNQ Date: Wed, 1 Apr 2020 22:00:13 +0000 Message-ID: References: <7a505db71f781f656e061acb6a48204b893eb2f7.1585694095.git.erik.c.bjorge@intel.com> In-Reply-To: <7a505db71f781f656e061acb6a48204b893eb2f7.1585694095.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: 6e0e416a-3224-44c6-17ed-08d7d6880e8c x-ms-traffictypediagnostic: DM6PR11MB2859: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:378; x-forefront-prvs: 03607C04F0 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)(71200400001)(8676002)(66946007)(64756008)(66556008)(15650500001)(66476007)(4326008)(7696005)(66446008)(966005)(2906002)(8936002)(52536014)(107886003)(81166006)(86362001)(81156014)(26005)(186003)(53546011)(6506007)(6636002)(5660300002)(76116006)(54906003)(498600001)(55016002)(110136005)(33656002)(9686003);DIR:OUT;SFP:1102; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: aM2SJtUxQkNZS6SvxgdQCKSTefDYO7Gd5otiAA5H/i1DdXTO8fFdijva26YeEt7GYDaIDMUXIy1CxnpsF/NAxLl8ezUQ5AATQO16ReXpRDY2NUs+57oDFd8juLYV68KsFapeLQYRVNtpPicL/j23jA8q3X7cLQ48zFvrZTV0CWNzmh8BGCWwQupHM9rpWobX+iIH7FDeO55RNY8gk7+8MKXKGFr22K8Bbpiil56/ubmFXg4OurZOBkzXucN2EWnJ/Y52cDw5/culzyytXXo8LIjeyAUJZH+8SeRgRWZ8Yb1e9rT1dB1gFV1pMtNOYb9RTJIwu+80SMzblJgxy1H/vhmGD1fdtiX8xBl1aJF5rnJ6PCrUlYPKksRGn6n9lBN92DW/2+5frVHat0i79L9qt9OL58OaV5M4JYLF4EuAiEKsiz8abb42MO8O4YeY1JoCYqrILgORKX2cQ45bfA21oOscmBOorhSS5qEWxjHlHiWXVB7IqIplLuSApuGoFlMI3cdtCa0+3A8p5Jr3G8RvkQ== x-ms-exchange-antispam-messagedata: Uszxsu9gOpuh6uLH4P6IrvbZ5LgIsuDlnKXMsKvBSey3VxZbW3OpNXQ13hBqTEDETt9geCsKgKeHDT/Yg4FXMwLB5mzEc26eUNJQu9L4l9A4pfAE1JlhxC7VQT4pysaXxFRExufp881WI2OG+xVLPg== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 6e0e416a-3224-44c6-17ed-08d7d6880e8c X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Apr 2020 22:00:14.2124 (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: 411xDnLDkKnGL1n4yBrCGhXrgp8UiXd42Fh/ppE4w8Y+54Ym+oGtiK49SV81kDM6DOmYC8hnbeivExNhws+G3yiNKEkOerWiAsoNl9Wrntg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2859 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: devel@edk2.groups.io On Behalf Of Bjorge, Eri= k C Sent: Tuesday, March 31, 2020 3:42 PM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Pandya, Puja <= puja.pandya@intel.com>; Bret Barkelew ; Agyema= n, Prince Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 3/7] EdkRepo: Updat= e Checkout for archived combos Now either an active or archived branch combination can be checked out. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman --- edkrepo/common/common_repo_functions.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/comm= on_repo_functions.py index 288dd27..160127b 100644 --- a/edkrepo/common/common_repo_functions.py +++ b/edkrepo/common/common_repo_functions.py @@ -494,8 +494,14 @@ def sort_commits(manifest, workspace_path, max_commit= s=3DNone): return sorted_commit_list =20 =20 -def combination_is_in_manifest(combination, manifest): +def combinations_in_manifest(manifest): combination_names =3D [c.name for c in manifest.combinations] + combination_names.extend([c.name for c in manifest.archived_combinati= ons]) + return combination_names + + +def combination_is_in_manifest(combination, manifest): + combination_names =3D combinations_in_manifest(manifest) return combination in combination_names =20 =20 @@ -557,7 +563,7 @@ def checkout(combination_or_sha, verbose=3DFalse, over= ride=3DFalse, log=3DNone): combo_or_sha =3D combination_or_sha try: # Try to handle normalize combo name to match the manifest file. - combo_or_sha =3D case_insensitive_single_match(combo_or_sha, [x.n= ame for x in manifest.combinations]) + combo_or_sha =3D case_insensitive_single_match(combo_or_sha, comb= inations_in_manifest()) except: # No match so leave it alone. It must be a SHA1 or a bad combo n= ame. pass --=20 2.21.0.windows.1