From nobody Sun May 19 12:45:49 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+57884+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+57884+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587598162; cv=none; d=zohomail.com; s=zohoarc; b=hqeRLbYblygrBdZf+BCuIErYC83zYF8PxmDODlS4Y64h4N71VH8/D+WhAy22n1hozHhDBQjuEKOmFor7IwiAb53w2YEnYt3yqBdSZmJrb7F5NED69VEhbx+PfVqrB88CrGA3tOBIstiQy+lJKr0iRhYw3vRQtavC5dqo4qnZdwU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587598162; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=3DYEXMZouCi8pPD7dFaOYhjUvM3VVUGfRcxyUt9luHo=; b=YDiEQnfC5/SEFHau8T9p3NknCZWI77wEEw+khd/ZEa4v0xxEvIbsfwlNpgoliOh7EycCsXF+UDTTeEcnfiBFEAtb7/wneyGMuY+2mFB3T4PuSYZh1RXd7Rglr5CgpKi11yI3S8fpB1xmVmF8Xz4vm5RauaojePyCjMGpl3sO8Nw= 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+57884+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 1587598162831738.8268915504538; Wed, 22 Apr 2020 16:29:22 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id J1OxYY1788612x0e7fPoz23N; Wed, 22 Apr 2020 16:29:22 -0700 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.5377.1587598161246945471 for ; Wed, 22 Apr 2020 16:29:21 -0700 IronPort-SDR: jqM5t26akchRsc0vhFHNis4XjrPd6u+B/OKgzYOgFaskw0/YkLnPivq5dq/c6Kq5nDpfhz4Egy 2P3K2hHnQSCw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2020 16:29:20 -0700 IronPort-SDR: 7ZL7JOeSwFzHPH7rXYXPUmQjyD+yHbrBWV7uzFxmcNOsrKYhXurjy4aEr60K4QcPYwSGen7rMh bwlP5HJqBAwQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,304,1583222400"; d="scan'208";a="259238870" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga006.jf.intel.com with ESMTP; 22 Apr 2020 16:29:20 -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 V3 1/3] EdkRepo: Initial commit of workspace_maitenance.py Date: Wed, 22 Apr 2020 16:29:13 -0700 Message-Id: <20200422232915.18640-2-ashley.e.desimone@intel.com> In-Reply-To: <20200422232915.18640-1-ashley.e.desimone@intel.com> References: <20200422232915.18640-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: ObKLLK63sd1r0Hf7W4FHBXpEx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587598162; bh=nxe2Ik8RLymR5BUCcXZcWEeDJVxjS6Xdi1tx/cdHUFI=; h=Cc:Date:From:Reply-To:Subject:To; b=kFHhtgJoM5sthqQBlbqg4Cj6XydfCjyuYZOT3zNCmfvXaxPySDEYkIUgQ0bdhturRY2 0Ev0oo9ttElu1yGfAb1GmM5FYUmVBY27houTZwkGmk5+M0cAp3qqvuHQGS1tETd2rDyRf 9nXXX06qDagx6iKS08m6U2CWL9hm7oIWfyo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add workspace_maitenance.py including the implementation of generate_name_for_obsolete_backup() Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman --- .../workspace_maitenance/workspace_maitenance.py | 30 ++++++++++++++++++= ++++ 1 file changed, 30 insertions(+) create mode 100644 edkrepo/common/workspace_maitenance/workspace_maitenanc= e.py diff --git a/edkrepo/common/workspace_maitenance/workspace_maitenance.py b/= edkrepo/common/workspace_maitenance/workspace_maitenance.py new file mode 100644 index 0000000..83204f8 --- /dev/null +++ b/edkrepo/common/workspace_maitenance/workspace_maitenance.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python3 +# +## @file +# workspace_maitenance.py +# +# Copyright (c) 2017- 2020, Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +# + +''' Contains shared workspace maitenance functions. ''' + +import os + +def generate_name_for_obsolete_backup(absolute_path): + if not os.path.exists(absolute_path): + raise ValueError("{} does not exist".format(absolute_path)) + original_name =3D os.path.basename(absolute_path) + dir_name =3D os.path.dirname(absolute_path) + unique_name =3D "" + unique_name_found =3D False + index =3D 1 + while not unique_name_found: + if index =3D=3D 1: + unique_name =3D "{}_old".format(original_name) + else: + unique_name =3D "{}_old{}".format(original_name, index) + if not os.path.exists(os.path.join(dir_name, unique_name)): + unique_name_found =3D True + index +=3D 1 + return unique_name \ No newline at end of file --=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 (#57884): https://edk2.groups.io/g/devel/message/57884 Mute This Topic: https://groups.io/mt/73209016/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- From nobody Sun May 19 12:45:49 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+57886+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+57886+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587598163; cv=none; d=zohomail.com; s=zohoarc; b=lQ63iREX0EcsTafDiTQPzp6P6vfCH8QQNOAJcgewOUNEJ5Enr3ltFQH+ipT3JC8LOCP94nkpdCDpgZ0IfK1NmUIYk5bYAuN2oQcXSD4AWJifTHE3qqB6VA0LU+vyGvmQR3eeBbXiWrR2J1ZBl7WdYThBSVQiN8gal22AlFy0AWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587598163; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=OQbv7QGGBc9RszeA/TlhV6ryNuIgazaOiVivXgPgMFo=; b=EV+tVIot07Ozp6kUK4JLwcRdbrkhjRH/9T5hIJNQHYa68Ba3HWMuCxQrrvriU8f9uObXseeukslI3HQUEdFau1F+asL3kgXmgAlkgyvEmsEVon2CUMEPs/1Mybb6Xq6bl6kUYottK37TJxR1lxK407vs3lxm4rwok8VzcLoS16w= 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+57886+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 1587598163326334.98006062659715; Wed, 22 Apr 2020 16:29:23 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id aEoNYY1788612x1PqpgECSaj; Wed, 22 Apr 2020 16:29:22 -0700 X-Received: from mga03.intel.com (mga03.intel.com []) by mx.groups.io with SMTP id smtpd.web11.5377.1587598161246945471 for ; Wed, 22 Apr 2020 16:29:22 -0700 IronPort-SDR: MhD5gNyl8DtrZ7odcfcHClKRq027xXcSm8mM+dyO4XBOM98rixo6pG4xvjYyDiASHmjO9oKmjj hUt5CF6Ruetw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2020 16:29:20 -0700 IronPort-SDR: RVv3sRmUi7+/Be6h6fP2vheO7TIlwiWuccToyE3LsyCPeo6WuFzlSYConwyYzeRxParLOOm93d Dy02b1bxxanQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,304,1583222400"; d="scan'208";a="259238874" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga006.jf.intel.com with ESMTP; 22 Apr 2020 16:29:20 -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 V3 2/3] EdkRepo: Add edkrepo/common/workspace_maitenance/manifest_repos_maitenance Date: Wed, 22 Apr 2020 16:29:14 -0700 Message-Id: <20200422232915.18640-3-ashley.e.desimone@intel.com> In-Reply-To: <20200422232915.18640-1-ashley.e.desimone@intel.com> References: <20200422232915.18640-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: Eph52Cg4qQcBy3ItmSy0PMqEx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587598162; bh=vAbHVAPR+V0NSg0Jz4V5MF96NHgvOxzBFYx3FxKW1Qw=; h=Cc:Date:From:Reply-To:Subject:To; b=bsu6k6jCM1s9C4+BbgnBN0hSszFEhbU5BuVROlkiYorcB72ooiiJuFXh2M3gIRAQHdc s10HFifzHIgU4G50/ve1nF81xmEOjcFFHRwp57mYXpqiO5/1GfyfEwpu3UqhYy4JzboW6 YXhIGJtIxa5+GUKb8aCgJ3uXDUifC7qIR2o= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add a directory to edkrepo/common to store workspace maitenance functionatlity. Add edkrepo/common/workspace_matenance/humble directory to store related strings and included manifest_repos_maitenance_humble.py Add edkrepo/common/workspace_maitenance/manifest_repos_maitenance.py to support the maitenance of multiple manifest repositories. Added pull_single_manifest_repo() to manifest_repos_maitenance.py Updated setup.py to include the new directories. Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman --- .../humble/manifest_repos_maitenance_humble.py | 23 +++++++++ .../manifest_repos_maitenance.py | 59 ++++++++++++++++++= ++++ setup.py | 5 +- 3 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 edkrepo/common/workspace_maitenance/humble/manifest_rep= os_maitenance_humble.py create mode 100644 edkrepo/common/workspace_maitenance/manifest_repos_mait= enance.py diff --git a/edkrepo/common/workspace_maitenance/humble/manifest_repos_mait= enance_humble.py b/edkrepo/common/workspace_maitenance/humble/manifest_repo= s_maitenance_humble.py new file mode 100644 index 0000000..ee7b4bb --- /dev/null +++ b/edkrepo/common/workspace_maitenance/humble/manifest_repos_maitenance_= humble.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python3 +# +## @file +# manifest_repos_mgmt_humble.py +# +# Copyright (c) 2017- 2020, Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +# + +''' Contains user facing strings for manifest_repos_mgmt.py ''' + +from colorama import Fore +from colorama import Style + +CLONE_SINGLE_MAN_REPO =3D 'Cloning global manifest repository to: {} from:= {}' +SYNC_SINGLE_MAN_REPO =3D 'Syncing the global manifest repository: {}' +SINGLE_MAN_REPO_DIRTY =3D ('Uncommited changes present in the global manif= est ' + 'repository: {} Resolve these changes and attempt= your' + ' operation again.') +SINGLE_MAN_REPO_NOT_CFG_BRANCH =3D ('The current active branch, {}, is not= the ' + 'specified branch for global manifst rep= ository: {}') +SINGLE_MAN_REPO_CHECKOUT_CFG_BRANCH =3D 'Checking out the specified branch= : {} prior to syncing' +SINGLE_MAN_REPO_MOVED =3D '{}{}WARNING:{}{} The global manifest repository= has moved. Backing up previous global manifest repository to: {{}}{}\n'.fo= rmat(Style.BRIGHT, Fore.RED, Style.RESET_ALL, Fore.RED, Style.RESET_ALL) \ No newline at end of file diff --git a/edkrepo/common/workspace_maitenance/manifest_repos_maitenance.= py b/edkrepo/common/workspace_maitenance/manifest_repos_maitenance.py new file mode 100644 index 0000000..c70a413 --- /dev/null +++ b/edkrepo/common/workspace_maitenance/manifest_repos_maitenance.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python3 +# +## @file +# manifest_repos_mgmt.py +# +# Copyright (c) 2017- 2020, Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +# + +import os +import traceback +import shutil + +import git +from git import Repo + +import edkrepo.config.config_factory as cfg +from edkrepo.common.edkrepo_exception import EdkrepoUncommitedChangesExcep= tion +from edkrepo.common.progress_handler import GitProgressHandler +import edkrepo.common.workspace_maitenance.humble.manifest_repos_maitenanc= e_humble as humble +from edkrepo.common.workspace_maitenance.workspace_maitenance import gener= ate_name_for_obsolete_backup + + +def pull_single_manifest_repo(url, branch, local_path, reset_hard=3DFalse): + ''' + Clones or syncs a single global manifest repository as defined in eith= er + the edkrepo.cfg or the edkrepo_user.cfg + ''' + # If a relative path is used join to the edkrepo global data directory= path + if not os.path.isabs(local_path): + local_path =3D os.path.join(cfg.get_edkrepo_global_data_directory(= ), local_path) + # Clone the repository if it does not exist locally + if not os.path.exists(local_path): + print(humble.CLONE_SINGLE_MAN_REPO.format(local_path, url)) + repo =3D Repo.clone_from(url, local_path, progress=3DGitProgressHa= ndler(), branch=3Dbranch) + # Sync the repository if it exists locally + else: + repo =3D Repo(local_path) + if url in repo.remotes['origin'].urls: + if repo.is_dirty(untracked_files=3DTrue) and not reset_hard: + raise EdkrepoUncommitedChangesException(humble.SINGLE_MAN_= REPO_DIRTY.format(local_path)) + elif repo.is_dirty(untracked_files=3DTrue) and reset_hard: + repo.git.reset('--hard') + print(humble.SYNC_SINGLE_MAN_REPO.format(local_path)) + if repo.active_branch.name !=3D branch: + print(humble.SINGLE_MAN_REPO_NOT_CFG_BRANCH.format(repo.ac= tive_branch.name, local_path)) + print(humble.SINGLE_MAN_REPO_CHECKOUT_CFG_BRANCH.format(br= anch)) + repo.git.checkout(branch) + repo.remotes.origin.pull() + # If the URL specified for this manifest repo has moved back up th= e existing + # local copy and clone the new repository + else: + new_path =3D generate_name_for_obsolete_backup(local_path) + new_path =3D os.path.join(os.path.dirname(local_path), new_pat= h) + print(humble.SINGLE_MAN_REPO_MOVED.format(new_path)) + shutil.move(local_path, new_path) + print (humble.CLONE_SINGLE_MAN_REPO.format(local_path, url)) + repo =3D Repo.clone_from(url, local_path, progress=3DGitProgre= ssHandler(), branch=3Dbranch) + diff --git a/setup.py b/setup.py index 06a382b..f8bb0fc 100755 --- a/setup.py +++ b/setup.py @@ -12,8 +12,9 @@ setup(name=3D'edkrepo', version=3D'2.0.0', description=3D'The edkrepo tools', packages=3D['edkrepo', 'edkrepo.commands', 'edkrepo.commands.argumen= ts', 'edkrepo.commands.humble', - 'edkrepo.git_automation', 'edkrepo.common', 'edkrepo.confi= g', 'edkrepo.config.humble', - 'edkrepo_manifest_parser', 'project_utils'], + 'edkrepo.git_automation', 'edkrepo.common', 'edkrepo.commo= n.workspace_maitenance', + 'edkrepo.common.workspace_maitenance.humble', 'edkrepo.con= fig', 'edkrepo.config.humble', + 'edkrepo_manifest_parser', 'project_utils'], package_data=3D{ }, include_package_data=3DTrue, --=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 (#57886): https://edk2.groups.io/g/devel/message/57886 Mute This Topic: https://groups.io/mt/73209018/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- From nobody Sun May 19 12:45:49 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+57887+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+57887+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587598163; cv=none; d=zohomail.com; s=zohoarc; b=Ok+oeXrEoPBvaK+sqOuWeS8PzPNBIDWwoPMKJFTaRiOwfPqf08vie+M6B9O06975pa9luG5umsmFaBBDMe2zbx4RN+ZS4sOm0RWkBdYbXtPHVnQUDDDAUfh4jE/djYzveAlKk7EH08ghuzxmdFajV9hQ4zvbg5EdUJKCNeed/zE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587598163; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=hzEXlMahJefcVUnkY75wkB1gZDyM4skm+xNRE3TB23A=; b=c9wl1HD2QkGRQZAP6wn8JMBEkF+qGMIgW+9resM/ROjTpnXIKjFB/Hcw1P2xL35RYaPfwu+P2/AK/0xFkK1Vo4I01ZFcjG6aMT+7TPXzNZI7NpRoMkMH0bQIQmuZgauOR0zDcBJ2GDp5HU0WaJS5ISAt2Qqx5t20G5GTn98U9is= 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+57887+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 1587598163173759.5126380404621; Wed, 22 Apr 2020 16:29:23 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8FpPYY1788612xKzxcvNy2gJ; Wed, 22 Apr 2020 16:29:22 -0700 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.5379.1587598162302894222 for ; Wed, 22 Apr 2020 16:29:22 -0700 IronPort-SDR: uoWiG6AxXiBw+T3dOU33jDFKlmL2V1kjxaXGqbaJ8hxPe7Xz+gnfpeWDaw9Du+BCNbTiEKvjvj 6tEqUc8VcWhg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2020 16:29:20 -0700 IronPort-SDR: dqoSRIk/CKDD3WzgDUjKeBng04Wdf/L3wkGjC47wXpoM2xKY7V/ut0BK5mj7F2Xm8jFfSuQN2V MTYGRwVWascg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,304,1583222400"; d="scan'208";a="259238876" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga006.jf.intel.com with ESMTP; 22 Apr 2020 16:29:20 -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 V3 3/3] EdkRepo: Update pull_latest_manifest_repo to use pull_single_manifest_repo Date: Wed, 22 Apr 2020 16:29:15 -0700 Message-Id: <20200422232915.18640-4-ashley.e.desimone@intel.com> In-Reply-To: <20200422232915.18640-1-ashley.e.desimone@intel.com> References: <20200422232915.18640-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: 5cCIdwdSeo312ynVl1AKyOtGx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587598162; bh=z/eYqfMaRuUROELESlylWYWb/nUBrwf2Qs3RnjM0hHM=; h=Cc:Date:From:Reply-To:Subject:To; b=d3Fl4CGaFFPygf9VqrM2vkyvgdf2sTWic8hFaGaPOC0u6fKSfIHJgOr672l2eBsI2in 9nqGsUO9AeeevT4IQFYF44T0so0iWs5p2Okcn+ChJ2eXbFRGOqfzgg2Mm/RV6FGzQckoU AMwEAC5atbacxNcFNZ0TwSScEhboO2PWu8Y= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Updates the implementation for pull_latest_manifest_repo to call pull_single_manifest repo. Removes definitions of strings used by pull_latest_manifest_repo from common/humble.py and from the imports of common_repo_functions.py Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Nate DeSimone --- edkrepo/common/common_repo_functions.py | 33 ++++-------------------------= ---- edkrepo/common/humble.py | 8 -------- 2 files changed, 4 insertions(+), 37 deletions(-) diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/commo= n_repo_functions.py index 0d39291..39b192c 100644 --- a/edkrepo/common/common_repo_functions.py +++ b/edkrepo/common/common_repo_functions.py @@ -46,12 +46,10 @@ from edkrepo.common.humble import COMMIT_TEMPLATE_NOT_F= OUND, COMMIT_TEMPLATE_CUS from edkrepo.common.humble import ADD_PRIMARY_REMOTE, REMOVE_PRIMARY_REMOTE from edkrepo.common.humble import FETCH_PRIMARY_REMOTE, MIRROR_PRIMARY_SHA= , TAG_AND_BRANCH_SPECIFIED from edkrepo.common.humble import MIRROR_BEHIND_PRIMARY_REPO, HOOK_NOT_FOU= ND_ERROR, SUBMODULE_FAILURE -from edkrepo.common.humble import MANIFEST_REPO_DIRTY, MANIFEST_REPO_MOVED= , CLONING_MANIFEST_REPO, SYNCING_MANIFEST_REPO from edkrepo.common.humble import INCLUDED_URL_LINE, INCLUDED_INSTEAD_OF_L= INE, INCLUDED_FILE_NAME from edkrepo.common.humble import ERROR_WRITING_INCLUDE, MULTIPLE_SOURCE_A= TTRIBUTES_SPECIFIED from edkrepo.common.humble import VERIFY_GLOBAL, VERIFY_ARCHIVED, VERIFY_P= ROJ, VERIFY_PROJ_FAIL -from edkrepo.common.humble import VERIFY_PROJ_NOT_IN_INDEX, VERIFY_GLOBAL_= FAIL, MANIFEST_REPO_NOT_CONFIG_BRANCH -from edkrepo.common.humble import MANIFEST_REPO_CHECKOUT_CONFIG_BRANCH +from edkrepo.common.humble import VERIFY_PROJ_NOT_IN_INDEX, VERIFY_GLOBAL_= FAIL from edkrepo.common.pathfix import get_actual_path from project_utils.sparse import BuildInfo, process_sparse_checkout from edkrepo.config.config_factory import get_workspace_path @@ -61,6 +59,7 @@ from edkrepo_manifest_parser.edk_manifest import CiIndexX= ml, ManifestXml from edkrepo.common.edkrepo_exception import EdkrepoNotFoundException, Edk= repoGitException, EdkrepoWarningException from edkrepo.common.edkrepo_exception import EdkrepoFoundMultipleException= , EdkrepoHookNotFoundException from edkrepo.common.edkrepo_exception import EdkrepoGitConfigSetupExceptio= n, EdkrepoManifestInvalidException +from edkrepo.common.workspace_maitenance.manifest_repos_maitenance import = pull_single_manifest_repo from edkrepo.common.ui_functions import init_color_console from edkrepo_manifest_parser import edk_manifest from edkrepo_manifest_parser.edk_manifest_validation import validate_manif= estrepo @@ -77,32 +76,8 @@ def pull_latest_manifest_repo(args, config, reset_hard= =3DFalse): branch =3D config['cfg_file'].manifest_repo_branch local_path =3D config['cfg_file'].manifest_repo_local_path init_color_console(False) - if not (os.path.isabs(local_path)): - #since only a relative path was specified it must be joined to the= Edkrepo Application Data Directory - local_path =3D os.path.join(get_edkrepo_global_data_directory(), l= ocal_path) - if not os.path.exists(local_path): - print (CLONING_MANIFEST_REPO.format(local_path, repo_url)) - repo =3D Repo.clone_from(repo_url, local_path, progress=3DGitProgr= essHandler(), branch=3Dbranch) - else: - repo =3D Repo(local_path) - if repo_url in repo.remotes['origin'].urls: - if repo.is_dirty(untracked_files=3DTrue) and not reset_hard: - raise EdkrepoWarningException(MANIFEST_REPO_DIRTY) - elif repo.is_dirty(untracked_files=3DTrue) and reset_hard: - repo.git.reset('--hard') - print (SYNCING_MANIFEST_REPO) - if repo.active_branch.name !=3D branch: - print(MANIFEST_REPO_NOT_CONFIG_BRANCH.format(repo.active_b= ranch.name)) - print(MANIFEST_REPO_CHECKOUT_CONFIG_BRANCH.format(branch)) - repo.git.checkout(branch) - repo.remotes.origin.pull() - else: - new_path =3D generate_name_for_obsolete_backup(local_path) - new_path =3D os.path.join(os.path.dirname(local_path), new_pat= h) - print(MANIFEST_REPO_MOVED.format(new_path)) - shutil.move(local_path, new_path) - print (CLONING_MANIFEST_REPO.format(local_path, repo_url)) - repo =3D Repo.clone_from(repo_url, local_path, progress=3DGitP= rogressHandler(), branch=3Dbranch) + pull_single_manifest_repo(repo_url, branch, local_path, reset_hard) + =20 def clone_repos(args, workspace_dir, repos_to_clone, project_client_side_h= ooks, config, skip_submodule, manifest): for repo_to_clone in repos_to_clone: diff --git a/edkrepo/common/humble.py b/edkrepo/common/humble.py index 64b9519..8ca38bb 100644 --- a/edkrepo/common/humble.py +++ b/edkrepo/common/humble.py @@ -34,14 +34,6 @@ MULTIPLE_SOURCE_ATTRIBUTES_SPECIFIED =3D 'BRANCH or TAG = name present with COMMIT I TAG_AND_BRANCH_SPECIFIED =3D 'BRANCH AND TAG name present in combination f= ield for {} repo. Using TAG.\n' CHECKING_CONNECTION =3D 'Checking connection to remote url: {}\n' =20 -# Informational messages and warnings for pull_latest_manifest_repo() -MANIFEST_REPO_DIRTY =3D 'Uncommited changes present in the global manifest= repository. Run edkrepo update-manifest-repo --hard to revert these change= s and sync the global manifest repository.\n' -MANIFEST_REPO_MOVED =3D '{}{}WARNING:{}{} The Global manifest repository h= as moved. Backing up previous global manifest repository to: {{}}{}\n'.form= at(Style.BRIGHT, Fore.RED, Style.RESET_ALL, Fore.RED, Style.RESET_ALL) -CLONING_MANIFEST_REPO =3D 'Cloning global manifest repository to: {} from:= {}\n' -SYNCING_MANIFEST_REPO =3D 'Syncing the global manifest repository.\n' -MANIFEST_REPO_NOT_CONFIG_BRANCH =3D 'The current active branch, {}, is not= the specified manifest repository branch' -MANIFEST_REPO_CHECKOUT_CONFIG_BRANCH =3D 'Checking out the specified manif= est repository branch, {}, prior to syncing' - #Error messages for sync_command.py SYNC_EXIT =3D 'Exiting without performing sync operations.' SYNC_UNCOMMITED_CHANGES =3D UNCOMMITED_CHANGES + SYNC_EXIT --=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 (#57887): https://edk2.groups.io/g/devel/message/57887 Mute This Topic: https://groups.io/mt/73209019/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-