From 78f4dd3138b774dfea9d789d7324b8857f5a1a58 Mon Sep 17 00:00:00 2001 From: Raman Tenneti Date: Mon, 7 Jun 2021 13:27:37 -0700 Subject: superproject: add projects from local manifest to local:: group. With repo sync --use-superproject, don't update the commit ids of every project that comes from local manifest. Tested the code with the following commands. $ ./run_tests -v + Test with local.xml 1. repo init --use-superproject -u persistent-https://googleplex-android.git.corp.google.com/a/platform/manifest 2. cd .repo cp -r /google/src/head/depot/google3/wireless/android/build_tools/translations/pipeline/local_manifests local_manifests cd .. local$ time repo_dev sync --use-superproject NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version` .../local/.repo/exp-superproject/feb2c2847da5e274f3d530d5ab438af8-superproject.git: Initial setup for superproject completed. ... Bug: [google internal] b/189360443 Bug: [google internal] b/189139268 Bug: https://crbug.com/gerrit/14499 Change-Id: Ideaf268c294e9b500b2b9726ffbd733dd8d63004 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/308822 Tested-by: Raman Tenneti Reviewed-by: Mike Frysinger Reviewed-by: Jonathan Nieder --- git_superproject.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'git_superproject.py') diff --git a/git_superproject.py b/git_superproject.py index dad6a3de..3c4144dd 100644 --- a/git_superproject.py +++ b/git_superproject.py @@ -28,6 +28,7 @@ import sys from git_command import git_require, GitCommand from git_refs import R_HEADS +from manifest_xml import LOCAL_MANIFEST_GROUP_PREFIX _SUPERPROJECT_GIT_NAME = 'superproject.git' _SUPERPROJECT_MANIFEST_NAME = 'superproject_override.xml' @@ -268,6 +269,9 @@ class Superproject(object): path = project.relpath if not path: continue + # Skip the project if it comes from local manifest. + if any(s.startswith(LOCAL_MANIFEST_GROUP_PREFIX) for s in project.groups): + continue commit_id = commit_ids.get(path) if commit_id: project.SetRevisionId(commit_id) -- cgit v1.2.3-54-g00ecf