2021-01-15 03:17:50 +00:00
|
|
|
# Copyright (C) 2021 The Android Open Source Project
|
|
|
|
#
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
# You may obtain a copy of the License at
|
|
|
|
#
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
#
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
# See the License for the specific language governing permissions and
|
|
|
|
# limitations under the License.
|
|
|
|
|
2023-03-11 06:46:20 +00:00
|
|
|
"""Provide functionality to get projects and their commit ids from Superproject.
|
2021-01-15 03:17:50 +00:00
|
|
|
|
|
|
|
For more information on superproject, check out:
|
|
|
|
https://en.wikibooks.org/wiki/Git/Submodules_and_Superprojects
|
|
|
|
|
|
|
|
Examples:
|
2022-06-01 21:03:34 +00:00
|
|
|
superproject = Superproject(manifest, name, remote, revision)
|
superproject: Don't exit if superproject tag doesn't exist in manifest.
Don't exit if there are missing commit ids in superproject.
This change implements the following suggestion from delphij@:
"we should note the event (so we know that --use-superproject but there
were some errors, e.g. manifest didn't specify commit id for some
reason, or if there is no superproject but --use-superproject is
used), print out a message telling the use that this is not support,
but continue as if --no-use-superproject was specified?"
Changes:
superproject:
+ Added git_trace2_event_log as an argument to the constructor.
+ Sync method returns SyncResult a NamedTuple of
++ success - True if sync of superproject is successful, or False.
++ fatal - True if caller should exit, Or False.
+ UpdateProjectsRevisionId returns UpdateProjectsResult a NamedTuple of
++ manifest_path - path name of the overriding manifest file instead
of None
++ fatal - True if caller should exit, Or False
+ _GetAllProjectsCommitIds returns CommitIdsResult a NamedTuple of
++ commit_ids - a dictionary with the projects/commit ids on success,
otherwise None
++ fatal - True if caller should exit, Or False
+ Added _SkipUpdatingProjectRevisionId a helper function to see if a
project's revision id needs to be updated or not. This function is
used to exclude projects from local manifest file.
+ Added the following error events into git_trace2_event_log
++ If superproject is missing in a manifest
++ If there are missing commit ids for projects.
command.py:
+ Deleted unused import - platform
+ Added git_trace2_event_log as a member so all subcmds can log error
events.
main.py:
+ Initialized git_trace2_event_log as a member of command object.
init.py:
+ Deleted unused import - optparse
init.py:
+ Called sys.exit only if Sync returns exit=True
sync.py:
+ Called sys.exit only if Superproject's UpdateProjectsRevisionId returns
exit=True
+ Reloaded the manifest only if manifest path is returned by
UpdateProjectsRevisionId. If not, fall back to the old way of doing
repo sync.
test_git_superproject:
+ Added code to verify error events are being logged.
+ Added a test for no superproject tag
+ Added test for UpdateProjectsRevisionId not updating the revision id
with the commit ids.
Tested the code with the following commands.
+ Positive test case with aosp-master.
$ repo_dev init -u persistent-https://android.git.corp.google.com/platform/manifest -b master --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
Your identity is: Raman Tenneti <rtenneti@google.com>
If you want to change this, please re-run 'repo init' with --config-name
repo has been initialized in .../android/aosp
$ repo_dev sync -j40 --use-superproject
remote: Total 12 (delta 4), reused 12 (delta 4)
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
...
repo sync has finished successfully.
+ Negative test case without superproject tag.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
repo error: superproject tag is not defined in manifest: .../android/aosp/.repo/manifest.xml
error: Cannot get project commit ids from manifest
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.589s
repo sync has finished successfully.
+ Test for missing commit_id for a project.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
error: please file a bug using go/repo-bug to report missing commit_ids for: ['build/blueprint']
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.364s
repo sync has finished successfully.
$ ./run_tests -v
...
...== 164 passed in 2.87s ==...
Bug: [google internal] b/189371541
Change-Id: I5ea49f87e8fa41be590fc0c914573e16c8cdfcfa
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309162
Tested-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
2021-06-12 00:29:45 +00:00
|
|
|
UpdateProjectsResult = superproject.UpdateProjectsRevisionId(projects)
|
2021-01-15 03:17:50 +00:00
|
|
|
"""
|
|
|
|
|
Add the ability to administratively enroll repo into using superproject.
Repo will remember a choice and an expiration time of the choice, per
user, about whether to use superproject by default. When not specified
from command line and the choice is not expired, repo would use the
user default value.
When a user default value is not present and when the system wide
enable default is provided in git's system configuration, repo would
ask the user for a confirmation which will be valid for two weeks.
git_config.py: Add support for system config. When reading system
config, we would use --system to avoid hardcoding a path as the
value may be different on some other distributions.
git_superproject.py: Add a new subroutine, _UseSuperproject(), which
returns whether superproject should be used and whether it
is from a user configuration.
The value is determined in the following order:
1. If the user specifies either --use-superproject or
--no-use-superproject, then that choice is being used.
2. If neither is specified, we would then check the saved value
(upon repo init) and use that choice when there was a choice.
3. We then check if there is a saved and unexpired value for
user's choice in their ~/.gitconfig, and use the unexpired
choice, if available.
4. Finally, if all the above didn't give us a decision, and if
the git system configuration is providing a rollout hint, present
a prompt to user for their decision and save it in ~/.gitconfig.
subcmds/sync.py: Make use of the new UseSuperproject() provided by
git_superproject.py.
While there also silent stderr from git describe when determining the
version of repo.
Bug: [google internal] b/190688390
Change-Id: Iad3ee03026342ee500e5d65e2f0fa600d7637613
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309762
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Xin Li <delphij@google.com>
2021-06-16 17:19:00 +00:00
|
|
|
import functools
|
2023-08-22 01:20:32 +00:00
|
|
|
import hashlib
|
2021-01-15 03:17:50 +00:00
|
|
|
import os
|
|
|
|
import sys
|
Add the ability to administratively enroll repo into using superproject.
Repo will remember a choice and an expiration time of the choice, per
user, about whether to use superproject by default. When not specified
from command line and the choice is not expired, repo would use the
user default value.
When a user default value is not present and when the system wide
enable default is provided in git's system configuration, repo would
ask the user for a confirmation which will be valid for two weeks.
git_config.py: Add support for system config. When reading system
config, we would use --system to avoid hardcoding a path as the
value may be different on some other distributions.
git_superproject.py: Add a new subroutine, _UseSuperproject(), which
returns whether superproject should be used and whether it
is from a user configuration.
The value is determined in the following order:
1. If the user specifies either --use-superproject or
--no-use-superproject, then that choice is being used.
2. If neither is specified, we would then check the saved value
(upon repo init) and use that choice when there was a choice.
3. We then check if there is a saved and unexpired value for
user's choice in their ~/.gitconfig, and use the unexpired
choice, if available.
4. Finally, if all the above didn't give us a decision, and if
the git system configuration is providing a rollout hint, present
a prompt to user for their decision and save it in ~/.gitconfig.
subcmds/sync.py: Make use of the new UseSuperproject() provided by
git_superproject.py.
While there also silent stderr from git describe when determining the
version of repo.
Bug: [google internal] b/190688390
Change-Id: Iad3ee03026342ee500e5d65e2f0fa600d7637613
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309762
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Xin Li <delphij@google.com>
2021-06-16 17:19:00 +00:00
|
|
|
import time
|
superproject: Don't exit if superproject tag doesn't exist in manifest.
Don't exit if there are missing commit ids in superproject.
This change implements the following suggestion from delphij@:
"we should note the event (so we know that --use-superproject but there
were some errors, e.g. manifest didn't specify commit id for some
reason, or if there is no superproject but --use-superproject is
used), print out a message telling the use that this is not support,
but continue as if --no-use-superproject was specified?"
Changes:
superproject:
+ Added git_trace2_event_log as an argument to the constructor.
+ Sync method returns SyncResult a NamedTuple of
++ success - True if sync of superproject is successful, or False.
++ fatal - True if caller should exit, Or False.
+ UpdateProjectsRevisionId returns UpdateProjectsResult a NamedTuple of
++ manifest_path - path name of the overriding manifest file instead
of None
++ fatal - True if caller should exit, Or False
+ _GetAllProjectsCommitIds returns CommitIdsResult a NamedTuple of
++ commit_ids - a dictionary with the projects/commit ids on success,
otherwise None
++ fatal - True if caller should exit, Or False
+ Added _SkipUpdatingProjectRevisionId a helper function to see if a
project's revision id needs to be updated or not. This function is
used to exclude projects from local manifest file.
+ Added the following error events into git_trace2_event_log
++ If superproject is missing in a manifest
++ If there are missing commit ids for projects.
command.py:
+ Deleted unused import - platform
+ Added git_trace2_event_log as a member so all subcmds can log error
events.
main.py:
+ Initialized git_trace2_event_log as a member of command object.
init.py:
+ Deleted unused import - optparse
init.py:
+ Called sys.exit only if Sync returns exit=True
sync.py:
+ Called sys.exit only if Superproject's UpdateProjectsRevisionId returns
exit=True
+ Reloaded the manifest only if manifest path is returned by
UpdateProjectsRevisionId. If not, fall back to the old way of doing
repo sync.
test_git_superproject:
+ Added code to verify error events are being logged.
+ Added a test for no superproject tag
+ Added test for UpdateProjectsRevisionId not updating the revision id
with the commit ids.
Tested the code with the following commands.
+ Positive test case with aosp-master.
$ repo_dev init -u persistent-https://android.git.corp.google.com/platform/manifest -b master --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
Your identity is: Raman Tenneti <rtenneti@google.com>
If you want to change this, please re-run 'repo init' with --config-name
repo has been initialized in .../android/aosp
$ repo_dev sync -j40 --use-superproject
remote: Total 12 (delta 4), reused 12 (delta 4)
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
...
repo sync has finished successfully.
+ Negative test case without superproject tag.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
repo error: superproject tag is not defined in manifest: .../android/aosp/.repo/manifest.xml
error: Cannot get project commit ids from manifest
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.589s
repo sync has finished successfully.
+ Test for missing commit_id for a project.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
error: please file a bug using go/repo-bug to report missing commit_ids for: ['build/blueprint']
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.364s
repo sync has finished successfully.
$ ./run_tests -v
...
...== 164 passed in 2.87s ==...
Bug: [google internal] b/189371541
Change-Id: I5ea49f87e8fa41be590fc0c914573e16c8cdfcfa
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309162
Tested-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
2021-06-12 00:29:45 +00:00
|
|
|
from typing import NamedTuple
|
2021-01-15 03:17:50 +00:00
|
|
|
|
2023-08-22 01:20:32 +00:00
|
|
|
from git_command import git_require
|
|
|
|
from git_command import GitCommand
|
Add the ability to administratively enroll repo into using superproject.
Repo will remember a choice and an expiration time of the choice, per
user, about whether to use superproject by default. When not specified
from command line and the choice is not expired, repo would use the
user default value.
When a user default value is not present and when the system wide
enable default is provided in git's system configuration, repo would
ask the user for a confirmation which will be valid for two weeks.
git_config.py: Add support for system config. When reading system
config, we would use --system to avoid hardcoding a path as the
value may be different on some other distributions.
git_superproject.py: Add a new subroutine, _UseSuperproject(), which
returns whether superproject should be used and whether it
is from a user configuration.
The value is determined in the following order:
1. If the user specifies either --use-superproject or
--no-use-superproject, then that choice is being used.
2. If neither is specified, we would then check the saved value
(upon repo init) and use that choice when there was a choice.
3. We then check if there is a saved and unexpired value for
user's choice in their ~/.gitconfig, and use the unexpired
choice, if available.
4. Finally, if all the above didn't give us a decision, and if
the git system configuration is providing a rollout hint, present
a prompt to user for their decision and save it in ~/.gitconfig.
subcmds/sync.py: Make use of the new UseSuperproject() provided by
git_superproject.py.
While there also silent stderr from git describe when determining the
version of repo.
Bug: [google internal] b/190688390
Change-Id: Iad3ee03026342ee500e5d65e2f0fa600d7637613
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309762
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Xin Li <delphij@google.com>
2021-06-16 17:19:00 +00:00
|
|
|
from git_config import RepoConfig
|
2022-12-13 11:34:23 +00:00
|
|
|
from git_refs import GitRefs
|
2021-01-15 03:17:50 +00:00
|
|
|
|
2023-08-22 01:20:32 +00:00
|
|
|
|
2023-03-11 06:46:20 +00:00
|
|
|
_SUPERPROJECT_GIT_NAME = "superproject.git"
|
|
|
|
_SUPERPROJECT_MANIFEST_NAME = "superproject_override.xml"
|
2021-02-08 00:30:27 +00:00
|
|
|
|
2021-01-15 03:17:50 +00:00
|
|
|
|
superproject: Don't exit if superproject tag doesn't exist in manifest.
Don't exit if there are missing commit ids in superproject.
This change implements the following suggestion from delphij@:
"we should note the event (so we know that --use-superproject but there
were some errors, e.g. manifest didn't specify commit id for some
reason, or if there is no superproject but --use-superproject is
used), print out a message telling the use that this is not support,
but continue as if --no-use-superproject was specified?"
Changes:
superproject:
+ Added git_trace2_event_log as an argument to the constructor.
+ Sync method returns SyncResult a NamedTuple of
++ success - True if sync of superproject is successful, or False.
++ fatal - True if caller should exit, Or False.
+ UpdateProjectsRevisionId returns UpdateProjectsResult a NamedTuple of
++ manifest_path - path name of the overriding manifest file instead
of None
++ fatal - True if caller should exit, Or False
+ _GetAllProjectsCommitIds returns CommitIdsResult a NamedTuple of
++ commit_ids - a dictionary with the projects/commit ids on success,
otherwise None
++ fatal - True if caller should exit, Or False
+ Added _SkipUpdatingProjectRevisionId a helper function to see if a
project's revision id needs to be updated or not. This function is
used to exclude projects from local manifest file.
+ Added the following error events into git_trace2_event_log
++ If superproject is missing in a manifest
++ If there are missing commit ids for projects.
command.py:
+ Deleted unused import - platform
+ Added git_trace2_event_log as a member so all subcmds can log error
events.
main.py:
+ Initialized git_trace2_event_log as a member of command object.
init.py:
+ Deleted unused import - optparse
init.py:
+ Called sys.exit only if Sync returns exit=True
sync.py:
+ Called sys.exit only if Superproject's UpdateProjectsRevisionId returns
exit=True
+ Reloaded the manifest only if manifest path is returned by
UpdateProjectsRevisionId. If not, fall back to the old way of doing
repo sync.
test_git_superproject:
+ Added code to verify error events are being logged.
+ Added a test for no superproject tag
+ Added test for UpdateProjectsRevisionId not updating the revision id
with the commit ids.
Tested the code with the following commands.
+ Positive test case with aosp-master.
$ repo_dev init -u persistent-https://android.git.corp.google.com/platform/manifest -b master --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
Your identity is: Raman Tenneti <rtenneti@google.com>
If you want to change this, please re-run 'repo init' with --config-name
repo has been initialized in .../android/aosp
$ repo_dev sync -j40 --use-superproject
remote: Total 12 (delta 4), reused 12 (delta 4)
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
...
repo sync has finished successfully.
+ Negative test case without superproject tag.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
repo error: superproject tag is not defined in manifest: .../android/aosp/.repo/manifest.xml
error: Cannot get project commit ids from manifest
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.589s
repo sync has finished successfully.
+ Test for missing commit_id for a project.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
error: please file a bug using go/repo-bug to report missing commit_ids for: ['build/blueprint']
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.364s
repo sync has finished successfully.
$ ./run_tests -v
...
...== 164 passed in 2.87s ==...
Bug: [google internal] b/189371541
Change-Id: I5ea49f87e8fa41be590fc0c914573e16c8cdfcfa
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309162
Tested-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
2021-06-12 00:29:45 +00:00
|
|
|
class SyncResult(NamedTuple):
|
2023-03-11 06:46:20 +00:00
|
|
|
"""Return the status of sync and whether caller should exit."""
|
superproject: Don't exit if superproject tag doesn't exist in manifest.
Don't exit if there are missing commit ids in superproject.
This change implements the following suggestion from delphij@:
"we should note the event (so we know that --use-superproject but there
were some errors, e.g. manifest didn't specify commit id for some
reason, or if there is no superproject but --use-superproject is
used), print out a message telling the use that this is not support,
but continue as if --no-use-superproject was specified?"
Changes:
superproject:
+ Added git_trace2_event_log as an argument to the constructor.
+ Sync method returns SyncResult a NamedTuple of
++ success - True if sync of superproject is successful, or False.
++ fatal - True if caller should exit, Or False.
+ UpdateProjectsRevisionId returns UpdateProjectsResult a NamedTuple of
++ manifest_path - path name of the overriding manifest file instead
of None
++ fatal - True if caller should exit, Or False
+ _GetAllProjectsCommitIds returns CommitIdsResult a NamedTuple of
++ commit_ids - a dictionary with the projects/commit ids on success,
otherwise None
++ fatal - True if caller should exit, Or False
+ Added _SkipUpdatingProjectRevisionId a helper function to see if a
project's revision id needs to be updated or not. This function is
used to exclude projects from local manifest file.
+ Added the following error events into git_trace2_event_log
++ If superproject is missing in a manifest
++ If there are missing commit ids for projects.
command.py:
+ Deleted unused import - platform
+ Added git_trace2_event_log as a member so all subcmds can log error
events.
main.py:
+ Initialized git_trace2_event_log as a member of command object.
init.py:
+ Deleted unused import - optparse
init.py:
+ Called sys.exit only if Sync returns exit=True
sync.py:
+ Called sys.exit only if Superproject's UpdateProjectsRevisionId returns
exit=True
+ Reloaded the manifest only if manifest path is returned by
UpdateProjectsRevisionId. If not, fall back to the old way of doing
repo sync.
test_git_superproject:
+ Added code to verify error events are being logged.
+ Added a test for no superproject tag
+ Added test for UpdateProjectsRevisionId not updating the revision id
with the commit ids.
Tested the code with the following commands.
+ Positive test case with aosp-master.
$ repo_dev init -u persistent-https://android.git.corp.google.com/platform/manifest -b master --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
Your identity is: Raman Tenneti <rtenneti@google.com>
If you want to change this, please re-run 'repo init' with --config-name
repo has been initialized in .../android/aosp
$ repo_dev sync -j40 --use-superproject
remote: Total 12 (delta 4), reused 12 (delta 4)
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
...
repo sync has finished successfully.
+ Negative test case without superproject tag.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
repo error: superproject tag is not defined in manifest: .../android/aosp/.repo/manifest.xml
error: Cannot get project commit ids from manifest
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.589s
repo sync has finished successfully.
+ Test for missing commit_id for a project.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
error: please file a bug using go/repo-bug to report missing commit_ids for: ['build/blueprint']
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.364s
repo sync has finished successfully.
$ ./run_tests -v
...
...== 164 passed in 2.87s ==...
Bug: [google internal] b/189371541
Change-Id: I5ea49f87e8fa41be590fc0c914573e16c8cdfcfa
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309162
Tested-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
2021-06-12 00:29:45 +00:00
|
|
|
|
2023-03-11 06:46:20 +00:00
|
|
|
# Whether the superproject sync was successful.
|
|
|
|
success: bool
|
|
|
|
# Whether the caller should exit.
|
|
|
|
fatal: bool
|
superproject: Don't exit if superproject tag doesn't exist in manifest.
Don't exit if there are missing commit ids in superproject.
This change implements the following suggestion from delphij@:
"we should note the event (so we know that --use-superproject but there
were some errors, e.g. manifest didn't specify commit id for some
reason, or if there is no superproject but --use-superproject is
used), print out a message telling the use that this is not support,
but continue as if --no-use-superproject was specified?"
Changes:
superproject:
+ Added git_trace2_event_log as an argument to the constructor.
+ Sync method returns SyncResult a NamedTuple of
++ success - True if sync of superproject is successful, or False.
++ fatal - True if caller should exit, Or False.
+ UpdateProjectsRevisionId returns UpdateProjectsResult a NamedTuple of
++ manifest_path - path name of the overriding manifest file instead
of None
++ fatal - True if caller should exit, Or False
+ _GetAllProjectsCommitIds returns CommitIdsResult a NamedTuple of
++ commit_ids - a dictionary with the projects/commit ids on success,
otherwise None
++ fatal - True if caller should exit, Or False
+ Added _SkipUpdatingProjectRevisionId a helper function to see if a
project's revision id needs to be updated or not. This function is
used to exclude projects from local manifest file.
+ Added the following error events into git_trace2_event_log
++ If superproject is missing in a manifest
++ If there are missing commit ids for projects.
command.py:
+ Deleted unused import - platform
+ Added git_trace2_event_log as a member so all subcmds can log error
events.
main.py:
+ Initialized git_trace2_event_log as a member of command object.
init.py:
+ Deleted unused import - optparse
init.py:
+ Called sys.exit only if Sync returns exit=True
sync.py:
+ Called sys.exit only if Superproject's UpdateProjectsRevisionId returns
exit=True
+ Reloaded the manifest only if manifest path is returned by
UpdateProjectsRevisionId. If not, fall back to the old way of doing
repo sync.
test_git_superproject:
+ Added code to verify error events are being logged.
+ Added a test for no superproject tag
+ Added test for UpdateProjectsRevisionId not updating the revision id
with the commit ids.
Tested the code with the following commands.
+ Positive test case with aosp-master.
$ repo_dev init -u persistent-https://android.git.corp.google.com/platform/manifest -b master --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
Your identity is: Raman Tenneti <rtenneti@google.com>
If you want to change this, please re-run 'repo init' with --config-name
repo has been initialized in .../android/aosp
$ repo_dev sync -j40 --use-superproject
remote: Total 12 (delta 4), reused 12 (delta 4)
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
...
repo sync has finished successfully.
+ Negative test case without superproject tag.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
repo error: superproject tag is not defined in manifest: .../android/aosp/.repo/manifest.xml
error: Cannot get project commit ids from manifest
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.589s
repo sync has finished successfully.
+ Test for missing commit_id for a project.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
error: please file a bug using go/repo-bug to report missing commit_ids for: ['build/blueprint']
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.364s
repo sync has finished successfully.
$ ./run_tests -v
...
...== 164 passed in 2.87s ==...
Bug: [google internal] b/189371541
Change-Id: I5ea49f87e8fa41be590fc0c914573e16c8cdfcfa
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309162
Tested-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
2021-06-12 00:29:45 +00:00
|
|
|
|
|
|
|
|
|
|
|
class CommitIdsResult(NamedTuple):
|
2023-03-11 06:46:20 +00:00
|
|
|
"""Return the commit ids and whether caller should exit."""
|
superproject: Don't exit if superproject tag doesn't exist in manifest.
Don't exit if there are missing commit ids in superproject.
This change implements the following suggestion from delphij@:
"we should note the event (so we know that --use-superproject but there
were some errors, e.g. manifest didn't specify commit id for some
reason, or if there is no superproject but --use-superproject is
used), print out a message telling the use that this is not support,
but continue as if --no-use-superproject was specified?"
Changes:
superproject:
+ Added git_trace2_event_log as an argument to the constructor.
+ Sync method returns SyncResult a NamedTuple of
++ success - True if sync of superproject is successful, or False.
++ fatal - True if caller should exit, Or False.
+ UpdateProjectsRevisionId returns UpdateProjectsResult a NamedTuple of
++ manifest_path - path name of the overriding manifest file instead
of None
++ fatal - True if caller should exit, Or False
+ _GetAllProjectsCommitIds returns CommitIdsResult a NamedTuple of
++ commit_ids - a dictionary with the projects/commit ids on success,
otherwise None
++ fatal - True if caller should exit, Or False
+ Added _SkipUpdatingProjectRevisionId a helper function to see if a
project's revision id needs to be updated or not. This function is
used to exclude projects from local manifest file.
+ Added the following error events into git_trace2_event_log
++ If superproject is missing in a manifest
++ If there are missing commit ids for projects.
command.py:
+ Deleted unused import - platform
+ Added git_trace2_event_log as a member so all subcmds can log error
events.
main.py:
+ Initialized git_trace2_event_log as a member of command object.
init.py:
+ Deleted unused import - optparse
init.py:
+ Called sys.exit only if Sync returns exit=True
sync.py:
+ Called sys.exit only if Superproject's UpdateProjectsRevisionId returns
exit=True
+ Reloaded the manifest only if manifest path is returned by
UpdateProjectsRevisionId. If not, fall back to the old way of doing
repo sync.
test_git_superproject:
+ Added code to verify error events are being logged.
+ Added a test for no superproject tag
+ Added test for UpdateProjectsRevisionId not updating the revision id
with the commit ids.
Tested the code with the following commands.
+ Positive test case with aosp-master.
$ repo_dev init -u persistent-https://android.git.corp.google.com/platform/manifest -b master --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
Your identity is: Raman Tenneti <rtenneti@google.com>
If you want to change this, please re-run 'repo init' with --config-name
repo has been initialized in .../android/aosp
$ repo_dev sync -j40 --use-superproject
remote: Total 12 (delta 4), reused 12 (delta 4)
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
...
repo sync has finished successfully.
+ Negative test case without superproject tag.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
repo error: superproject tag is not defined in manifest: .../android/aosp/.repo/manifest.xml
error: Cannot get project commit ids from manifest
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.589s
repo sync has finished successfully.
+ Test for missing commit_id for a project.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
error: please file a bug using go/repo-bug to report missing commit_ids for: ['build/blueprint']
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.364s
repo sync has finished successfully.
$ ./run_tests -v
...
...== 164 passed in 2.87s ==...
Bug: [google internal] b/189371541
Change-Id: I5ea49f87e8fa41be590fc0c914573e16c8cdfcfa
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309162
Tested-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
2021-06-12 00:29:45 +00:00
|
|
|
|
2023-03-11 06:46:20 +00:00
|
|
|
# A dictionary with the projects/commit ids on success, otherwise None.
|
|
|
|
commit_ids: dict
|
|
|
|
# Whether the caller should exit.
|
|
|
|
fatal: bool
|
superproject: Don't exit if superproject tag doesn't exist in manifest.
Don't exit if there are missing commit ids in superproject.
This change implements the following suggestion from delphij@:
"we should note the event (so we know that --use-superproject but there
were some errors, e.g. manifest didn't specify commit id for some
reason, or if there is no superproject but --use-superproject is
used), print out a message telling the use that this is not support,
but continue as if --no-use-superproject was specified?"
Changes:
superproject:
+ Added git_trace2_event_log as an argument to the constructor.
+ Sync method returns SyncResult a NamedTuple of
++ success - True if sync of superproject is successful, or False.
++ fatal - True if caller should exit, Or False.
+ UpdateProjectsRevisionId returns UpdateProjectsResult a NamedTuple of
++ manifest_path - path name of the overriding manifest file instead
of None
++ fatal - True if caller should exit, Or False
+ _GetAllProjectsCommitIds returns CommitIdsResult a NamedTuple of
++ commit_ids - a dictionary with the projects/commit ids on success,
otherwise None
++ fatal - True if caller should exit, Or False
+ Added _SkipUpdatingProjectRevisionId a helper function to see if a
project's revision id needs to be updated or not. This function is
used to exclude projects from local manifest file.
+ Added the following error events into git_trace2_event_log
++ If superproject is missing in a manifest
++ If there are missing commit ids for projects.
command.py:
+ Deleted unused import - platform
+ Added git_trace2_event_log as a member so all subcmds can log error
events.
main.py:
+ Initialized git_trace2_event_log as a member of command object.
init.py:
+ Deleted unused import - optparse
init.py:
+ Called sys.exit only if Sync returns exit=True
sync.py:
+ Called sys.exit only if Superproject's UpdateProjectsRevisionId returns
exit=True
+ Reloaded the manifest only if manifest path is returned by
UpdateProjectsRevisionId. If not, fall back to the old way of doing
repo sync.
test_git_superproject:
+ Added code to verify error events are being logged.
+ Added a test for no superproject tag
+ Added test for UpdateProjectsRevisionId not updating the revision id
with the commit ids.
Tested the code with the following commands.
+ Positive test case with aosp-master.
$ repo_dev init -u persistent-https://android.git.corp.google.com/platform/manifest -b master --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
Your identity is: Raman Tenneti <rtenneti@google.com>
If you want to change this, please re-run 'repo init' with --config-name
repo has been initialized in .../android/aosp
$ repo_dev sync -j40 --use-superproject
remote: Total 12 (delta 4), reused 12 (delta 4)
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
...
repo sync has finished successfully.
+ Negative test case without superproject tag.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
repo error: superproject tag is not defined in manifest: .../android/aosp/.repo/manifest.xml
error: Cannot get project commit ids from manifest
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.589s
repo sync has finished successfully.
+ Test for missing commit_id for a project.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
error: please file a bug using go/repo-bug to report missing commit_ids for: ['build/blueprint']
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.364s
repo sync has finished successfully.
$ ./run_tests -v
...
...== 164 passed in 2.87s ==...
Bug: [google internal] b/189371541
Change-Id: I5ea49f87e8fa41be590fc0c914573e16c8cdfcfa
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309162
Tested-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
2021-06-12 00:29:45 +00:00
|
|
|
|
|
|
|
|
|
|
|
class UpdateProjectsResult(NamedTuple):
|
2023-03-11 06:46:20 +00:00
|
|
|
"""Return the overriding manifest file and whether caller should exit."""
|
superproject: Don't exit if superproject tag doesn't exist in manifest.
Don't exit if there are missing commit ids in superproject.
This change implements the following suggestion from delphij@:
"we should note the event (so we know that --use-superproject but there
were some errors, e.g. manifest didn't specify commit id for some
reason, or if there is no superproject but --use-superproject is
used), print out a message telling the use that this is not support,
but continue as if --no-use-superproject was specified?"
Changes:
superproject:
+ Added git_trace2_event_log as an argument to the constructor.
+ Sync method returns SyncResult a NamedTuple of
++ success - True if sync of superproject is successful, or False.
++ fatal - True if caller should exit, Or False.
+ UpdateProjectsRevisionId returns UpdateProjectsResult a NamedTuple of
++ manifest_path - path name of the overriding manifest file instead
of None
++ fatal - True if caller should exit, Or False
+ _GetAllProjectsCommitIds returns CommitIdsResult a NamedTuple of
++ commit_ids - a dictionary with the projects/commit ids on success,
otherwise None
++ fatal - True if caller should exit, Or False
+ Added _SkipUpdatingProjectRevisionId a helper function to see if a
project's revision id needs to be updated or not. This function is
used to exclude projects from local manifest file.
+ Added the following error events into git_trace2_event_log
++ If superproject is missing in a manifest
++ If there are missing commit ids for projects.
command.py:
+ Deleted unused import - platform
+ Added git_trace2_event_log as a member so all subcmds can log error
events.
main.py:
+ Initialized git_trace2_event_log as a member of command object.
init.py:
+ Deleted unused import - optparse
init.py:
+ Called sys.exit only if Sync returns exit=True
sync.py:
+ Called sys.exit only if Superproject's UpdateProjectsRevisionId returns
exit=True
+ Reloaded the manifest only if manifest path is returned by
UpdateProjectsRevisionId. If not, fall back to the old way of doing
repo sync.
test_git_superproject:
+ Added code to verify error events are being logged.
+ Added a test for no superproject tag
+ Added test for UpdateProjectsRevisionId not updating the revision id
with the commit ids.
Tested the code with the following commands.
+ Positive test case with aosp-master.
$ repo_dev init -u persistent-https://android.git.corp.google.com/platform/manifest -b master --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
Your identity is: Raman Tenneti <rtenneti@google.com>
If you want to change this, please re-run 'repo init' with --config-name
repo has been initialized in .../android/aosp
$ repo_dev sync -j40 --use-superproject
remote: Total 12 (delta 4), reused 12 (delta 4)
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
...
repo sync has finished successfully.
+ Negative test case without superproject tag.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
repo error: superproject tag is not defined in manifest: .../android/aosp/.repo/manifest.xml
error: Cannot get project commit ids from manifest
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.589s
repo sync has finished successfully.
+ Test for missing commit_id for a project.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
error: please file a bug using go/repo-bug to report missing commit_ids for: ['build/blueprint']
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.364s
repo sync has finished successfully.
$ ./run_tests -v
...
...== 164 passed in 2.87s ==...
Bug: [google internal] b/189371541
Change-Id: I5ea49f87e8fa41be590fc0c914573e16c8cdfcfa
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309162
Tested-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
2021-06-12 00:29:45 +00:00
|
|
|
|
2023-03-11 06:46:20 +00:00
|
|
|
# Path name of the overriding manifest file if successful, otherwise None.
|
|
|
|
manifest_path: str
|
|
|
|
# Whether the caller should exit.
|
|
|
|
fatal: bool
|
superproject: Don't exit if superproject tag doesn't exist in manifest.
Don't exit if there are missing commit ids in superproject.
This change implements the following suggestion from delphij@:
"we should note the event (so we know that --use-superproject but there
were some errors, e.g. manifest didn't specify commit id for some
reason, or if there is no superproject but --use-superproject is
used), print out a message telling the use that this is not support,
but continue as if --no-use-superproject was specified?"
Changes:
superproject:
+ Added git_trace2_event_log as an argument to the constructor.
+ Sync method returns SyncResult a NamedTuple of
++ success - True if sync of superproject is successful, or False.
++ fatal - True if caller should exit, Or False.
+ UpdateProjectsRevisionId returns UpdateProjectsResult a NamedTuple of
++ manifest_path - path name of the overriding manifest file instead
of None
++ fatal - True if caller should exit, Or False
+ _GetAllProjectsCommitIds returns CommitIdsResult a NamedTuple of
++ commit_ids - a dictionary with the projects/commit ids on success,
otherwise None
++ fatal - True if caller should exit, Or False
+ Added _SkipUpdatingProjectRevisionId a helper function to see if a
project's revision id needs to be updated or not. This function is
used to exclude projects from local manifest file.
+ Added the following error events into git_trace2_event_log
++ If superproject is missing in a manifest
++ If there are missing commit ids for projects.
command.py:
+ Deleted unused import - platform
+ Added git_trace2_event_log as a member so all subcmds can log error
events.
main.py:
+ Initialized git_trace2_event_log as a member of command object.
init.py:
+ Deleted unused import - optparse
init.py:
+ Called sys.exit only if Sync returns exit=True
sync.py:
+ Called sys.exit only if Superproject's UpdateProjectsRevisionId returns
exit=True
+ Reloaded the manifest only if manifest path is returned by
UpdateProjectsRevisionId. If not, fall back to the old way of doing
repo sync.
test_git_superproject:
+ Added code to verify error events are being logged.
+ Added a test for no superproject tag
+ Added test for UpdateProjectsRevisionId not updating the revision id
with the commit ids.
Tested the code with the following commands.
+ Positive test case with aosp-master.
$ repo_dev init -u persistent-https://android.git.corp.google.com/platform/manifest -b master --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
Your identity is: Raman Tenneti <rtenneti@google.com>
If you want to change this, please re-run 'repo init' with --config-name
repo has been initialized in .../android/aosp
$ repo_dev sync -j40 --use-superproject
remote: Total 12 (delta 4), reused 12 (delta 4)
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
...
repo sync has finished successfully.
+ Negative test case without superproject tag.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
repo error: superproject tag is not defined in manifest: .../android/aosp/.repo/manifest.xml
error: Cannot get project commit ids from manifest
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.589s
repo sync has finished successfully.
+ Test for missing commit_id for a project.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
error: please file a bug using go/repo-bug to report missing commit_ids for: ['build/blueprint']
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.364s
repo sync has finished successfully.
$ ./run_tests -v
...
...== 164 passed in 2.87s ==...
Bug: [google internal] b/189371541
Change-Id: I5ea49f87e8fa41be590fc0c914573e16c8cdfcfa
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309162
Tested-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
2021-06-12 00:29:45 +00:00
|
|
|
|
|
|
|
|
2023-09-29 15:04:49 +00:00
|
|
|
class Superproject:
|
2023-03-11 06:46:20 +00:00
|
|
|
"""Get commit ids from superproject.
|
2021-01-15 03:17:50 +00:00
|
|
|
|
2023-03-11 06:46:20 +00:00
|
|
|
Initializes a local copy of a superproject for the manifest. This allows
|
|
|
|
lookup of commit ids for all projects. It contains _project_commit_ids which
|
|
|
|
is a dictionary with project/commit id entries.
|
superproject: Don't exit if superproject tag doesn't exist in manifest.
Don't exit if there are missing commit ids in superproject.
This change implements the following suggestion from delphij@:
"we should note the event (so we know that --use-superproject but there
were some errors, e.g. manifest didn't specify commit id for some
reason, or if there is no superproject but --use-superproject is
used), print out a message telling the use that this is not support,
but continue as if --no-use-superproject was specified?"
Changes:
superproject:
+ Added git_trace2_event_log as an argument to the constructor.
+ Sync method returns SyncResult a NamedTuple of
++ success - True if sync of superproject is successful, or False.
++ fatal - True if caller should exit, Or False.
+ UpdateProjectsRevisionId returns UpdateProjectsResult a NamedTuple of
++ manifest_path - path name of the overriding manifest file instead
of None
++ fatal - True if caller should exit, Or False
+ _GetAllProjectsCommitIds returns CommitIdsResult a NamedTuple of
++ commit_ids - a dictionary with the projects/commit ids on success,
otherwise None
++ fatal - True if caller should exit, Or False
+ Added _SkipUpdatingProjectRevisionId a helper function to see if a
project's revision id needs to be updated or not. This function is
used to exclude projects from local manifest file.
+ Added the following error events into git_trace2_event_log
++ If superproject is missing in a manifest
++ If there are missing commit ids for projects.
command.py:
+ Deleted unused import - platform
+ Added git_trace2_event_log as a member so all subcmds can log error
events.
main.py:
+ Initialized git_trace2_event_log as a member of command object.
init.py:
+ Deleted unused import - optparse
init.py:
+ Called sys.exit only if Sync returns exit=True
sync.py:
+ Called sys.exit only if Superproject's UpdateProjectsRevisionId returns
exit=True
+ Reloaded the manifest only if manifest path is returned by
UpdateProjectsRevisionId. If not, fall back to the old way of doing
repo sync.
test_git_superproject:
+ Added code to verify error events are being logged.
+ Added a test for no superproject tag
+ Added test for UpdateProjectsRevisionId not updating the revision id
with the commit ids.
Tested the code with the following commands.
+ Positive test case with aosp-master.
$ repo_dev init -u persistent-https://android.git.corp.google.com/platform/manifest -b master --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
Your identity is: Raman Tenneti <rtenneti@google.com>
If you want to change this, please re-run 'repo init' with --config-name
repo has been initialized in .../android/aosp
$ repo_dev sync -j40 --use-superproject
remote: Total 12 (delta 4), reused 12 (delta 4)
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
...
repo sync has finished successfully.
+ Negative test case without superproject tag.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
repo error: superproject tag is not defined in manifest: .../android/aosp/.repo/manifest.xml
error: Cannot get project commit ids from manifest
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.589s
repo sync has finished successfully.
+ Test for missing commit_id for a project.
$ repo_dev sync -j40 --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
error: please file a bug using go/repo-bug to report missing commit_ids for: ['build/blueprint']
error: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option
...
Checking out: 100% (1022/1022), done in 3.364s
repo sync has finished successfully.
$ ./run_tests -v
...
...== 164 passed in 2.87s ==...
Bug: [google internal] b/189371541
Change-Id: I5ea49f87e8fa41be590fc0c914573e16c8cdfcfa
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309162
Tested-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
2021-06-12 00:29:45 +00:00
|
|
|
"""
|
2021-02-04 22:39:38 +00:00
|
|
|
|
2023-03-11 06:46:20 +00:00
|
|
|
def __init__(
|
|
|
|
self,
|
|
|
|
manifest,
|
|
|
|
name,
|
|
|
|
remote,
|
|
|
|
revision,
|
|
|
|
superproject_dir="exp-superproject",
|
|
|
|
):
|
|
|
|
"""Initializes superproject.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
manifest: A Manifest object that is to be written to a file.
|
|
|
|
name: The unique name of the superproject
|
|
|
|
remote: The RemoteSpec for the remote.
|
|
|
|
revision: The name of the git branch to track.
|
|
|
|
superproject_dir: Relative path under |manifest.subdir| to checkout
|
|
|
|
superproject.
|
|
|
|
"""
|
|
|
|
self._project_commit_ids = None
|
|
|
|
self._manifest = manifest
|
|
|
|
self.name = name
|
|
|
|
self.remote = remote
|
|
|
|
self.revision = self._branch = revision
|
|
|
|
self._repodir = manifest.repodir
|
|
|
|
self._superproject_dir = superproject_dir
|
|
|
|
self._superproject_path = manifest.SubmanifestInfoDir(
|
|
|
|
manifest.path_prefix, superproject_dir
|
|
|
|
)
|
|
|
|
self._manifest_path = os.path.join(
|
|
|
|
self._superproject_path, _SUPERPROJECT_MANIFEST_NAME
|
|
|
|
)
|
|
|
|
git_name = hashlib.md5(remote.name.encode("utf8")).hexdigest() + "-"
|
|
|
|
self._remote_url = remote.url
|
|
|
|
self._work_git_name = git_name + _SUPERPROJECT_GIT_NAME
|
|
|
|
self._work_git = os.path.join(
|
|
|
|
self._superproject_path, self._work_git_name
|
|
|
|
)
|
|
|
|
|
|
|
|
# The following are command arguemnts, rather than superproject
|
|
|
|
# attributes, and were included here originally. They should eventually
|
|
|
|
# become arguments that are passed down from the public methods, instead
|
|
|
|
# of being treated as attributes.
|
|
|
|
self._git_event_log = None
|
|
|
|
self._quiet = False
|
|
|
|
self._print_messages = False
|
|
|
|
|
|
|
|
def SetQuiet(self, value):
|
|
|
|
"""Set the _quiet attribute."""
|
|
|
|
self._quiet = value
|
|
|
|
|
|
|
|
def SetPrintMessages(self, value):
|
|
|
|
"""Set the _print_messages attribute."""
|
|
|
|
self._print_messages = value
|
|
|
|
|
|
|
|
@property
|
|
|
|
def project_commit_ids(self):
|
|
|
|
"""Returns a dictionary of projects and their commit ids."""
|
|
|
|
return self._project_commit_ids
|
|
|
|
|
|
|
|
@property
|
|
|
|
def manifest_path(self):
|
|
|
|
"""Returns the manifest path if the path exists or None."""
|
|
|
|
return (
|
|
|
|
self._manifest_path if os.path.exists(self._manifest_path) else None
|
|
|
|
)
|
|
|
|
|
|
|
|
def _LogMessage(self, fmt, *inputs):
|
|
|
|
"""Logs message to stderr and _git_event_log."""
|
|
|
|
message = f"{self._LogMessagePrefix()} {fmt.format(*inputs)}"
|
|
|
|
if self._print_messages:
|
|
|
|
print(message, file=sys.stderr)
|
|
|
|
self._git_event_log.ErrorEvent(message, fmt)
|
|
|
|
|
|
|
|
def _LogMessagePrefix(self):
|
|
|
|
"""Returns the prefix string to be logged in each log message"""
|
|
|
|
return (
|
|
|
|
f"repo superproject branch: {self._branch} url: {self._remote_url}"
|
|
|
|
)
|
|
|
|
|
|
|
|
def _LogError(self, fmt, *inputs):
|
|
|
|
"""Logs error message to stderr and _git_event_log."""
|
|
|
|
self._LogMessage(f"error: {fmt}", *inputs)
|
|
|
|
|
|
|
|
def _LogWarning(self, fmt, *inputs):
|
|
|
|
"""Logs warning message to stderr and _git_event_log."""
|
|
|
|
self._LogMessage(f"warning: {fmt}", *inputs)
|
|
|
|
|
|
|
|
def _Init(self):
|
|
|
|
"""Sets up a local Git repository to get a copy of a superproject.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
True if initialization is successful, or False.
|
|
|
|
"""
|
|
|
|
if not os.path.exists(self._superproject_path):
|
|
|
|
os.mkdir(self._superproject_path)
|
|
|
|
if not self._quiet and not os.path.exists(self._work_git):
|
|
|
|
print(
|
|
|
|
"%s: Performing initial setup for superproject; this might "
|
|
|
|
"take several minutes." % self._work_git
|
|
|
|
)
|
|
|
|
cmd = ["init", "--bare", self._work_git_name]
|
|
|
|
p = GitCommand(
|
|
|
|
None,
|
|
|
|
cmd,
|
|
|
|
cwd=self._superproject_path,
|
|
|
|
capture_stdout=True,
|
|
|
|
capture_stderr=True,
|
|
|
|
)
|
|
|
|
retval = p.Wait()
|
|
|
|
if retval:
|
|
|
|
self._LogWarning(
|
|
|
|
"git init call failed, command: git {}, "
|
|
|
|
"return code: {}, stderr: {}",
|
|
|
|
cmd,
|
|
|
|
retval,
|
|
|
|
p.stderr,
|
|
|
|
)
|
|
|
|
return False
|
|
|
|
return True
|
|
|
|
|
|
|
|
def _Fetch(self):
|
|
|
|
"""Fetches a superproject for the manifest based on |_remote_url|.
|
|
|
|
|
|
|
|
This runs git fetch which stores a local copy the superproject.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
True if fetch is successful, or False.
|
|
|
|
"""
|
|
|
|
if not os.path.exists(self._work_git):
|
|
|
|
self._LogWarning("git fetch missing directory: {}", self._work_git)
|
|
|
|
return False
|
|
|
|
if not git_require((2, 28, 0)):
|
|
|
|
self._LogWarning(
|
|
|
|
"superproject requires a git version 2.28 or later"
|
|
|
|
)
|
|
|
|
return False
|
|
|
|
cmd = [
|
|
|
|
"fetch",
|
|
|
|
self._remote_url,
|
|
|
|
"--depth",
|
|
|
|
"1",
|
|
|
|
"--force",
|
|
|
|
"--no-tags",
|
|
|
|
"--filter",
|
|
|
|
"blob:none",
|
|
|
|
]
|
|
|
|
|
|
|
|
# Check if there is a local ref that we can pass to --negotiation-tip.
|
|
|
|
# If this is the first fetch, it does not exist yet.
|
|
|
|
# We use --negotiation-tip to speed up the fetch. Superproject branches
|
|
|
|
# do not share commits. So this lets git know it only needs to send
|
|
|
|
# commits reachable from the specified local refs.
|
|
|
|
rev_commit = GitRefs(self._work_git).get(f"refs/heads/{self.revision}")
|
|
|
|
if rev_commit:
|
|
|
|
cmd.extend(["--negotiation-tip", rev_commit])
|
|
|
|
|
|
|
|
if self._branch:
|
|
|
|
cmd += [self._branch + ":" + self._branch]
|
|
|
|
p = GitCommand(
|
|
|
|
None,
|
|
|
|
cmd,
|
|
|
|
cwd=self._work_git,
|
|
|
|
capture_stdout=True,
|
|
|
|
capture_stderr=True,
|
|
|
|
)
|
|
|
|
retval = p.Wait()
|
|
|
|
if retval:
|
|
|
|
self._LogWarning(
|
|
|
|
"git fetch call failed, command: git {}, "
|
|
|
|
"return code: {}, stderr: {}",
|
|
|
|
cmd,
|
|
|
|
retval,
|
|
|
|
p.stderr,
|
|
|
|
)
|
|
|
|
return False
|
|
|
|
return True
|
|
|
|
|
|
|
|
def _LsTree(self):
|
|
|
|
"""Gets the commit ids for all projects.
|
|
|
|
|
|
|
|
Works only in git repositories.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
data: data returned from 'git ls-tree ...' instead of None.
|
|
|
|
"""
|
|
|
|
if not os.path.exists(self._work_git):
|
|
|
|
self._LogWarning(
|
|
|
|
"git ls-tree missing directory: {}", self._work_git
|
|
|
|
)
|
|
|
|
return None
|
|
|
|
data = None
|
|
|
|
branch = "HEAD" if not self._branch else self._branch
|
|
|
|
cmd = ["ls-tree", "-z", "-r", branch]
|
|
|
|
|
|
|
|
p = GitCommand(
|
|
|
|
None,
|
|
|
|
cmd,
|
|
|
|
cwd=self._work_git,
|
|
|
|
capture_stdout=True,
|
|
|
|
capture_stderr=True,
|
|
|
|
)
|
|
|
|
retval = p.Wait()
|
|
|
|
if retval == 0:
|
|
|
|
data = p.stdout
|
|
|
|
else:
|
|
|
|
self._LogWarning(
|
|
|
|
"git ls-tree call failed, command: git {}, "
|
|
|
|
"return code: {}, stderr: {}",
|
|
|
|
cmd,
|
|
|
|
retval,
|
|
|
|
p.stderr,
|
|
|
|
)
|
|
|
|
return data
|
|
|
|
|
|
|
|
def Sync(self, git_event_log):
|
|
|
|
"""Gets a local copy of a superproject for the manifest.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
git_event_log: an EventLog, for git tracing.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
SyncResult
|
|
|
|
"""
|
|
|
|
self._git_event_log = git_event_log
|
|
|
|
if not self._manifest.superproject:
|
|
|
|
self._LogWarning(
|
|
|
|
"superproject tag is not defined in manifest: {}",
|
|
|
|
self._manifest.manifestFile,
|
|
|
|
)
|
|
|
|
return SyncResult(False, False)
|
|
|
|
|
|
|
|
_PrintBetaNotice()
|
|
|
|
|
|
|
|
should_exit = True
|
|
|
|
if not self._remote_url:
|
|
|
|
self._LogWarning(
|
|
|
|
"superproject URL is not defined in manifest: {}",
|
|
|
|
self._manifest.manifestFile,
|
|
|
|
)
|
|
|
|
return SyncResult(False, should_exit)
|
|
|
|
|
|
|
|
if not self._Init():
|
|
|
|
return SyncResult(False, should_exit)
|
|
|
|
if not self._Fetch():
|
|
|
|
return SyncResult(False, should_exit)
|
|
|
|
if not self._quiet:
|
|
|
|
print(
|
|
|
|
"%s: Initial setup for superproject completed." % self._work_git
|
|
|
|
)
|
|
|
|
return SyncResult(True, False)
|
|
|
|
|
|
|
|
def _GetAllProjectsCommitIds(self):
|
|
|
|
"""Get commit ids for all projects from superproject and save them.
|
|
|
|
|
|
|
|
Commit ids are saved in _project_commit_ids.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
CommitIdsResult
|
|
|
|
"""
|
|
|
|
sync_result = self.Sync(self._git_event_log)
|
|
|
|
if not sync_result.success:
|
|
|
|
return CommitIdsResult(None, sync_result.fatal)
|
|
|
|
|
|
|
|
data = self._LsTree()
|
|
|
|
if not data:
|
|
|
|
self._LogWarning(
|
|
|
|
"git ls-tree failed to return data for manifest: {}",
|
|
|
|
self._manifest.manifestFile,
|
|
|
|
)
|
|
|
|
return CommitIdsResult(None, True)
|
|
|
|
|
|
|
|
# Parse lines like the following to select lines starting with '160000'
|
|
|
|
# and build a dictionary with project path (last element) and its commit
|
|
|
|
# id (3rd element).
|
|
|
|
#
|
|
|
|
# 160000 commit 2c2724cb36cd5a9cec6c852c681efc3b7c6b86ea\tart\x00
|
|
|
|
# 120000 blob acc2cbdf438f9d2141f0ae424cec1d8fc4b5d97f\tbootstrap.bash\x00 # noqa: E501
|
|
|
|
commit_ids = {}
|
|
|
|
for line in data.split("\x00"):
|
|
|
|
ls_data = line.split(None, 3)
|
|
|
|
if not ls_data:
|
|
|
|
break
|
|
|
|
if ls_data[0] == "160000":
|
|
|
|
commit_ids[ls_data[3]] = ls_data[2]
|
|
|
|
|
|
|
|
self._project_commit_ids = commit_ids
|
|
|
|
return CommitIdsResult(commit_ids, False)
|
|
|
|
|
|
|
|
def _WriteManifestFile(self):
|
|
|
|
"""Writes manifest to a file.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
manifest_path: Path name of the file into which manifest is written
|
|
|
|
instead of None.
|
|
|
|
"""
|
|
|
|
if not os.path.exists(self._superproject_path):
|
|
|
|
self._LogWarning(
|
|
|
|
"missing superproject directory: {}", self._superproject_path
|
|
|
|
)
|
|
|
|
return None
|
|
|
|
manifest_str = self._manifest.ToXml(
|
|
|
|
groups=self._manifest.GetGroupsStr(), omit_local=True
|
|
|
|
).toxml()
|
|
|
|
manifest_path = self._manifest_path
|
|
|
|
try:
|
|
|
|
with open(manifest_path, "w", encoding="utf-8") as fp:
|
|
|
|
fp.write(manifest_str)
|
2023-09-29 15:04:49 +00:00
|
|
|
except OSError as e:
|
2023-03-11 06:46:20 +00:00
|
|
|
self._LogError("cannot write manifest to : {} {}", manifest_path, e)
|
|
|
|
return None
|
|
|
|
return manifest_path
|
|
|
|
|
|
|
|
def _SkipUpdatingProjectRevisionId(self, project):
|
|
|
|
"""Checks if a project's revision id needs to be updated or not.
|
|
|
|
|
|
|
|
Revision id for projects from local manifest will not be updated.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
project: project whose revision id is being updated.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
True if a project's revision id should not be updated, or False,
|
|
|
|
"""
|
|
|
|
path = project.relpath
|
|
|
|
if not path:
|
|
|
|
return True
|
|
|
|
# Skip the project with revisionId.
|
|
|
|
if project.revisionId:
|
|
|
|
return True
|
|
|
|
# Skip the project if it comes from the local manifest.
|
|
|
|
return project.manifest.IsFromLocalManifest(project)
|
|
|
|
|
|
|
|
def UpdateProjectsRevisionId(self, projects, git_event_log):
|
|
|
|
"""Update revisionId of every project in projects with the commit id.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
projects: a list of projects whose revisionId needs to be updated.
|
|
|
|
git_event_log: an EventLog, for git tracing.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
UpdateProjectsResult
|
|
|
|
"""
|
|
|
|
self._git_event_log = git_event_log
|
|
|
|
commit_ids_result = self._GetAllProjectsCommitIds()
|
|
|
|
commit_ids = commit_ids_result.commit_ids
|
|
|
|
if not commit_ids:
|
|
|
|
return UpdateProjectsResult(None, commit_ids_result.fatal)
|
|
|
|
|
|
|
|
projects_missing_commit_ids = []
|
|
|
|
for project in projects:
|
|
|
|
if self._SkipUpdatingProjectRevisionId(project):
|
|
|
|
continue
|
|
|
|
path = project.relpath
|
|
|
|
commit_id = commit_ids.get(path)
|
|
|
|
if not commit_id:
|
|
|
|
projects_missing_commit_ids.append(path)
|
|
|
|
|
|
|
|
# If superproject doesn't have a commit id for a project, then report an
|
|
|
|
# error event and continue as if do not use superproject is specified.
|
|
|
|
if projects_missing_commit_ids:
|
|
|
|
self._LogWarning(
|
|
|
|
"please file a bug using {} to report missing "
|
|
|
|
"commit_ids for: {}",
|
|
|
|
self._manifest.contactinfo.bugurl,
|
|
|
|
projects_missing_commit_ids,
|
|
|
|
)
|
|
|
|
return UpdateProjectsResult(None, False)
|
|
|
|
|
|
|
|
for project in projects:
|
|
|
|
if not self._SkipUpdatingProjectRevisionId(project):
|
|
|
|
project.SetRevisionId(commit_ids.get(project.relpath))
|
|
|
|
|
|
|
|
manifest_path = self._WriteManifestFile()
|
|
|
|
return UpdateProjectsResult(manifest_path, False)
|
Add the ability to administratively enroll repo into using superproject.
Repo will remember a choice and an expiration time of the choice, per
user, about whether to use superproject by default. When not specified
from command line and the choice is not expired, repo would use the
user default value.
When a user default value is not present and when the system wide
enable default is provided in git's system configuration, repo would
ask the user for a confirmation which will be valid for two weeks.
git_config.py: Add support for system config. When reading system
config, we would use --system to avoid hardcoding a path as the
value may be different on some other distributions.
git_superproject.py: Add a new subroutine, _UseSuperproject(), which
returns whether superproject should be used and whether it
is from a user configuration.
The value is determined in the following order:
1. If the user specifies either --use-superproject or
--no-use-superproject, then that choice is being used.
2. If neither is specified, we would then check the saved value
(upon repo init) and use that choice when there was a choice.
3. We then check if there is a saved and unexpired value for
user's choice in their ~/.gitconfig, and use the unexpired
choice, if available.
4. Finally, if all the above didn't give us a decision, and if
the git system configuration is providing a rollout hint, present
a prompt to user for their decision and save it in ~/.gitconfig.
subcmds/sync.py: Make use of the new UseSuperproject() provided by
git_superproject.py.
While there also silent stderr from git describe when determining the
version of repo.
Bug: [google internal] b/190688390
Change-Id: Iad3ee03026342ee500e5d65e2f0fa600d7637613
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309762
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Xin Li <delphij@google.com>
2021-06-16 17:19:00 +00:00
|
|
|
|
|
|
|
|
2022-04-13 15:58:58 +00:00
|
|
|
@functools.lru_cache(maxsize=10)
|
|
|
|
def _PrintBetaNotice():
|
2023-03-11 06:46:20 +00:00
|
|
|
"""Print the notice of beta status."""
|
|
|
|
print(
|
|
|
|
"NOTICE: --use-superproject is in beta; report any issues to the "
|
|
|
|
"address described in `repo version`",
|
|
|
|
file=sys.stderr,
|
|
|
|
)
|
2022-04-13 15:58:58 +00:00
|
|
|
|
|
|
|
|
Add the ability to administratively enroll repo into using superproject.
Repo will remember a choice and an expiration time of the choice, per
user, about whether to use superproject by default. When not specified
from command line and the choice is not expired, repo would use the
user default value.
When a user default value is not present and when the system wide
enable default is provided in git's system configuration, repo would
ask the user for a confirmation which will be valid for two weeks.
git_config.py: Add support for system config. When reading system
config, we would use --system to avoid hardcoding a path as the
value may be different on some other distributions.
git_superproject.py: Add a new subroutine, _UseSuperproject(), which
returns whether superproject should be used and whether it
is from a user configuration.
The value is determined in the following order:
1. If the user specifies either --use-superproject or
--no-use-superproject, then that choice is being used.
2. If neither is specified, we would then check the saved value
(upon repo init) and use that choice when there was a choice.
3. We then check if there is a saved and unexpired value for
user's choice in their ~/.gitconfig, and use the unexpired
choice, if available.
4. Finally, if all the above didn't give us a decision, and if
the git system configuration is providing a rollout hint, present
a prompt to user for their decision and save it in ~/.gitconfig.
subcmds/sync.py: Make use of the new UseSuperproject() provided by
git_superproject.py.
While there also silent stderr from git describe when determining the
version of repo.
Bug: [google internal] b/190688390
Change-Id: Iad3ee03026342ee500e5d65e2f0fa600d7637613
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309762
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Xin Li <delphij@google.com>
2021-06-16 17:19:00 +00:00
|
|
|
@functools.lru_cache(maxsize=None)
|
|
|
|
def _UseSuperprojectFromConfiguration():
|
2023-03-11 06:46:20 +00:00
|
|
|
"""Returns the user choice of whether to use superproject."""
|
|
|
|
user_cfg = RepoConfig.ForUser()
|
|
|
|
time_now = int(time.time())
|
|
|
|
|
|
|
|
user_value = user_cfg.GetBoolean("repo.superprojectChoice")
|
|
|
|
if user_value is not None:
|
|
|
|
user_expiration = user_cfg.GetInt("repo.superprojectChoiceExpire")
|
|
|
|
if (
|
|
|
|
user_expiration is None
|
|
|
|
or user_expiration <= 0
|
|
|
|
or user_expiration >= time_now
|
|
|
|
):
|
|
|
|
# TODO(b/190688390) - Remove prompt when we are comfortable with the
|
|
|
|
# new default value.
|
|
|
|
if user_value:
|
|
|
|
print(
|
|
|
|
(
|
|
|
|
"You are currently enrolled in Git submodules "
|
|
|
|
"experiment (go/android-submodules-quickstart). Use "
|
|
|
|
"--no-use-superproject to override.\n"
|
|
|
|
),
|
|
|
|
file=sys.stderr,
|
|
|
|
)
|
|
|
|
else:
|
|
|
|
print(
|
|
|
|
(
|
|
|
|
"You are not currently enrolled in Git submodules "
|
|
|
|
"experiment (go/android-submodules-quickstart). Use "
|
|
|
|
"--use-superproject to override.\n"
|
|
|
|
),
|
|
|
|
file=sys.stderr,
|
|
|
|
)
|
|
|
|
return user_value
|
|
|
|
|
|
|
|
# We don't have an unexpired choice, ask for one.
|
|
|
|
system_cfg = RepoConfig.ForSystem()
|
|
|
|
system_value = system_cfg.GetBoolean("repo.superprojectChoice")
|
|
|
|
if system_value:
|
|
|
|
# The system configuration is proposing that we should enable the
|
|
|
|
# use of superproject. Treat the user as enrolled for two weeks.
|
|
|
|
#
|
|
|
|
# TODO(b/190688390) - Remove prompt when we are comfortable with the new
|
|
|
|
# default value.
|
|
|
|
userchoice = True
|
|
|
|
time_choiceexpire = time_now + (86400 * 14)
|
|
|
|
user_cfg.SetString(
|
|
|
|
"repo.superprojectChoiceExpire", str(time_choiceexpire)
|
|
|
|
)
|
|
|
|
user_cfg.SetBoolean("repo.superprojectChoice", userchoice)
|
|
|
|
print(
|
|
|
|
"You are automatically enrolled in Git submodules experiment "
|
|
|
|
"(go/android-submodules-quickstart) for another two weeks.\n",
|
|
|
|
file=sys.stderr,
|
|
|
|
)
|
|
|
|
return True
|
|
|
|
|
|
|
|
# For all other cases, we would not use superproject by default.
|
|
|
|
return False
|
Add the ability to administratively enroll repo into using superproject.
Repo will remember a choice and an expiration time of the choice, per
user, about whether to use superproject by default. When not specified
from command line and the choice is not expired, repo would use the
user default value.
When a user default value is not present and when the system wide
enable default is provided in git's system configuration, repo would
ask the user for a confirmation which will be valid for two weeks.
git_config.py: Add support for system config. When reading system
config, we would use --system to avoid hardcoding a path as the
value may be different on some other distributions.
git_superproject.py: Add a new subroutine, _UseSuperproject(), which
returns whether superproject should be used and whether it
is from a user configuration.
The value is determined in the following order:
1. If the user specifies either --use-superproject or
--no-use-superproject, then that choice is being used.
2. If neither is specified, we would then check the saved value
(upon repo init) and use that choice when there was a choice.
3. We then check if there is a saved and unexpired value for
user's choice in their ~/.gitconfig, and use the unexpired
choice, if available.
4. Finally, if all the above didn't give us a decision, and if
the git system configuration is providing a rollout hint, present
a prompt to user for their decision and save it in ~/.gitconfig.
subcmds/sync.py: Make use of the new UseSuperproject() provided by
git_superproject.py.
While there also silent stderr from git describe when determining the
version of repo.
Bug: [google internal] b/190688390
Change-Id: Iad3ee03026342ee500e5d65e2f0fa600d7637613
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309762
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Xin Li <delphij@google.com>
2021-06-16 17:19:00 +00:00
|
|
|
|
|
|
|
|
2022-04-14 14:41:13 +00:00
|
|
|
def PrintMessages(use_superproject, manifest):
|
2023-03-11 06:46:20 +00:00
|
|
|
"""Returns a boolean if error/warning messages are to be printed.
|
2022-04-14 14:41:13 +00:00
|
|
|
|
2023-03-11 06:46:20 +00:00
|
|
|
Args:
|
|
|
|
use_superproject: option value from optparse.
|
|
|
|
manifest: manifest to use.
|
|
|
|
"""
|
|
|
|
return use_superproject is not None or bool(manifest.superproject)
|
2021-08-13 18:47:24 +00:00
|
|
|
|
|
|
|
|
2022-04-14 14:41:13 +00:00
|
|
|
def UseSuperproject(use_superproject, manifest):
|
2023-03-11 06:46:20 +00:00
|
|
|
"""Returns a boolean if use-superproject option is enabled.
|
2022-04-14 14:41:13 +00:00
|
|
|
|
2023-03-11 06:46:20 +00:00
|
|
|
Args:
|
|
|
|
use_superproject: option value from optparse.
|
|
|
|
manifest: manifest to use.
|
2022-06-01 21:03:34 +00:00
|
|
|
|
2023-03-11 06:46:20 +00:00
|
|
|
Returns:
|
|
|
|
Whether the superproject should be used.
|
|
|
|
"""
|
Add the ability to administratively enroll repo into using superproject.
Repo will remember a choice and an expiration time of the choice, per
user, about whether to use superproject by default. When not specified
from command line and the choice is not expired, repo would use the
user default value.
When a user default value is not present and when the system wide
enable default is provided in git's system configuration, repo would
ask the user for a confirmation which will be valid for two weeks.
git_config.py: Add support for system config. When reading system
config, we would use --system to avoid hardcoding a path as the
value may be different on some other distributions.
git_superproject.py: Add a new subroutine, _UseSuperproject(), which
returns whether superproject should be used and whether it
is from a user configuration.
The value is determined in the following order:
1. If the user specifies either --use-superproject or
--no-use-superproject, then that choice is being used.
2. If neither is specified, we would then check the saved value
(upon repo init) and use that choice when there was a choice.
3. We then check if there is a saved and unexpired value for
user's choice in their ~/.gitconfig, and use the unexpired
choice, if available.
4. Finally, if all the above didn't give us a decision, and if
the git system configuration is providing a rollout hint, present
a prompt to user for their decision and save it in ~/.gitconfig.
subcmds/sync.py: Make use of the new UseSuperproject() provided by
git_superproject.py.
While there also silent stderr from git describe when determining the
version of repo.
Bug: [google internal] b/190688390
Change-Id: Iad3ee03026342ee500e5d65e2f0fa600d7637613
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309762
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Xin Li <delphij@google.com>
2021-06-16 17:19:00 +00:00
|
|
|
|
2023-03-11 06:46:20 +00:00
|
|
|
if not manifest.superproject:
|
|
|
|
# This (sub) manifest does not have a superproject definition.
|
|
|
|
return False
|
|
|
|
elif use_superproject is not None:
|
|
|
|
return use_superproject
|
2022-04-07 18:14:46 +00:00
|
|
|
else:
|
2023-03-11 06:46:20 +00:00
|
|
|
client_value = manifest.manifestProject.use_superproject
|
|
|
|
if client_value is not None:
|
|
|
|
return client_value
|
|
|
|
elif manifest.superproject:
|
|
|
|
return _UseSuperprojectFromConfiguration()
|
|
|
|
else:
|
|
|
|
return False
|