mirror of
https://github.com/Dev-Wiki/git-repo.git
synced 2025-09-26 18:42:14 +08:00
manifest_xml: use Superproject to hold XML content
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>
This commit is contained in:
@@ -25,7 +25,6 @@ from project import SyncBuffer
|
||||
from git_config import GitConfig
|
||||
from git_command import git_require, MIN_GIT_VERSION_SOFT, MIN_GIT_VERSION_HARD
|
||||
import fetch
|
||||
import git_superproject
|
||||
import platform_utils
|
||||
from wrapper import Wrapper
|
||||
|
||||
|
@@ -304,12 +304,10 @@ later is required to fix a server side protocol bug.
|
||||
Returns:
|
||||
Returns path to the overriding manifest file instead of None.
|
||||
"""
|
||||
superproject = self.manifest.superproject
|
||||
superproject.SetQuiet(opt.quiet)
|
||||
print_messages = git_superproject.PrintMessages(opt, self.manifest)
|
||||
superproject = git_superproject.Superproject(self.manifest,
|
||||
self.repodir,
|
||||
self.git_event_log,
|
||||
quiet=opt.quiet,
|
||||
print_messages=print_messages)
|
||||
superproject.SetPrintMessages(print_messages)
|
||||
if opt.local_only:
|
||||
manifest_path = superproject.manifest_path
|
||||
if manifest_path:
|
||||
@@ -319,7 +317,8 @@ later is required to fix a server side protocol bug.
|
||||
all_projects = self.GetProjects(args,
|
||||
missing_ok=True,
|
||||
submodules_ok=opt.fetch_submodules)
|
||||
update_result = superproject.UpdateProjectsRevisionId(all_projects)
|
||||
update_result = superproject.UpdateProjectsRevisionId(
|
||||
all_projects, git_event_log=self.git_event_log)
|
||||
manifest_path = update_result.manifest_path
|
||||
superproject_logging_data['updatedrevisionid'] = bool(manifest_path)
|
||||
if manifest_path:
|
||||
|
Reference in New Issue
Block a user