Skip to content

Alper/async checkout #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Alper/async checkout #72

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1350e0f
a first attempt to make submodues_update asynchronous
alperaltuntas Apr 29, 2025
2b4541a
Merge branch 'main' into alper/async_checkout
jedwards4b Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions git_fleximod/git_fleximod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import shutil
import logging
import textwrap
import asyncio
from git_fleximod import utils
from git_fleximod import cli
from git_fleximod.gitinterface import GitInterface
Expand Down Expand Up @@ -218,10 +219,10 @@ def git_toplevelroot(root_dir, logger):
_, superroot = rgit.git_operation("rev-parse", "--show-superproject-working-tree")
return superroot

def submodules_update(gitmodules, root_dir, requiredlist, force):
for name in gitmodules.sections():
async def submodules_update(gitmodules, root_dir, requiredlist, force):
async def update_submodule(name, requiredlist, force):
submod = init_submodule_from_gitmodules(gitmodules, name, root_dir, logger)

_, needsupdate, localmods, testfails = submod.status()
if not submod.fxrequired:
submod.fxrequired = "AlwaysRequired"
Expand All @@ -239,11 +240,11 @@ def submodules_update(gitmodules, root_dir, requiredlist, force):
if "Optional" in fxrequired and "Optional" not in requiredlist:
if fxrequired.startswith("Always"):
print(f"Skipping optional component {name:>20}")
continue
return # continue to next submodule
optional = "AlwaysOptional" in requiredlist

if fxrequired in requiredlist:
submod.update()
await asyncio.to_thread(submod.update)
repodir = os.path.join(root_dir, submod.path)
if os.path.exists(os.path.join(repodir, ".gitmodules")):
# recursively handle this checkout
Expand All @@ -252,7 +253,10 @@ def submodules_update(gitmodules, root_dir, requiredlist, force):
newrequiredlist = ["AlwaysRequired"]
if optional:
newrequiredlist.append("AlwaysOptional")
submodules_update(gitsubmodules, repodir, newrequiredlist, force=force)
await submodules_update(gitsubmodules, repodir, newrequiredlist, force=force)

tasks = [update_submodule(name, requiredlist, force) for name in gitmodules.sections()]
await asyncio.gather(*tasks)

def local_mods_output():
text = """\
Expand Down Expand Up @@ -346,7 +350,7 @@ def main():
sys.exit(f"No submodule components found, root_dir={root_dir}")
retval = 0
if action == "update":
submodules_update(gitmodules, root_dir, fxrequired, force)
asyncio.run(submodules_update(gitmodules, root_dir, fxrequired, force))
elif action == "status":
tfails, lmods, updates = submodules_status(gitmodules, root_dir, toplevel=True)
if tfails + lmods + updates > 0:
Expand Down