mirror of
https://gerrit.googlesource.com/git-repo
synced 2026-10-21 12:48:28 +00:00
sync: record superproject sync analysis state again
Since the multi-manifest change (bdcba7d), _UpdateProjectsRevisionId rebinds its superproject_logging_data parameter to a new local dict. The caller keeps its own empty dict and passes it to UpdateSyncAnalysisState, so repo.syncstate.superproject.* is never written to the manifest config or logged to trace2. Drop the rebinding so the caller's dict is populated. Also record superproject, haslocalmanifests and hassuperprojecttag when no manifest declares a superproject. Beforebdcba7dthese keys were logged on every sync. SyncAnalysisState does not remove old keys, so without this a checkout that moves to a manifest without a superproject keeps reporting the values from its last superproject sync. Bug: 565957530 Test: ./run_tests Change-Id: I8796e3a34b9cf4786383d25ecc3ebf0c5409caa3 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/634843 Reviewed-by: Gavin Mak <gavinmak@google.com> Commit-Queue: Ram Peri <ramperi@google.com> Tested-by: Ram Peri <ramperi@google.com>
This commit is contained in:
1 parent
cc0546bc71
commit
cf499e312a
2 files changed
+71
-1
No files matched your search
+5
-1
@@ -858,6 +858,11 @@ later is required to fix a server side protocol bug.
|
||||
m.superproject for m in manifest.all_children
|
||||
)
|
||||
if not have_superproject:
|
||||
superproject_logging_data.update(
|
||||
superproject=False,
|
||||
haslocalmanifests=bool(manifest.HasLocalManifests),
|
||||
hassuperprojecttag=False,
|
||||
)
|
||||
return
|
||||
|
||||
if opt.local_only and manifest.superproject:
|
||||
@@ -882,7 +887,6 @@ later is required to fix a server side protocol bug.
|
||||
for p in all_projects:
|
||||
per_manifest[p.manifest.path_prefix].append(p)
|
||||
|
||||
superproject_logging_data = {}
|
||||
need_unload = False
|
||||
for m in self.ManifestList(opt):
|
||||
if m.path_prefix not in per_manifest:
|
||||
|
||||
Reference in new issue
Block a user