diff options
| author | LaMont Jones <lamontjones@google.com> | 2022-04-07 18:14:46 +0000 |
|---|---|---|
| committer | LaMont Jones <lamontjones@google.com> | 2022-04-12 15:46:23 +0000 |
| commit | d56e2eb4216827284220fcc35af42e60b4faaea6 (patch) | |
| tree | 886d25de764ce3abe6978b639d1a715e2e7b6277 /subcmds/sync.py | |
| parent | d52ca421d52c75837d1614ec54549569f354b7ec (diff) | |
| download | git-repo-d56e2eb4216827284220fcc35af42e60b4faaea6.tar.gz | |
manifest_xml: use Superproject to hold XML contentv2.23
Always create Superproject when there is a <superproject> tag, and have
it hold the XML content, similar to how other manifest elements are
handled.
This also adds SetQuiet and SetPrintMessages to Superproject
consistent with manifest.SetUseLocalManifests.
Change-Id: I522bf3da542006575799f0640c67f7052704f266
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/334641
Reviewed-by: Mike Frysinger <vapier@google.com>
Reviewed-by: Raman Tenneti <rtenneti@google.com>
Tested-by: LaMont Jones <lamontjones@google.com>
Diffstat (limited to 'subcmds/sync.py')
| -rw-r--r-- | subcmds/sync.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py index 9e783205..4d0a5ec6 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
| @@ -304,12 +304,10 @@ later is required to fix a server side protocol bug. | |||
| 304 | Returns: | 304 | Returns: |
| 305 | Returns path to the overriding manifest file instead of None. | 305 | Returns path to the overriding manifest file instead of None. |
| 306 | """ | 306 | """ |
| 307 | superproject = self.manifest.superproject | ||
| 308 | superproject.SetQuiet(opt.quiet) | ||
| 307 | print_messages = git_superproject.PrintMessages(opt, self.manifest) | 309 | print_messages = git_superproject.PrintMessages(opt, self.manifest) |
| 308 | superproject = git_superproject.Superproject(self.manifest, | 310 | superproject.SetPrintMessages(print_messages) |
| 309 | self.repodir, | ||
| 310 | self.git_event_log, | ||
| 311 | quiet=opt.quiet, | ||
| 312 | print_messages=print_messages) | ||
| 313 | if opt.local_only: | 311 | if opt.local_only: |
| 314 | manifest_path = superproject.manifest_path | 312 | manifest_path = superproject.manifest_path |
| 315 | if manifest_path: | 313 | if manifest_path: |
| @@ -319,7 +317,8 @@ later is required to fix a server side protocol bug. | |||
| 319 | all_projects = self.GetProjects(args, | 317 | all_projects = self.GetProjects(args, |
| 320 | missing_ok=True, | 318 | missing_ok=True, |
| 321 | submodules_ok=opt.fetch_submodules) | 319 | submodules_ok=opt.fetch_submodules) |
| 322 | update_result = superproject.UpdateProjectsRevisionId(all_projects) | 320 | update_result = superproject.UpdateProjectsRevisionId( |
| 321 | all_projects, git_event_log=self.git_event_log) | ||
| 323 | manifest_path = update_result.manifest_path | 322 | manifest_path = update_result.manifest_path |
| 324 | superproject_logging_data['updatedrevisionid'] = bool(manifest_path) | 323 | superproject_logging_data['updatedrevisionid'] = bool(manifest_path) |
| 325 | if manifest_path: | 324 | if manifest_path: |
