From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web12.2171.1587683401614848289 for ; Thu, 23 Apr 2020 16:10:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: f9Rdd727jhkIvpOCKUbFdlODee5XGEDxpgJgvQJf6fXrROBfTFM+forS36f2aiuY6sYCUffPJ9 vP03DTRaDHdg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2020 16:10:00 -0700 IronPort-SDR: xte+dSUNbGLOK9ztfCFcByMekChNpafqf324F5k7z6T/yEEMbV34tJ9NsWZ7hVmJJbj6iTQ919 btN4mwu5OgBA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,309,1583222400"; d="scan'208";a="430533038" Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga005.jf.intel.com with ESMTP; 23 Apr 2020 16:10:00 -0700 From: "Ashley E Desimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew , Prince Agyeman Subject: [edk2-staging/EdkRepo] [PATCH V5 3/3] EdkRepo: Update pull_latest_manifest_repo to use pull_single_manifest_repo Date: Thu, 23 Apr 2020 16:09:57 -0700 Message-Id: <20200423230957.38936-4-ashley.e.desimone@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20200423230957.38936-1-ashley.e.desimone@intel.com> References: <20200423230957.38936-1-ashley.e.desimone@intel.com> 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 --- 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/common_repo_functions.py index 0d39291..2aa5f5f 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_FOUND, 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_FOUND_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_LINE, INCLUDED_FILE_NAME from edkrepo.common.humble import ERROR_WRITING_INCLUDE, MULTIPLE_SOURCE_ATTRIBUTES_SPECIFIED from edkrepo.common.humble import VERIFY_GLOBAL, VERIFY_ARCHIVED, VERIFY_PROJ, 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 CiIndexXml, ManifestXml from edkrepo.common.edkrepo_exception import EdkrepoNotFoundException, EdkrepoGitException, EdkrepoWarningException from edkrepo.common.edkrepo_exception import EdkrepoFoundMultipleException, EdkrepoHookNotFoundException from edkrepo.common.edkrepo_exception import EdkrepoGitConfigSetupException, EdkrepoManifestInvalidException +from edkrepo.common.workspace_maintenance.manifest_repos_maintenance 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_manifestrepo @@ -77,32 +76,8 @@ def pull_latest_manifest_repo(args, config, reset_hard=False): branch = config['cfg_file'].manifest_repo_branch local_path = 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 = os.path.join(get_edkrepo_global_data_directory(), local_path) - if not os.path.exists(local_path): - print (CLONING_MANIFEST_REPO.format(local_path, repo_url)) - repo = Repo.clone_from(repo_url, local_path, progress=GitProgressHandler(), branch=branch) - else: - repo = Repo(local_path) - if repo_url in repo.remotes['origin'].urls: - if repo.is_dirty(untracked_files=True) and not reset_hard: - raise EdkrepoWarningException(MANIFEST_REPO_DIRTY) - elif repo.is_dirty(untracked_files=True) and reset_hard: - repo.git.reset('--hard') - print (SYNCING_MANIFEST_REPO) - if repo.active_branch.name != branch: - print(MANIFEST_REPO_NOT_CONFIG_BRANCH.format(repo.active_branch.name)) - print(MANIFEST_REPO_CHECKOUT_CONFIG_BRANCH.format(branch)) - repo.git.checkout(branch) - repo.remotes.origin.pull() - else: - new_path = generate_name_for_obsolete_backup(local_path) - new_path = os.path.join(os.path.dirname(local_path), new_path) - print(MANIFEST_REPO_MOVED.format(new_path)) - shutil.move(local_path, new_path) - print (CLONING_MANIFEST_REPO.format(local_path, repo_url)) - repo = Repo.clone_from(repo_url, local_path, progress=GitProgressHandler(), branch=branch) + pull_single_manifest_repo(repo_url, branch, local_path, reset_hard) + def clone_repos(args, workspace_dir, repos_to_clone, project_client_side_hooks, 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 = 'BRANCH or TAG name present with COMMIT I TAG_AND_BRANCH_SPECIFIED = 'BRANCH AND TAG name present in combination field for {} repo. Using TAG.\n' CHECKING_CONNECTION = 'Checking connection to remote url: {}\n' -# Informational messages and warnings for pull_latest_manifest_repo() -MANIFEST_REPO_DIRTY = 'Uncommited changes present in the global manifest repository. Run edkrepo update-manifest-repo --hard to revert these changes and sync the global manifest repository.\n' -MANIFEST_REPO_MOVED = '{}{}WARNING:{}{} The Global manifest repository has moved. Backing up previous global manifest repository to: {{}}{}\n'.format(Style.BRIGHT, Fore.RED, Style.RESET_ALL, Fore.RED, Style.RESET_ALL) -CLONING_MANIFEST_REPO = 'Cloning global manifest repository to: {} from: {}\n' -SYNCING_MANIFEST_REPO = 'Syncing the global manifest repository.\n' -MANIFEST_REPO_NOT_CONFIG_BRANCH = 'The current active branch, {}, is not the specified manifest repository branch' -MANIFEST_REPO_CHECKOUT_CONFIG_BRANCH = 'Checking out the specified manifest repository branch, {}, prior to syncing' - #Error messages for sync_command.py SYNC_EXIT = 'Exiting without performing sync operations.' SYNC_UNCOMMITED_CHANGES = UNCOMMITED_CHANGES + SYNC_EXIT -- 2.16.2.windows.1