From: "Ashley E Desimone" <ashley.e.desimone@intel.com>
To: devel@edk2.groups.io
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>,
Puja Pandya <puja.pandya@intel.com>,
Erik Bjorge <erik.c.bjorge@intel.com>,
Bret Barkelew <Bret.Barkelew@microsoft.com>,
Prince Agyeman <prince.agyeman@intel.com>
Subject: [edk2-staging/EdkRepo] [PATCH 4/7] EdkRepo: Add list_available_manifest_repos()
Date: Tue, 28 Apr 2020 14:57:07 -0700 [thread overview]
Message-ID: <20200428215710.45504-5-ashley.e.desimone@intel.com> (raw)
In-Reply-To: <20200428215710.45504-1-ashley.e.desimone@intel.com>
Add the ability to calculate a list of available
manifest repositories from the contents of the
edkrepo.cfg and the edkrepo_user.cfg files.
Signed-off-by: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
---
.../manifest_repos_maintenance.py | 53 ++++++++++++++--------
1 file changed, 34 insertions(+), 19 deletions(-)
diff --git a/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py
index 24ad76a..4bded46 100644
--- a/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py
+++ b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py
@@ -64,25 +64,10 @@ def pull_all_manifest_repos(edkrepo_cfg, edkrepo_user_cfg, reset_hard=False):
'''
cfg_man_repos = []
user_cfg_man_repos = []
- conflicts, duplicates = detect_man_repo_conflicts_duplicates(edkrepo_cfg, edkrepo_user_cfg)
- if not conflicts and not duplicates:
- cfg_man_repos.extend(edkrepo_cfg.manifest_repo_list)
- user_cfg_man_repos.extend(edkrepo_user_cfg.manifest_repo_list)
- elif conflicts:
- for conflict in conflicts:
- # In the case of a conflict do not pull conflicting repo
- print(humble.CONFLICT_NO_CLONE.format(conflict))
- cfg_man_repos.extend(edkrepo_cfg.manifest_repo_list)
- cfg_man_repos.remove(conflict)
- user_cfg_man_repos.extend(edkrepo_user_cfg.manifest_repo_list)
- user_cfg_man_repos.remove(conflict)
- elif duplicates:
- for duplicate in duplicates:
- # the duplicate needs to be ignored in on of the repo lists so it is
- # not cloned/pulled twice
- cfg_man_repos.extend(edkrepo_cfg.manifest_repo_list)
- user_cfg_man_repos.extend(edkrepo_user_cfg.manifest_repo_list)
- user_cfg_man_repos.remove(conflict)
+ conflicts = []
+ cfg_man_repos, user_cfg_man_repos, conflicts = list_available_man_repos(edkrepo_cfg, edkrepo_user_cfg)
+ for conflict in conflicts:
+ print(humble.CONFLICT_NO_CLONE.format(conflict))
for repo in cfg_man_repos:
pull_single_manifest_repo(edkrepo_cfg.get_manifest_repo_url(repo),
edkrepo_cfg.get_manifest_repo_branch(repo),
@@ -120,3 +105,33 @@ def detect_man_repo_conflicts_duplicates(edkrepo_cfg, edkrepo_user_cfg):
else:
duplicates.append(repo)
return conflicts, duplicates
+
+def list_available_man_repos(edkrepo_cfg, edkrepo_user_cfg):
+ '''
+ Checks for conflicts/duplicates within all manifest repositories defined in
+ both the edkrepo.cfg and the edkrepo_user.cfg and resturns a list of available
+ manifest_repos for each and a list of conflicting manifest repository entries.
+ '''
+ cfg_man_repos = []
+ user_cfg_man_repos = []
+ conflicts, duplicates = detect_man_repo_conflicts_duplicates(edkrepo_cfg, edkrepo_user_cfg)
+ if not conflicts and not duplicates:
+ cfg_man_repos.extend(edkrepo_cfg.manifest_repo_list)
+ user_cfg_man_repos.extend(edkrepo_user_cfg.manifest_repo_list)
+ elif conflicts:
+ for conflict in conflicts:
+ # In the case of a conflict do not pull conflicting repo
+ cfg_man_repos.extend(edkrepo_cfg.manifest_repo_list)
+ cfg_man_repos.remove(conflict)
+ user_cfg_man_repos.extend(edkrepo_user_cfg.manifest_repo_list)
+ user_cfg_man_repos.remove(conflict)
+ elif duplicates:
+ for duplicate in duplicates:
+ # the duplicate needs to be ignored in on of the repo lists so it is
+ # not cloned/pulled twice
+ cfg_man_repos.extend(edkrepo_cfg.manifest_repo_list)
+ user_cfg_man_repos.extend(edkrepo_user_cfg.manifest_repo_list)
+ user_cfg_man_repos.remove(duplicate)
+ return cfg_man_repos, user_cfg_man_repos, conflicts
+
+
--
2.16.2.windows.1
next prev parent reply other threads:[~2020-04-28 21:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 21:57 [edk2-staging/EdkRepo] [PATCH 0/7] Support for consuming multiple manifest repositories Ashley E Desimone
2020-04-28 21:57 ` [edk2-staging/EdkRepo] [PATCH 1/7] EdkRepo: Add check for conflicting/duplicated manifest repo definitions Ashley E Desimone
2020-04-30 21:28 ` [edk2-devel] " Nate DeSimone
2020-04-28 21:57 ` [edk2-staging/EdkRepo] [PATCH 2/7] EdkRepo: Add downloading all available manifest repositories Ashley E Desimone
2020-04-30 21:28 ` [edk2-devel] " Nate DeSimone
2020-04-28 21:57 ` [edk2-staging/EdkRepo] [PATCH 3/7] EdkRepo: Add optional field to edkrepo_manifst to track the source manifest repo Ashley E Desimone
2020-04-30 21:28 ` Nate DeSimone
2020-04-28 21:57 ` Ashley E Desimone [this message]
2020-04-30 21:28 ` [edk2-staging/EdkRepo] [PATCH 4/7] EdkRepo: Add list_available_manifest_repos() Nate DeSimone
2020-04-28 21:57 ` [edk2-staging/EdkRepo] [PATCH 5/7] EdkRepo: Add ability to find projects across all manifest repositories Ashley E Desimone
2020-04-30 21:28 ` Nate DeSimone
2020-04-30 21:40 ` Bjorge, Erik C
2020-04-30 22:07 ` Nate DeSimone
2020-04-28 21:57 ` [edk2-staging/EdkRepo] [PATCH 6/7] EdkRepo: Add ability to determine the source manifest of a workspace Ashley E Desimone
2020-04-30 21:28 ` Nate DeSimone
2020-04-28 21:57 ` [edk2-staging/EdkRepo] [PATCH 7/7] EdkRepo: Add the ability to pull only the global manifest repository for a given workspace Ashley E Desimone
2020-04-30 21:28 ` Nate DeSimone
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200428215710.45504-5-ashley.e.desimone@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox