From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web10.1004.1588282140770035194 for ; Thu, 30 Apr 2020 14:29:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=VoXjRK6g; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: KsWMHrGJaJZpkPS3RHArOp9Yj7tYi+uqExOEvu1XctJ9Eyn+xU4vogdMNUCEPQowi3KTjRa2it VfpeBqF8xAyA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2020 14:29:00 -0700 IronPort-SDR: EyLzA+ZfupMWUl9UuXhfusgvSYbNjCD7gFhXueIzvqsTdX55qSbhwCPfSwWlHJ4ULpaJcR27xw 8NMKOFi7IKRg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,337,1583222400"; d="scan'208";a="368281877" Received: from orsmsx110.amr.corp.intel.com ([10.22.240.8]) by fmsmga001.fm.intel.com with ESMTP; 30 Apr 2020 14:29:00 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX110.amr.corp.intel.com (10.22.240.8) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 30 Apr 2020 14:28:59 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 30 Apr 2020 14:28:59 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by orsmsx609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Thu, 30 Apr 2020 14:28:59 -0700 Received: from NAM04-BN3-obe.outbound.protection.outlook.com (104.47.46.54) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 30 Apr 2020 14:28:58 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R4ZoGsWwh+S1E4LgezIrVBOuynKeqyIid365KjZ+QAbigj15FIfF6r/rgJaOrf9OhuhUuunhsKZtOlk5nh2JjtUYpdbVJOmSuFNy11IwmAEcTgRqp1qdlQ6Tvgaw0FGHFlVFIVkbA3vz5FHzlzl0tlmOFMTPsN0jVSgu8k1A3lR+lBchL/Sw8gd6g6+HP+uAK25ZZcSVVwo5tK9BgpgngiuF0GagiI7jW1seSrVVUhbqQBVg9kD37VeKTMN/TLoFoEjBNDCW/JYK20JSnhddAJoPEZgya/05q9uWJidiSTWtL4Mnyt5IptcrKrtVKtxO8yS4Q1icKN1penEFRgzOHw== 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=+ZoQgTyOKnWfeI3+AXfGThsK2OmlczKikf9Bjz7snS8=; b=Iym5h7abfQzwTBQHOK4n7y6pty0c5sVU7jDKPIG4BQ2ZEJ0DXG/+cdnrprqrl/EL0/ZrUQamsBKARP7QNu9LEj1c9b3aHW8FL4YJ2y/jeLWnrM4YDAKbytu2jan+ZaMzgM/q3oT8RFuN9xKc1ZkEKq8cvB82RDamYfWNcFnm+b0ZhAbkP/6bl09BrwHd8HQ1Ye78p3HqqnNgUymaTIbku8tbqh2XZLq08alMI4AkmEl/XYnVz+AC3ddbhjtpOhHUjb1nAnsfGYj7rR3QhXD6cW8YvfsjpalArKsjIfv4xmGo8qw/SAyunAWOCU9E7RCE1bo94WnVHhl0VBo8Cpz7cg== 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=+ZoQgTyOKnWfeI3+AXfGThsK2OmlczKikf9Bjz7snS8=; b=VoXjRK6g17qFIn+L/6JUEjw60xo3lKXskK57CjHohUriNWTFEgDIekzJ36m7ft/9UYQe/vgBoEZYoBGzmMGa75fK+5+ZjsLlJpeiJAx72IBoG/sY9MoJt1C827CM7J72otzA26WyhyLZ1PHoEBGIvE70hq+b7tnDcG1n72eGs8U= Received: from BL0PR11MB3489.namprd11.prod.outlook.com (2603:10b6:208:75::29) by BL0PR11MB3075.namprd11.prod.outlook.com (2603:10b6:208:7a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Thu, 30 Apr 2020 21:28:56 +0000 Received: from BL0PR11MB3489.namprd11.prod.outlook.com ([fe80::d0f8:bfd7:bae2:3e42]) by BL0PR11MB3489.namprd11.prod.outlook.com ([fe80::d0f8:bfd7:bae2:3e42%7]) with mapi id 15.20.2937.026; Thu, 30 Apr 2020 21:28:56 +0000 From: "Nate DeSimone" To: "Desimone, Ashley E" , "devel@edk2.groups.io" CC: "Pandya, Puja" , "Bjorge, Erik C" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-staging/EdkRepo] [PATCH 7/7] EdkRepo: Add the ability to pull only the global manifest repository for a given workspace. Thread-Topic: [edk2-staging/EdkRepo] [PATCH 7/7] EdkRepo: Add the ability to pull only the global manifest repository for a given workspace. Thread-Index: AQHWHagVEMeVrR1nQ0+kNTsV7GEa0aiSLIGg Date: Thu, 30 Apr 2020 21:28:56 +0000 Message-ID: References: <20200428215710.45504-1-ashley.e.desimone@intel.com> <20200428215710.45504-8-ashley.e.desimone@intel.com> In-Reply-To: <20200428215710.45504-8-ashley.e.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMWMxYzllY2QtYTY5Ny00YTM2LWJjMmYtYzZhOTYyZDM0NWE3IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiQmdJek5zNHYzZTdcLzlaRmVHbkhtdGdOaDZJQVhCSXZzOGRla1g0dldaWDV0cGtsVENVbE5raHozM2xyXC9EQnR4In0= dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows x-ctpclassification: CTP_NT 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: [134.134.136.198] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 38655935-abbd-48fa-dbc9-08d7ed4d7d62 x-ms-traffictypediagnostic: BL0PR11MB3075: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-forefront-prvs: 0389EDA07F x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: v/14uxZ2/C69aQ1cSm/+QEOT5pxPpWJekHHoj3k39D7Sv3DZwuqwxe6t2+AaAO6XzLLoiz3ltpx1Nh+mVVF1kzZ51/ukwNfe0EjeBWGiT4JGE6McS0O53mP6UDGUubenNyiEIh7VK18uo5uNgk08pSuw0t/du4Sprk3Ed+rdxiw6Bo1uZG56XxQuZ5a9HNDQ3QL6AaNwIjTqojndZh3X4571AUws4Ucq+It5PqxeYeaE05EUTw9s/qpp1RE+V1cyaHGNRWNnn44tfeFIImxvbTvC69HJkp10Ujgp5gxbP5skEvBAHg6aS5Ij1nADxhf3W8cMQKHlL+oZc4BxlGejQdnj4R5nIYIP2oBW8EBz2z607TTbebf3XOWKd45ESarjvvCGSCwsoA762P2r5kzywZgAfPWEOd1eNOsIz+d/95WzOqx2apV0CpgirhvCTnCQ x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR11MB3489.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(376002)(366004)(346002)(39860400002)(396003)(478600001)(86362001)(6506007)(54906003)(71200400001)(26005)(53546011)(316002)(186003)(107886003)(5660300002)(110136005)(7696005)(4326008)(8936002)(66946007)(2906002)(66476007)(55016002)(64756008)(66446008)(66556008)(52536014)(33656002)(9686003)(76116006)(8676002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: K/4kDyZlvLyt4YLZwTe7lZRtNRQLEH1wNk1HcsSzbNLpyi/IlMrXfVHr6kq3/zyV0GRHmqK/VF59pFCD+0KlQo+PfBjVq7GuW+uku/SfMDDA2sNBaLKsTBKm6cwj1WH0+Ac8t4FoHYFReA/hWvk4roBLtFdaG/x999/sgZCmIXUo1KA9iFqYiZD/QraPlIzCjo4Q2To8pVqxCWBitmazv8H7p6V6L0bor9g+Rr58yfVRPUzF4kWpC+TLMIWlasnjawMPUM+nE7no6ulNdjGGMs1hESr9FMxpf7A8T0bGrZarbj7bc9p5ikaDX1BcrRgLa4nTjbEDWc/Ni0Tpjvj1wAEyoCiH7W/QQgKEft8875chLKlE+55kur8tB1kaCg1aKBivOkjvM9Sl610weOe8fOTPnGZY0ZcChXtFCluSfEJKwO7o7yjUSrN1tSoAKiyod64zrnzE6Y401g7KS/0JfA+UQWWWUfB7MzeXlYPCn+nW0+n974JLUZLaujYlB4B7XPgCys57CV5shtDp8VOSrWMQ48lIHxSOhcNVRl9lEITB1CFuf82g95TVaHmPii+E3losQ+wcsWMOPXfO34d/Z2JPflPqkrj2iwTUGxGqCIxEDX0tRczCsGyHqlsm3dFrwStyW22uh1hxR1RgEoryPd00Z3mHUiCMShqSBt0lviruyrPSjs4DwryjySZiGCqtJuQLLr9axpKNBDVNhmt4FLawkbG8QO7A1IasgAhqHVkWan4Gln+B7dOREh2VAavwU7DeIxAsKlhTctvud+reG5ttzsFUE60kOdTWHBRp2C97Pm5cvtXBhqbd07uIM7Od MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 38655935-abbd-48fa-dbc9-08d7ed4d7d62 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Apr 2020 21:28:56.7190 (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: 7IbytaLbm7QO2Eh5QxvSe7dmha/pljOdVb0Rv7nHPLXTiEKgjMcO/g7XtGDE/nlP5SBPxCzc/mFz9RIudQiNS59CRl6TL4jezA9wt2nrpAM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3075 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 Hi Ashley, Please see comments inline. Thanks, Nate > -----Original Message----- > From: Desimone, Ashley E > Sent: Tuesday, April 28, 2020 2:57 PM > To: devel@edk2.groups.io > Cc: Desimone, Nathaniel L ; Pandya, Puja > ; Bjorge, Erik C ; Bret > Barkelew ; Agyeman, Prince > > Subject: [edk2-staging/EdkRepo] [PATCH 7/7] EdkRepo: Add the ability to > pull only the global manifest repository for a given workspace. >=20 > Add pull_workspace_man_repo() to pull only the global manifest repository > affiliated with a single workspace. >=20 > Signed-off-by: Ashley E Desimone > Cc: Nate DeSimone > Cc: Puja Pandya > Cc: Erik Bjorge > Cc: Bret Barkelew > Cc: Prince Agyeman > --- > .../manifest_repos_maintenance.py | 23 > ++++++++++++++++++++-- > 1 file changed, 21 insertions(+), 2 deletions(-) >=20 > diff --git > a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > b/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > index 7b3f866..7a7f946 100644 > --- > a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > +++ > b/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc > e.py > @@ -199,7 +199,7 @@ def find_project_in_all_indices (project, > edkrepo_cfg, edkrepo_user_cfg, except_ > return repo, 'edkrepo_user_cfg', os.path.join(di= rpath, project) >=20 >=20 > -def find_source_man_repo (project_manifest, edkrepo_cfg, > edkrepo_user_cfg): > +def find_source_man_repo(project_manifest, edkrepo_cfg, > edkrepo_user_cfg, man_repo=3DNone): > ''' > Finds the source manifest repo for a given project. > ''' > @@ -213,6 +213,25 @@ def find_source_man_repo (project_manifest, > edkrepo_cfg, edkrepo_user_cfg): >=20 > humble.SOURCE_MAN_REPO_NOT_FOUND.format(project_manifest.proje > ct_info.codename), > = man_repo=3DNone) > project_manifest.write_source_manifest_repo(src_man_repo) > - return src_man_repo > + return src_man_repo > + > +def pull_workspace_man_repo(project_manifest, edkrepo_cfg, > edkrepo_user_cfg, man_repo=3DNone, reset_hard=3DFalse): All the pre-existing EdkRepo code tends to spell out "manifest" please rena= me this function to "pull_workspace_man_repo()" > + ''' > + Pulls only the global manifest repo for the current workspace. > + ''' > + src_man_repo =3D find_source_man_repo(project_manifest, edkrepo_cfg, > edkrepo_user_cfg, man_repo) > + config_repos, user_config_repos, conflicts =3D > list_available_man_repos(edkrepo_cfg, edkrepo_user_cfg) > + if src_man_repo in config_repos: > + > pull_single_manifest_repo(edkrepo_cfg.get_manifest_repo_url(src_man_r > epo), > + edkrepo_cfg.get_manifest_repo_branch(s= rc_man_repo), > + > edkrepo_cfg.get_manifest_repo_local_path(src_man_repo), > + reset_hard) > + elif src_man_repo in user_config_repos: > + > pull_single_manifest_repo(edkrepo_user_cfg.get_manifest_repo_url(src_ > man_repo), > + > edkrepo_user_cfg.get_manifest_repo_branch(src_man_repo), > + > edkrepo_user_cfg.get_manifest_repo_local_path(src_man_repo), > + reset_hard) > + elif src_man_repo in conflicts: > + raise > +EdkrepoInvalidParametersException(humble.CONFLICT_NO_CLONE.format > (src_m > +an_repo)) >=20 >=20 > -- > 2.16.2.windows.1