From nobody Sat May 4 07:51:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+58755+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58755+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588803776; cv=none; d=zohomail.com; s=zohoarc; b=ekOQ05EFWGzcB7Wjr+5G6TzY5ljobrk9Ac1idlRjjyc+16gknAASaoEoOhPSCepjRc+bhkgoOTbriptvc5aQovG3tVtZ4iMqSAVIMotmBTUF7LLhsDJxSOgWGNmXaRFIqEbIjTUJuAcq0848aT7s5R2TX4CWjSEg/MLbooQx6O8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588803776; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=Dz41fW+Dn/ULqUMDZtkipcecX5kxurfsHHRjGwDw1B4=; b=W47WCMt2RmG5/EUe1+acSyR6pdSr3wKQXlHLJGt/YCY9Vk9s7gbbeZRubYrTR8mdBKiblC7B3IyPFnrx7kf2++4eL7JJC6i+OJ9AFuHXU+bgOaN1aowcmVfj2bLnY+V5c0XfpZBLWpsghapF3gGftZihzxKwTNZLzcoVeuO+j2Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58755+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1588803776963522.2255648992707; Wed, 6 May 2020 15:22:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id TId1YY1788612xTz8eVqRNTo; Wed, 06 May 2020 15:22:56 -0700 X-Received: from mga17.intel.com (mga17.intel.com []) by mx.groups.io with SMTP id smtpd.web10.426.1588803774709240474 for ; Wed, 06 May 2020 15:22:54 -0700 IronPort-SDR: +nPBz+NYmTHfuqUHCI7X9+hbKD/BS6yDi/1tHwDsBTLYU8N9AwN4h493w5KJaRwMsPwP6dt952 /RH0Dm8bdYuA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2020 15:22:53 -0700 IronPort-SDR: r9nhSWXuteqDxmXYLCWNxf/zqBt0pnR76elqu098jOBWuHVeU8aWdUEkC3Trk+3oFQjilqljRD ioLSMPz821qA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,360,1583222400"; d="scan'208";a="284783856" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.254.1.73]) by fmsmga004.fm.intel.com with ESMTP; 06 May 2020 15:22:53 -0700 From: "Ashley E Desimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Update Create-Pin to be support multiple manifest repositories Date: Wed, 6 May 2020 15:22:49 -0700 Message-Id: <20200506222249.19028-2-ashley.e.desimone@intel.com> In-Reply-To: <20200506222249.19028-1-ashley.e.desimone@intel.com> References: <20200506222249.19028-1-ashley.e.desimone@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashley.e.desimone@intel.com X-Gm-Message-State: xEzBod8dsnnF2GQsFJB8JRrfx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588803776; bh=i1Du8DqEqQ+U6y9Xqi3s9PIzWIG+H3/P7j7NuWLuEeM=; h=Cc:Date:From:Reply-To:Subject:To; b=BXffgkFSfYoLlOhocExbOhP+yaF/MFXMAUooBYW/2XW0NQHtUAvr9zBf8Aza55rD5NZ G1XlQCacbVwwcR0Z+soRSoEgFLuISllcbTeEh2azfyspdmR+dq3oCc4bxIpQY8cuUJucu A43mgBSRyRj8sRufQpeTq3OlNxi4MMWbACU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Update the create pin command to select and interact with only the workspaces source manifest repository. Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman --- edkrepo/commands/create_pin_command.py | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/edkrepo/commands/create_pin_command.py b/edkrepo/commands/crea= te_pin_command.py index f8618e5..5b77649 100644 --- a/edkrepo/commands/create_pin_command.py +++ b/edkrepo/commands/create_pin_command.py @@ -12,14 +12,16 @@ from collections import namedtuple =20 from git import Repo =20 -from edkrepo.commands.edkrepo_command import EdkrepoCommand +from edkrepo.commands.edkrepo_command import EdkrepoCommand, SourceManifes= tRepoArgument import edkrepo.commands.arguments.create_pin_args as arguments -from edkrepo.common.common_repo_functions import pull_latest_manifest_repo from edkrepo.common.edkrepo_exception import EdkrepoManifestInvalidExcepti= on, EdkrepoInvalidParametersException from edkrepo.common.edkrepo_exception import EdkrepoWorkspaceCorruptExcept= ion from edkrepo.common.humble import WRITING_PIN_FILE, GENERATING_PIN_DATA, G= ENERATING_REPO_DATA, BRANCH, COMMIT from edkrepo.common.humble import COMMIT_MESSAGE, PIN_PATH_NOT_PRESENT, PI= N_FILE_ALREADY_EXISTS, PATH_AND_FILEPATH_USED from edkrepo.common.humble import MISSING_REPO +from edkrepo.common.workspace_maintenance.manifest_repos_maintenance impor= t find_project_in_all_indices +from edkrepo.common.workspace_maintenance.manifest_repos_maintenance impor= t pull_workspace_manifest_repo +from edkrepo.common.workspace_maintenance.humble.manifest_repos_maintenanc= e_humble import PROJ_NOT_IN_REPO, SOURCE_MANIFEST_REPO_NOT_FOUND from edkrepo.config.config_factory import get_workspace_manifest, get_work= space_path from edkrepo_manifest_parser.edk_manifest import ManifestXml =20 @@ -49,6 +51,7 @@ class CreatePinCommand(EdkrepoCommand): 'positional': False, 'required': False, 'help-text': arguments.PUSH_HELP}) + args.append(SourceManifestRepoArgument) return metadata =20 def run_command(self, args, config): @@ -56,14 +59,25 @@ class CreatePinCommand(EdkrepoCommand): if args.push and os.path.dirname(args.PinFileName): raise EdkrepoInvalidParametersException(PATH_AND_FILEPATH_USED) =20 - pull_latest_manifest_repo(args, config) workspace_path =3D get_workspace_path() manifest =3D get_workspace_manifest() =20 + manifest_repo, cfg, manifest_repo_path =3D find_project_in_all_ind= ices(manifest.project_info.codename, + = config['cfg_file'], + = config['user_cfg_file'], + = PROJ_NOT_IN_REPO.format(manifest.project_info.codename), + = SOURCE_MANIFEST_REPO_NOT_FOUND.format(manifest.project_info.code= name), + = args.source_manifest_repo) + pull_workspace_manifest_repo(manifest, config['cfg_file'], config[= 'user_cfg_file'], args.source_manifest_repo, False) + + if 'user' not in cfg: + manifest_repo_path =3D config['cfg_file'].manifest_repo_abs_pa= th(manifest_repo) + else: + manifest_repo_path =3D config['user_cfg_file'].manifest_repo_a= bs_path(manifest_repo) # If the push flag is enabled use general_config.pin_path to deter= mine global manifest relative location to save # pin file to. if args.push and manifest.general_config.pin_path is not None: - pin_dir =3D os.path.join(config['cfg_file'].manifest_repo_abs_= local_path, os.path.normpath(manifest.general_config.pin_path)) + pin_dir =3D os.path.join(manifest_repo_path, os.path.normpath(= manifest.general_config.pin_path)) pin_file_name =3D os.path.join(pin_dir, args.PinFileName) elif args.push and manifest.general_config.pin_path is None: raise EdkrepoManifestInvalidException(PIN_PATH_NOT_PRESENT) @@ -104,7 +118,7 @@ class CreatePinCommand(EdkrepoCommand): =20 # commit and push the pin file if args.push: - manifest_repo =3D Repo(config['cfg_file'].manifest_repo_abs_lo= cal_path) + manifest_repo =3D Repo(manifest_repo_path) # Create a local branch with the same name as the pin file arg= and check it out before attempting the push # to master master_branch =3D manifest_repo.active_branch @@ -124,4 +138,4 @@ class CreatePinCommand(EdkrepoCommand): manifest_repo.git.push('origin', 'HEAD:master') finally: manifest_repo.heads[master_branch.name].checkout() - manifest_repo.delete_head(local_branch, '-D') \ No newline at end of file + manifest_repo.delete_head(local_branch, '-D') --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#58755): https://edk2.groups.io/g/devel/message/58755 Mute This Topic: https://groups.io/mt/74039562/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-