android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync: Sync submodules correctly again

Browse Source 
Commit b4429439 (sync: refactor main fetch loop) broke syncing of
submodules with sync-s="true". The first `repo sync` would just fetch
the superrepo, while the second `repo sync` would fetch the submodules.
This was due to the new _FetchMain() function not passing back the
all_projects variable that it had modified.

Change-Id: Ie8187cde7bb894e4e9a6b76c2aed83873d9f69a4
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/307065
Reviewed-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Peter Kjellerstedt 2021-05-19 19:37:23 +02:00 committed by Mike Frysinger
parent b16b9d26bd
commit d177609cb0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
subcmds/sync.py
View File

@ -469,11 +469,14 @@ later is required to fix a server side protocol bug.
Args: Args:
opt: Program options returned from optparse. See _Options(). opt: Program options returned from optparse. See _Options().
args: Command line args used to filter out projects. args: Command line args used to filter out projects.
all_projects: List of all projects that should be checked out. all_projects: List of all projects that should be fetched.
err_event: Whether an error was hit while processing. err_event: Whether an error was hit while processing.
manifest_name: Manifest file to be reloaded. manifest_name: Manifest file to be reloaded.
load_local_manifests: Whether to load local manifests. load_local_manifests: Whether to load local manifests.
ssh_proxy: SSH manager for clients & masters. ssh_proxy: SSH manager for clients & masters.
Returns:
List of all projects that should be checked out.
""" """
rp = self.manifest.repoProject rp = self.manifest.repoProject
@ -520,6 +523,8 @@ later is required to fix a server side protocol bug.
err_event.set() err_event.set()
fetched.update(new_fetched) fetched.update(new_fetched)
return all_projects
def _CheckoutOne(self, detach_head, force_sync, project): def _CheckoutOne(self, detach_head, force_sync, project):
"""Checkout work tree for one project """Checkout work tree for one project
@ -1006,8 +1011,9 @@ later is required to fix a server side protocol bug.
with ssh.ProxyManager(manager) as ssh_proxy: with ssh.ProxyManager(manager) as ssh_proxy:
# Initialize the socket dir once in the parent. # Initialize the socket dir once in the parent.
ssh_proxy.sock() ssh_proxy.sock()
self._FetchMain(opt, args, all_projects, err_event, manifest_name, all_projects = self._FetchMain(opt, args, all_projects, err_event,
load_local_manifests, ssh_proxy) manifest_name, load_local_manifests,
ssh_proxy)
if opt.network_only: if opt.network_only:
return return