* [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct when a sparse reset is triggered during checkout
@ 2020-03-10 0:35 Desimone, Ashley E
2020-03-10 23:27 ` Nate DeSimone
0 siblings, 1 reply; 2+ messages in thread
From: Desimone, Ashley E @ 2020-03-10 0:35 UTC (permalink / raw)
To: devel; +Cc: Nate DeSimone, Puja Pandya, Erik Bjorge
Correct an error case in the checkout function defined in:
common/common_repo_functions.py where the need to perform a
sparse reset was not correctly calculated.
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>
---
edkrepo/common/common_repo_functions.py | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/common_repo_functions.py
index d857d09..b9c28e6 100644
--- a/edkrepo/common/common_repo_functions.py
+++ b/edkrepo/common/common_repo_functions.py
@@ -571,13 +571,22 @@ def checkout(combination_or_sha, verbose=False, override=False, log=None):
# Disable sparse checkout
current_repos = initial_repo_sources
sparse_enabled = sparse_checkout_enabled(workspace_path, initial_repo_sources)
+ sparse_diff = False
+ for source in initial_repo_sources:
+ for src in repo_sources:
+ if source.root == src.root:
+ if source.sparse != src.sparse:
+ sparse_diff = True
+ if sparse_diff:
+ break
# Sparse checkout only needs to be recomputed if
# the dynamic sparse list is being used instead of the static sparse list
+ # or the sparse settings between two combinations differ
if sparse_enabled:
sparse_settings = manifest.sparse_settings
if sparse_settings is not None:
sparse_enabled = False
- if sparse_enabled:
+ if sparse_enabled or sparse_diff:
print(SPARSE_RESET)
reset_sparse_checkout(workspace_path, current_repos)
@@ -595,7 +604,7 @@ def checkout(combination_or_sha, verbose=False, override=False, log=None):
# Return to the initial combo, since there was an issue with cheking out the selected combo
checkout_repos(verbose, override, initial_repo_sources, workspace_path, manifest)
finally:
- if sparse_enabled:
+ if sparse_enabled or sparse_diff:
print(SPARSE_CHECKOUT)
sparse_checkout(workspace_path, current_repos, manifest)
--
2.16.2.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct when a sparse reset is triggered during checkout
2020-03-10 0:35 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct when a sparse reset is triggered during checkout Desimone, Ashley E
@ 2020-03-10 23:27 ` Nate DeSimone
0 siblings, 0 replies; 2+ messages in thread
From: Nate DeSimone @ 2020-03-10 23:27 UTC (permalink / raw)
To: Desimone, Ashley E, devel@edk2.groups.io; +Cc: Pandya, Puja, Bjorge, Erik C
Please update copyright year on common_repo_functions.py
With that change... Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
-----Original Message-----
From: Desimone, Ashley E <ashley.e.desimone@intel.com>
Sent: Monday, March 9, 2020 5:36 PM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bjorge, Erik C <erik.c.bjorge@intel.com>
Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct when a sparse reset is triggered during checkout
Correct an error case in the checkout function defined in:
common/common_repo_functions.py where the need to perform a sparse reset was not correctly calculated.
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>
---
edkrepo/common/common_repo_functions.py | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/common_repo_functions.py
index d857d09..b9c28e6 100644
--- a/edkrepo/common/common_repo_functions.py
+++ b/edkrepo/common/common_repo_functions.py
@@ -571,13 +571,22 @@ def checkout(combination_or_sha, verbose=False, override=False, log=None):
# Disable sparse checkout
current_repos = initial_repo_sources
sparse_enabled = sparse_checkout_enabled(workspace_path, initial_repo_sources)
+ sparse_diff = False
+ for source in initial_repo_sources:
+ for src in repo_sources:
+ if source.root == src.root:
+ if source.sparse != src.sparse:
+ sparse_diff = True
+ if sparse_diff:
+ break
# Sparse checkout only needs to be recomputed if
# the dynamic sparse list is being used instead of the static sparse list
+ # or the sparse settings between two combinations differ
if sparse_enabled:
sparse_settings = manifest.sparse_settings
if sparse_settings is not None:
sparse_enabled = False
- if sparse_enabled:
+ if sparse_enabled or sparse_diff:
print(SPARSE_RESET)
reset_sparse_checkout(workspace_path, current_repos)
@@ -595,7 +604,7 @@ def checkout(combination_or_sha, verbose=False, override=False, log=None):
# Return to the initial combo, since there was an issue with cheking out the selected combo
checkout_repos(verbose, override, initial_repo_sources, workspace_path, manifest)
finally:
- if sparse_enabled:
+ if sparse_enabled or sparse_diff:
print(SPARSE_CHECKOUT)
sparse_checkout(workspace_path, current_repos, manifest)
--
2.16.2.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-10 23:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-10 0:35 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Correct when a sparse reset is triggered during checkout Desimone, Ashley E
2020-03-10 23:27 ` Nate DeSimone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox