Tools/git-repo
1
0
Fork 0
Code Activity

Fix submodule initialization in interleaved sync mode

Browse source 
With the introduction of interleaved sync mode, the submodule
activation logic broke because the 'has_submodules' attribute
was no longer being populated when needed. With this change,
each submodule is initialized when it enters the Sync_LocalHalf
stage, whereas previously all submodules were initialized at
once when the parent repository entered the Sync_LocalHalf stage.

This change makes the submodule activation logic more robust and
less prone to breakage.

Change-Id: I25eca4ea2a6868219045cfa088988eb01ded47d2
This commit is contained in:
Kaushik Lingarkar 2025-09-10 17:07:35 -07:00
parent 80d1a5ad3e
commit 619ff0b697
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
project.py
View file

@ -642,10 +642,6 @@ class Project:
# project containing repo hooks. # project containing repo hooks.
self.enabled_repo_hooks = [] self.enabled_repo_hooks = []
# This will be updated later if the project has submodules and
# if they will be synced.
self.has_subprojects = False
def RelPath(self, local=True): def RelPath(self, local=True):
"""Return the path for the project relative to a manifest. """Return the path for the project relative to a manifest.
@ -1563,8 +1559,8 @@ class Project:
# TODO(https://git-scm.com/docs/git-worktree#_bugs): Re-evaluate if # TODO(https://git-scm.com/docs/git-worktree#_bugs): Re-evaluate if
# submodules can be init when using worktrees once its support is # submodules can be init when using worktrees once its support is
# complete. # complete.
if self.has_subprojects and not self.use_git_worktrees: if self.parent and not self.use_git_worktrees:
self._InitSubmodules() self._InitSubmodule()
all_refs = self.bare_ref.all all_refs = self.bare_ref.all
self.CleanPublishedCache(all_refs) self.CleanPublishedCache(all_refs)
revid = self.GetRevisionId(all_refs) revid = self.GetRevisionId(all_refs)
@ -2359,8 +2355,6 @@ class Project:
) )
result.append(subproject) result.append(subproject)
result.extend(subproject.GetDerivedSubprojects()) result.extend(subproject.GetDerivedSubprojects())
if result:
self.has_subprojects = True
return result return result
def EnableRepositoryExtension(self, key, value="true", version=1): def EnableRepositoryExtension(self, key, value="true", version=1):
@ -3026,14 +3020,22 @@ class Project:
project=self.name, project=self.name,
) )
def _InitSubmodules(self, quiet=True): def _InitSubmodule(self, quiet=True):
"""Initialize the submodules for the project.""" """Initialize the submodule."""
cmd = ["submodule", "init"] cmd = ["submodule", "init"]
if quiet: if quiet:
cmd.append("-q") cmd.append("-q")
if GitCommand(self, cmd).Wait() != 0: cmd.append(self.worktree)
if (
GitCommand(
None,
cmd,
cwd=self.parent.worktree,
).Wait()
!= 0
):
raise GitError( raise GitError(
f"{self.name} submodule init", f"{self.parent.name} submodule init {self.worktree}",
project=self.name, project=self.name,
) )