2008-10-21 14:00:00 +00:00
|
|
|
# Copyright (C) 2008 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.
|
|
|
|
|
|
|
|
import os
|
2012-04-16 18:02:21 +00:00
|
|
|
import platform
|
2012-04-16 17:36:08 +00:00
|
|
|
import re
|
2021-07-26 23:08:54 +00:00
|
|
|
import subprocess
|
2008-10-21 14:00:00 +00:00
|
|
|
import sys
|
2019-06-13 06:24:21 +00:00
|
|
|
import urllib.parse
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
from color import Coloring
|
2009-03-04 01:47:06 +00:00
|
|
|
from command import InteractiveCommand, MirrorSafeCommand
|
2008-10-21 14:00:00 +00:00
|
|
|
from error import ManifestParseError
|
2015-03-17 18:29:58 +00:00
|
|
|
from project import SyncBuffer
|
2011-09-19 21:50:58 +00:00
|
|
|
from git_config import GitConfig
|
2020-02-11 23:51:08 +00:00
|
|
|
from git_command import git_require, MIN_GIT_VERSION_SOFT, MIN_GIT_VERSION_HARD
|
2021-07-26 23:08:54 +00:00
|
|
|
import fetch
|
2021-02-09 08:26:31 +00:00
|
|
|
import git_superproject
|
2016-11-03 17:37:53 +00:00
|
|
|
import platform_utils
|
2020-02-29 07:53:41 +00:00
|
|
|
from wrapper import Wrapper
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2020-02-12 06:20:19 +00:00
|
|
|
|
2009-03-04 01:47:06 +00:00
|
|
|
class Init(InteractiveCommand, MirrorSafeCommand):
|
2021-06-14 20:05:19 +00:00
|
|
|
COMMON = True
|
2021-02-18 20:20:15 +00:00
|
|
|
helpSummary = "Initialize a repo client checkout in the current directory"
|
2008-10-21 14:00:00 +00:00
|
|
|
helpUsage = """
|
2021-02-18 20:20:15 +00:00
|
|
|
%prog [options] [manifest url]
|
2008-10-21 14:00:00 +00:00
|
|
|
"""
|
|
|
|
helpDescription = """
|
|
|
|
The '%prog' command is run once to install and initialize repo.
|
|
|
|
The latest repo source code and manifest collection is downloaded
|
|
|
|
from the server and is installed in the .repo/ directory in the
|
|
|
|
current working directory.
|
|
|
|
|
2021-02-18 20:20:15 +00:00
|
|
|
When creating a new checkout, the manifest URL is the only required setting.
|
|
|
|
It may be specified using the --manifest-url option, or as the first optional
|
|
|
|
argument.
|
|
|
|
|
2009-04-18 18:33:32 +00:00
|
|
|
The optional -b argument can be used to select the manifest branch
|
2020-09-06 19:51:21 +00:00
|
|
|
to checkout and use. If no branch is specified, the remote's default
|
2021-02-23 20:43:07 +00:00
|
|
|
branch is used. This is equivalent to using -b HEAD.
|
2009-04-18 18:33:32 +00:00
|
|
|
|
|
|
|
The optional -m argument can be used to specify an alternate manifest
|
|
|
|
to be used. If no manifest is specified, the manifest default.xml
|
|
|
|
will be used.
|
|
|
|
|
2021-07-26 23:08:54 +00:00
|
|
|
If the --standalone-manifest argument is set, the manifest will be downloaded
|
|
|
|
directly from the specified --manifest-url as a static file (rather than
|
|
|
|
setting up a manifest git checkout). With --standalone-manifest, the manifest
|
|
|
|
will be fully static and will not be re-downloaded during subsesquent
|
|
|
|
`repo init` and `repo sync` calls.
|
|
|
|
|
2010-10-08 08:02:09 +00:00
|
|
|
The --reference option can be used to point to a directory that
|
|
|
|
has the content of a --mirror sync. This will make the working
|
|
|
|
directory use as much data as possible from the local reference
|
|
|
|
directory when fetching from the server. This will make the sync
|
|
|
|
go a lot faster by reducing data traffic on the network.
|
|
|
|
|
2018-10-19 10:07:05 +00:00
|
|
|
The --dissociate option can be used to borrow the objects from
|
|
|
|
the directory specified with the --reference option only to reduce
|
|
|
|
network transfer, and stop borrowing from them after a first clone
|
|
|
|
is made by making necessary local copies of borrowed objects.
|
|
|
|
|
2015-12-11 03:16:41 +00:00
|
|
|
The --no-clone-bundle option disables any attempt to use
|
|
|
|
$URL/clone.bundle to bootstrap a new Git repository from a
|
|
|
|
resumeable bundle file on a content delivery network. This
|
|
|
|
may be necessary if there are problems with the local Python
|
|
|
|
HTTP client or proxy configuration, but the Git binary works.
|
2010-10-08 08:02:09 +00:00
|
|
|
|
2018-10-10 05:05:11 +00:00
|
|
|
# Switching Manifest Branches
|
2009-04-18 18:33:32 +00:00
|
|
|
|
|
|
|
To switch to another manifest branch, `repo init -b otherbranch`
|
|
|
|
may be used in an existing client. However, as this only updates the
|
|
|
|
manifest, a subsequent `repo sync` (or `repo sync -d`) is necessary
|
|
|
|
to update the working directory files.
|
2008-10-21 14:00:00 +00:00
|
|
|
"""
|
|
|
|
|
2021-04-13 18:57:40 +00:00
|
|
|
def _CommonOptions(self, p):
|
|
|
|
"""Disable due to re-use of Wrapper()."""
|
|
|
|
|
2020-02-05 05:01:59 +00:00
|
|
|
def _Options(self, p, gitc_init=False):
|
2021-04-08 23:14:15 +00:00
|
|
|
Wrapper().InitParser(p, gitc_init=gitc_init)
|
2011-04-05 09:31:10 +00:00
|
|
|
|
2012-11-16 18:13:09 +00:00
|
|
|
def _RegisteredEnvironmentOptions(self):
|
|
|
|
return {'REPO_MANIFEST_URL': 'manifest_url',
|
|
|
|
'REPO_MIRROR_LOCATION': 'reference'}
|
|
|
|
|
2021-03-04 18:29:40 +00:00
|
|
|
def _CloneSuperproject(self, opt):
|
|
|
|
"""Clone the superproject based on the superproject's url and branch.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
opt: Program options returned from optparse. See _Options().
|
|
|
|
"""
|
2021-02-09 08:26:31 +00:00
|
|
|
superproject = git_superproject.Superproject(self.manifest,
|
2021-03-04 18:29:40 +00:00
|
|
|
self.repodir,
|
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
|
|
|
self.git_event_log,
|
2021-03-04 18:29:40 +00:00
|
|
|
quiet=opt.quiet)
|
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
|
|
|
sync_result = superproject.Sync()
|
|
|
|
if not sync_result.success:
|
superproject - More friendly user message when superproject failed.
superproject is going to be default for some users. This change
doesn't fail for repo init or repo sync if source couldn't be synced
because of errors in superproject and superproject=true in the config
file. The commands will fail if --use-superproject is specified on
the command line explicitly.
The error messages are logged with trace2 event logs and will be
monitored.
+ sync - When there are errors with superproject and git_superproject
says it is fatal failure, sync will exit only when --use-superproject
option is specified on the command line.
+ init - command doesn't fail *if there are any superproject errors),
but it will print a warning message and logs message via trace2 event
logs. For fatal errors, init will exit only when --use-superproject
option is specified on the command line.
+ All git commands log the command that is being executed so trace2
event logs will know the manifest, remote url and the branch name.
There is no functional change other than fatal errors are honored with
--use-supeproject option with init/sync commands.
Tested the code with the following commands.
$ ./run_tests -v
Test 1 - sync'ing without errors
--------------------------------
Added the following lines to '~/.repoconfig/config
[repo]
superproject = true
$ repo_dev init -u https://android.googlesource.com/platform/manifest -b android-s-beta-2
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
repo: error: git fetch call failed, command: git ['fetch', 'https://android.googlesource.com/platform/superproject', '--depth', '1', '--force', '--no-tags', '--filter', 'blob:none', 'android-s-beta-2:android-s-beta-2'], return code: 128, stderr: fatal: couldn't find remote ref android-s-beta-2
warning: git update of superproject failed, repo sync will not use superproject to fetch source; while this error is not fatal, and you can continue to run repo sync, please run repo init with the --no-use-superproject option to stop seeing this warning
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 /usr/local/google/home/rtenneti/work/drive2/android/test
$ repo_dev sync
remote: Total 4 (delta 1), reused 4 (delta 1)
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
/usr/local/google/home/rtenneti/work/drive2/android/aosp/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Initial setup for superproject completed.
...
Test 2 - init and sync fail when --use-superproject option is passed
--------------------------------------------------------------------
$ repo_dev init -u https://android.googlesource.com/platform/manifest -b android-s-beta-2 --use-superproject
remote: Total 57 (delta 16), reused 56 (delta 16)
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
repo: error: git fetch call failed, command: git ['fetch', 'https://android.googlesource.com/platform/superproject', '--depth', '1', '--force', '--no-tags', '--filter', 'blob:none', 'android-s-beta-2:android-s-beta-2'], return code: 128, stderr: fatal: couldn't find remote ref android-s-beta-2
warning: git update of superproject failed, repo sync will not use superproject to fetch source; while this error is not fatal, and you can continue to run repo sync, please run repo init with the --no-use-superproject option to stop seeing this warning
rtenneti@rtenneti2:~/work/drive2/android/test$ repo_dev sync --use-superproject
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
repo: error: git fetch call failed, command: git ['fetch', 'https://android.googlesource.com/platform/superproject', '--depth', '1', '--force', '--no-tags', '--filter', 'blob:none', 'android-s-beta-2:android-s-beta-2'], return code: 128, stderr: fatal: couldn't find remote ref android-s-beta-2
warning: Cannot get project commit ids from manifest
warning: Update of revisionId from superproject has failed, repo sync will not use superproject to fetch the source. Please resync with the --no-use-superproject option to avoid this repo warning.
Test 3 - git fetch command fails and git command is printed
-----------------------------------------------------------
With config change
$ repo_dev init -u https://android.googlesource.com/platform/manifest -b android-s-beta-2
...
NOTICE: --use-superproject is in beta; report any issues to the address described in `repo version`
.../android/test/.repo/exp-superproject/925043f706ba64db713e9bf3b55987e2-superproject.git: Performing initial setup for superproject; this might take several minutes.
repo: error: git fetch call failed,command: git ['fetch', 'https://android.googlesource.com/platform/superproject', '--depth', '1', '--force', '--no-tags', '--filter', 'blob:none', 'android-s-beta-2:android-s-beta-2'], return code: 128, stderr: fatal: couldn't find remote ref android-s-beta-2
warning: git update of superproject failed, repo sync will not use superproject to fetch source; while this error is not fatal and you can continue to run repo sync please run repo init with the --no-use-superproject option to avoid the repo warning
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 ....
Test 4 - no superproject tag
-----------------------------
$ repo_dev init -u https://android.googlesource.com/platform/manifest -b pie-dev
...
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/pie_dev/.repo/manifest.xml
warning: git update of superproject failed, repo sync will not use superproject to fetch source; while this error is not fatal and you can continue to run repo sync please run repo init with the --no-use-superproject option to avoid the repo warning
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 ...
$ repo_dev sync
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: /usr/local/google/home/rtenneti/work/drive2/android/pie_dev/.repo/manifest.xml
warning: Cannot get project commit ids from manifest
warning: Update of revsionId from superproject has failed. Please resync with --no-use-superproject option to avoid the repo warning.
Bug: [google internal] b/192614798
Bug: [google internal] b/Bug: [google internal] b/192614798
Change-Id: I9a97a0e7d9e609fad151bd7dd9cfc523eaa887cd
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/311502
Reviewed-by: Amith Dsouza <amithds@google.com>
Reviewed-by: Xin Li <delphij@google.com>
Tested-by: Raman Tenneti <rtenneti@google.com>
2021-07-07 04:30:06 +00:00
|
|
|
print('warning: git update of superproject failed, repo sync will not '
|
|
|
|
'use superproject to fetch source; while this error is not fatal, '
|
|
|
|
'and you can continue to run repo sync, please run repo init with '
|
|
|
|
'the --no-use-superproject option to stop seeing this warning',
|
|
|
|
file=sys.stderr)
|
|
|
|
if sync_result.fatal and opt.use_superproject is not None:
|
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
|
|
|
sys.exit(1)
|
2021-02-09 08:26:31 +00:00
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
def _SyncManifest(self, opt):
|
|
|
|
m = self.manifest.manifestProject
|
2009-03-10 01:51:58 +00:00
|
|
|
is_new = not m.Exists
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2021-07-26 23:08:54 +00:00
|
|
|
# If repo has already been initialized, we take -u with the absence of
|
|
|
|
# --standalone-manifest to mean "transition to a standard repo set up",
|
|
|
|
# which necessitates starting fresh.
|
|
|
|
# If --standalone-manifest is set, we always tear everything down and start
|
|
|
|
# anew.
|
|
|
|
if not is_new:
|
|
|
|
was_standalone_manifest = m.config.GetString('manifest.standalone')
|
2021-10-11 18:14:35 +00:00
|
|
|
if was_standalone_manifest and not opt.manifest_url:
|
|
|
|
print('fatal: repo was initialized with a standlone manifest, '
|
|
|
|
'cannot be re-initialized without --manifest-url/-u')
|
|
|
|
sys.exit(1)
|
|
|
|
|
2021-07-26 23:08:54 +00:00
|
|
|
if opt.standalone_manifest or (
|
|
|
|
was_standalone_manifest and opt.manifest_url):
|
|
|
|
m.config.ClearCache()
|
|
|
|
if m.gitdir and os.path.exists(m.gitdir):
|
|
|
|
platform_utils.rmtree(m.gitdir)
|
|
|
|
if m.worktree and os.path.exists(m.worktree):
|
|
|
|
platform_utils.rmtree(m.worktree)
|
|
|
|
|
|
|
|
is_new = not m.Exists
|
2009-03-10 01:51:58 +00:00
|
|
|
if is_new:
|
2011-11-30 21:41:02 +00:00
|
|
|
if not opt.manifest_url:
|
2021-02-18 20:20:15 +00:00
|
|
|
print('fatal: manifest url is required.', file=sys.stderr)
|
2008-10-21 14:00:00 +00:00
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
if not opt.quiet:
|
2020-02-22 05:04:39 +00:00
|
|
|
print('Downloading manifest from %s' %
|
|
|
|
(GitConfig.ForUser().UrlInsteadOf(opt.manifest_url),),
|
2012-11-02 05:59:27 +00:00
|
|
|
file=sys.stderr)
|
2012-10-05 10:37:58 +00:00
|
|
|
|
|
|
|
# The manifest project object doesn't keep track of the path on the
|
|
|
|
# server where this git is located, so let's save that here.
|
|
|
|
mirrored_manifest_git = None
|
|
|
|
if opt.reference:
|
2015-06-03 16:21:56 +00:00
|
|
|
manifest_git_path = urllib.parse.urlparse(opt.manifest_url).path[1:]
|
2012-10-05 10:37:58 +00:00
|
|
|
mirrored_manifest_git = os.path.join(opt.reference, manifest_git_path)
|
|
|
|
if not mirrored_manifest_git.endswith(".git"):
|
|
|
|
mirrored_manifest_git += ".git"
|
|
|
|
if not os.path.exists(mirrored_manifest_git):
|
2018-01-22 17:00:24 +00:00
|
|
|
mirrored_manifest_git = os.path.join(opt.reference,
|
|
|
|
'.repo/manifests.git')
|
2012-10-05 10:37:58 +00:00
|
|
|
|
|
|
|
m._InitGitDir(mirror_git=mirrored_manifest_git)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2021-07-26 23:08:54 +00:00
|
|
|
# If standalone_manifest is set, mark the project as "standalone" -- we'll
|
|
|
|
# still do much of the manifests.git set up, but will avoid actual syncs to
|
|
|
|
# a remote.
|
|
|
|
standalone_manifest = False
|
|
|
|
if opt.standalone_manifest:
|
|
|
|
standalone_manifest = True
|
2021-10-11 17:20:39 +00:00
|
|
|
m.config.SetString('manifest.standalone', opt.manifest_url)
|
|
|
|
elif not opt.manifest_url and not opt.manifest_branch:
|
2021-07-26 23:08:54 +00:00
|
|
|
# If -u is set and --standalone-manifest is not, then we're not in
|
|
|
|
# standalone mode. Otherwise, use config to infer what we were in the last
|
|
|
|
# init.
|
|
|
|
standalone_manifest = bool(m.config.GetString('manifest.standalone'))
|
2021-10-11 17:20:39 +00:00
|
|
|
if not standalone_manifest:
|
|
|
|
m.config.SetString('manifest.standalone', None)
|
2021-07-26 23:08:54 +00:00
|
|
|
|
2019-05-21 16:41:35 +00:00
|
|
|
self._ConfigureDepth(opt)
|
|
|
|
|
2020-09-06 19:51:21 +00:00
|
|
|
# Set the remote URL before the remote branch as we might need it below.
|
2008-10-21 14:00:00 +00:00
|
|
|
if opt.manifest_url:
|
|
|
|
r = m.GetRemote(m.remote.name)
|
|
|
|
r.url = opt.manifest_url
|
|
|
|
r.ResetFetch()
|
|
|
|
r.Save()
|
|
|
|
|
2021-07-26 23:08:54 +00:00
|
|
|
if not standalone_manifest:
|
|
|
|
if opt.manifest_branch:
|
|
|
|
if opt.manifest_branch == 'HEAD':
|
|
|
|
opt.manifest_branch = m.ResolveRemoteHead()
|
|
|
|
if opt.manifest_branch is None:
|
|
|
|
print('fatal: unable to resolve HEAD', file=sys.stderr)
|
|
|
|
sys.exit(1)
|
|
|
|
m.revisionExpr = opt.manifest_branch
|
2020-09-06 19:51:21 +00:00
|
|
|
else:
|
2021-07-26 23:08:54 +00:00
|
|
|
if is_new:
|
|
|
|
default_branch = m.ResolveRemoteHead()
|
|
|
|
if default_branch is None:
|
|
|
|
# If the remote doesn't have HEAD configured, default to master.
|
|
|
|
default_branch = 'refs/heads/master'
|
|
|
|
m.revisionExpr = default_branch
|
|
|
|
else:
|
|
|
|
m.PreSync()
|
2020-09-06 19:51:21 +00:00
|
|
|
|
2012-10-25 03:23:11 +00:00
|
|
|
groups = re.split(r'[,\s]+', opt.groups)
|
2015-10-22 20:26:36 +00:00
|
|
|
all_platforms = ['linux', 'darwin', 'windows']
|
2012-04-16 18:02:21 +00:00
|
|
|
platformize = lambda x: 'platform-' + x
|
|
|
|
if opt.platform == 'auto':
|
|
|
|
if (not opt.mirror and
|
2020-02-12 05:58:39 +00:00
|
|
|
not m.config.GetString('repo.mirror') == 'true'):
|
2012-04-16 18:02:21 +00:00
|
|
|
groups.append(platformize(platform.system().lower()))
|
|
|
|
elif opt.platform == 'all':
|
2012-04-23 20:39:48 +00:00
|
|
|
groups.extend(map(platformize, all_platforms))
|
2012-04-16 18:02:21 +00:00
|
|
|
elif opt.platform in all_platforms:
|
2015-10-22 20:26:36 +00:00
|
|
|
groups.append(platformize(opt.platform))
|
2012-04-16 18:02:21 +00:00
|
|
|
elif opt.platform != 'none':
|
2012-11-02 05:59:27 +00:00
|
|
|
print('fatal: invalid platform flag', file=sys.stderr)
|
2012-04-16 18:02:21 +00:00
|
|
|
sys.exit(1)
|
|
|
|
|
2012-04-16 17:36:08 +00:00
|
|
|
groups = [x for x in groups if x]
|
|
|
|
groupstr = ','.join(groups)
|
2021-03-09 23:19:06 +00:00
|
|
|
if opt.platform == 'auto' and groupstr == self.manifest.GetDefaultGroupsStr():
|
2012-04-16 17:36:08 +00:00
|
|
|
groupstr = None
|
|
|
|
m.config.SetString('manifest.groups', groupstr)
|
2012-03-29 03:15:45 +00:00
|
|
|
|
2010-10-08 08:02:09 +00:00
|
|
|
if opt.reference:
|
|
|
|
m.config.SetString('repo.reference', opt.reference)
|
|
|
|
|
2018-10-19 10:07:05 +00:00
|
|
|
if opt.dissociate:
|
2021-02-10 04:14:41 +00:00
|
|
|
m.config.SetBoolean('repo.dissociate', opt.dissociate)
|
2018-10-19 10:07:05 +00:00
|
|
|
|
2020-02-09 07:28:34 +00:00
|
|
|
if opt.worktree:
|
|
|
|
if opt.mirror:
|
|
|
|
print('fatal: --mirror and --worktree are incompatible',
|
|
|
|
file=sys.stderr)
|
|
|
|
sys.exit(1)
|
|
|
|
if opt.submodules:
|
|
|
|
print('fatal: --submodules and --worktree are incompatible',
|
|
|
|
file=sys.stderr)
|
|
|
|
sys.exit(1)
|
2021-02-10 04:14:41 +00:00
|
|
|
m.config.SetBoolean('repo.worktree', opt.worktree)
|
2020-02-09 07:28:34 +00:00
|
|
|
if is_new:
|
|
|
|
m.use_git_worktrees = True
|
|
|
|
print('warning: --worktree is experimental!', file=sys.stderr)
|
|
|
|
|
2013-10-16 09:02:35 +00:00
|
|
|
if opt.archive:
|
|
|
|
if is_new:
|
2021-02-10 04:14:41 +00:00
|
|
|
m.config.SetBoolean('repo.archive', opt.archive)
|
2013-10-16 09:02:35 +00:00
|
|
|
else:
|
|
|
|
print('fatal: --archive is only supported when initializing a new '
|
|
|
|
'workspace.', file=sys.stderr)
|
|
|
|
print('Either delete the .repo folder in this workspace, or initialize '
|
|
|
|
'in another location.', file=sys.stderr)
|
|
|
|
sys.exit(1)
|
|
|
|
|
2008-11-04 15:37:10 +00:00
|
|
|
if opt.mirror:
|
2009-03-10 01:51:58 +00:00
|
|
|
if is_new:
|
2021-02-10 04:14:41 +00:00
|
|
|
m.config.SetBoolean('repo.mirror', opt.mirror)
|
2009-03-10 01:51:58 +00:00
|
|
|
else:
|
2012-11-21 05:41:58 +00:00
|
|
|
print('fatal: --mirror is only supported when initializing a new '
|
|
|
|
'workspace.', file=sys.stderr)
|
|
|
|
print('Either delete the .repo folder in this workspace, or initialize '
|
|
|
|
'in another location.', file=sys.stderr)
|
2009-03-10 01:51:58 +00:00
|
|
|
sys.exit(1)
|
2008-11-04 15:37:10 +00:00
|
|
|
|
2021-04-02 17:55:33 +00:00
|
|
|
if opt.partial_clone is not None:
|
2019-06-03 18:24:30 +00:00
|
|
|
if opt.mirror:
|
|
|
|
print('fatal: --mirror and --partial-clone are mutually exclusive',
|
|
|
|
file=sys.stderr)
|
|
|
|
sys.exit(1)
|
2021-02-10 04:14:41 +00:00
|
|
|
m.config.SetBoolean('repo.partialclone', opt.partial_clone)
|
2019-06-03 18:24:30 +00:00
|
|
|
if opt.clone_filter:
|
|
|
|
m.config.SetString('repo.clonefilter', opt.clone_filter)
|
2021-04-02 17:55:33 +00:00
|
|
|
elif m.config.GetBoolean('repo.partialclone'):
|
|
|
|
opt.clone_filter = m.config.GetString('repo.clonefilter')
|
2019-06-03 18:24:30 +00:00
|
|
|
else:
|
|
|
|
opt.clone_filter = None
|
|
|
|
|
2021-04-13 03:57:25 +00:00
|
|
|
if opt.partial_clone_exclude is not None:
|
|
|
|
m.config.SetString('repo.partialcloneexclude', opt.partial_clone_exclude)
|
|
|
|
|
2020-05-20 23:03:45 +00:00
|
|
|
if opt.clone_bundle is None:
|
|
|
|
opt.clone_bundle = False if opt.partial_clone else True
|
|
|
|
else:
|
2021-02-10 04:14:41 +00:00
|
|
|
m.config.SetBoolean('repo.clonebundle', opt.clone_bundle)
|
2020-05-20 23:03:45 +00:00
|
|
|
|
2017-03-21 23:05:12 +00:00
|
|
|
if opt.submodules:
|
2021-02-10 04:14:41 +00:00
|
|
|
m.config.SetBoolean('repo.submodules', opt.submodules)
|
2017-03-21 23:05:12 +00:00
|
|
|
|
2021-02-09 08:26:31 +00:00
|
|
|
if opt.use_superproject is not None:
|
|
|
|
m.config.SetBoolean('repo.superproject', opt.use_superproject)
|
|
|
|
|
2021-07-26 23:08:54 +00:00
|
|
|
if standalone_manifest:
|
|
|
|
if is_new:
|
|
|
|
manifest_name = 'default.xml'
|
2021-10-25 22:38:44 +00:00
|
|
|
manifest_data = fetch.fetch_file(opt.manifest_url, verbose=opt.verbose)
|
2021-07-26 23:08:54 +00:00
|
|
|
dest = os.path.join(m.worktree, manifest_name)
|
|
|
|
os.makedirs(os.path.dirname(dest), exist_ok=True)
|
|
|
|
with open(dest, 'wb') as f:
|
|
|
|
f.write(manifest_data)
|
|
|
|
return
|
|
|
|
|
2020-02-22 04:55:07 +00:00
|
|
|
if not m.Sync_NetworkHalf(is_new=is_new, quiet=opt.quiet, verbose=opt.verbose,
|
2020-02-17 19:36:08 +00:00
|
|
|
clone_bundle=opt.clone_bundle,
|
2020-02-12 05:58:39 +00:00
|
|
|
current_branch_only=opt.current_branch_only,
|
2020-02-17 19:36:08 +00:00
|
|
|
tags=opt.tags, submodules=opt.submodules,
|
2021-04-13 03:57:25 +00:00
|
|
|
clone_filter=opt.clone_filter,
|
|
|
|
partial_clone_exclude=self.manifest.PartialCloneExclude):
|
2009-03-17 15:06:18 +00:00
|
|
|
r = m.GetRemote(m.remote.name)
|
2012-11-02 05:59:27 +00:00
|
|
|
print('fatal: cannot obtain manifest %s' % r.url, file=sys.stderr)
|
2011-04-07 20:36:30 +00:00
|
|
|
|
|
|
|
# Better delete the manifest git dir if we created it; otherwise next
|
|
|
|
# time (when user fixes problems) we won't go through the "is_new" logic.
|
|
|
|
if is_new:
|
2016-11-03 17:37:53 +00:00
|
|
|
platform_utils.rmtree(m.gitdir)
|
2009-03-17 15:06:18 +00:00
|
|
|
sys.exit(1)
|
|
|
|
|
2012-06-07 15:19:26 +00:00
|
|
|
if opt.manifest_branch:
|
2017-07-10 21:46:25 +00:00
|
|
|
m.MetaBranchSwitch(submodules=opt.submodules)
|
2012-06-07 15:19:26 +00:00
|
|
|
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
syncbuf = SyncBuffer(m.config)
|
2017-03-21 23:05:12 +00:00
|
|
|
m.Sync_LocalHalf(syncbuf, submodules=opt.submodules)
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
syncbuf.Finish()
|
|
|
|
|
2009-03-17 15:15:27 +00:00
|
|
|
if is_new or m.CurrentBranch is None:
|
2009-04-10 23:21:18 +00:00
|
|
|
if not m.StartBranch('default'):
|
2012-11-02 05:59:27 +00:00
|
|
|
print('fatal: cannot create default in manifest', file=sys.stderr)
|
2009-04-10 23:21:18 +00:00
|
|
|
sys.exit(1)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
def _LinkManifest(self, name):
|
|
|
|
if not name:
|
2012-11-02 05:59:27 +00:00
|
|
|
print('fatal: manifest name (-m) is required.', file=sys.stderr)
|
2008-10-21 14:00:00 +00:00
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
try:
|
|
|
|
self.manifest.Link(name)
|
2012-09-09 22:37:57 +00:00
|
|
|
except ManifestParseError as e:
|
2012-11-02 05:59:27 +00:00
|
|
|
print("fatal: manifest '%s' not available" % name, file=sys.stderr)
|
|
|
|
print('fatal: %s' % str(e), file=sys.stderr)
|
2008-10-21 14:00:00 +00:00
|
|
|
sys.exit(1)
|
|
|
|
|
2009-07-02 17:53:04 +00:00
|
|
|
def _Prompt(self, prompt, value):
|
2019-07-04 21:35:11 +00:00
|
|
|
print('%-10s [%s]: ' % (prompt, value), end='')
|
|
|
|
# TODO: When we require Python 3, use flush=True w/print above.
|
|
|
|
sys.stdout.flush()
|
2008-10-21 14:00:00 +00:00
|
|
|
a = sys.stdin.readline().strip()
|
2009-07-02 17:53:04 +00:00
|
|
|
if a == '':
|
|
|
|
return value
|
|
|
|
return a
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2020-02-22 03:48:40 +00:00
|
|
|
def _ShouldConfigureUser(self, opt):
|
2020-09-06 18:53:18 +00:00
|
|
|
gc = self.client.globalConfig
|
2011-04-05 09:31:10 +00:00
|
|
|
mp = self.manifest.manifestProject
|
|
|
|
|
|
|
|
# If we don't have local settings, get from global.
|
|
|
|
if not mp.config.Has('user.name') or not mp.config.Has('user.email'):
|
|
|
|
if not gc.Has('user.name') or not gc.Has('user.email'):
|
|
|
|
return True
|
|
|
|
|
|
|
|
mp.config.SetString('user.name', gc.GetString('user.name'))
|
|
|
|
mp.config.SetString('user.email', gc.GetString('user.email'))
|
|
|
|
|
2020-02-22 03:48:40 +00:00
|
|
|
if not opt.quiet:
|
|
|
|
print()
|
|
|
|
print('Your identity is: %s <%s>' % (mp.config.GetString('user.name'),
|
|
|
|
mp.config.GetString('user.email')))
|
|
|
|
print("If you want to change this, please re-run 'repo init' with --config-name")
|
2011-04-05 09:31:10 +00:00
|
|
|
return False
|
|
|
|
|
2020-02-22 03:48:40 +00:00
|
|
|
def _ConfigureUser(self, opt):
|
2008-10-21 14:00:00 +00:00
|
|
|
mp = self.manifest.manifestProject
|
|
|
|
|
2009-07-02 17:53:04 +00:00
|
|
|
while True:
|
2020-02-22 03:48:40 +00:00
|
|
|
if not opt.quiet:
|
|
|
|
print()
|
2020-02-12 05:31:05 +00:00
|
|
|
name = self._Prompt('Your Name', mp.UserName)
|
2009-07-02 17:53:04 +00:00
|
|
|
email = self._Prompt('Your Email', mp.UserEmail)
|
|
|
|
|
2020-02-22 03:48:40 +00:00
|
|
|
if not opt.quiet:
|
|
|
|
print()
|
2012-11-02 05:59:27 +00:00
|
|
|
print('Your identity is: %s <%s>' % (name, email))
|
2019-07-04 21:35:11 +00:00
|
|
|
print('is this correct [y/N]? ', end='')
|
|
|
|
# TODO: When we require Python 3, use flush=True w/print above.
|
|
|
|
sys.stdout.flush()
|
2012-11-14 00:19:39 +00:00
|
|
|
a = sys.stdin.readline().strip().lower()
|
2010-04-01 18:03:53 +00:00
|
|
|
if a in ('yes', 'y', 't', 'true'):
|
2009-07-02 17:53:04 +00:00
|
|
|
break
|
|
|
|
|
|
|
|
if name != mp.UserName:
|
|
|
|
mp.config.SetString('user.name', name)
|
|
|
|
if email != mp.UserEmail:
|
|
|
|
mp.config.SetString('user.email', email)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
def _HasColorSet(self, gc):
|
|
|
|
for n in ['ui', 'diff', 'status']:
|
|
|
|
if gc.Has('color.%s' % n):
|
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
|
|
|
def _ConfigureColor(self):
|
2020-09-06 18:53:18 +00:00
|
|
|
gc = self.client.globalConfig
|
2008-10-21 14:00:00 +00:00
|
|
|
if self._HasColorSet(gc):
|
|
|
|
return
|
|
|
|
|
|
|
|
class _Test(Coloring):
|
|
|
|
def __init__(self):
|
|
|
|
Coloring.__init__(self, gc, 'test color display')
|
|
|
|
self._on = True
|
|
|
|
out = _Test()
|
|
|
|
|
2012-11-02 05:59:27 +00:00
|
|
|
print()
|
|
|
|
print("Testing colorized output (for 'repo diff', 'repo status'):")
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2012-11-14 03:09:38 +00:00
|
|
|
for c in ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan']:
|
2008-10-21 14:00:00 +00:00
|
|
|
out.write(' ')
|
|
|
|
out.printer(fg=c)(' %-6s ', c)
|
|
|
|
out.write(' ')
|
|
|
|
out.printer(fg='white', bg='black')(' %s ' % 'white')
|
|
|
|
out.nl()
|
|
|
|
|
2012-11-14 03:09:38 +00:00
|
|
|
for c in ['bold', 'dim', 'ul', 'reverse']:
|
2008-10-21 14:00:00 +00:00
|
|
|
out.write(' ')
|
|
|
|
out.printer(fg='black', attr=c)(' %-6s ', c)
|
|
|
|
out.nl()
|
|
|
|
|
2019-07-04 21:35:11 +00:00
|
|
|
print('Enable color display in this user account (y/N)? ', end='')
|
|
|
|
# TODO: When we require Python 3, use flush=True w/print above.
|
|
|
|
sys.stdout.flush()
|
2008-10-21 14:00:00 +00:00
|
|
|
a = sys.stdin.readline().strip().lower()
|
|
|
|
if a in ('y', 'yes', 't', 'true', 'on'):
|
|
|
|
gc.SetString('color.ui', 'auto')
|
|
|
|
|
2011-05-04 22:01:04 +00:00
|
|
|
def _ConfigureDepth(self, opt):
|
|
|
|
"""Configure the depth we'll sync down.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
opt: Options from optparse. We care about opt.depth.
|
|
|
|
"""
|
|
|
|
# Opt.depth will be non-None if user actually passed --depth to repo init.
|
|
|
|
if opt.depth is not None:
|
|
|
|
if opt.depth > 0:
|
|
|
|
# Positive values will set the depth.
|
|
|
|
depth = str(opt.depth)
|
|
|
|
else:
|
|
|
|
# Negative numbers will clear the depth; passing None to SetString
|
|
|
|
# will do that.
|
|
|
|
depth = None
|
|
|
|
|
|
|
|
# We store the depth in the main manifest project.
|
|
|
|
self.manifest.manifestProject.config.SetString('repo.depth', depth)
|
|
|
|
|
2020-02-22 03:48:40 +00:00
|
|
|
def _DisplayResult(self, opt):
|
2012-10-23 07:41:54 +00:00
|
|
|
if self.manifest.IsMirror:
|
|
|
|
init_type = 'mirror '
|
|
|
|
else:
|
|
|
|
init_type = ''
|
|
|
|
|
2020-02-22 03:48:40 +00:00
|
|
|
if not opt.quiet:
|
|
|
|
print()
|
|
|
|
print('repo %shas been initialized in %s' %
|
|
|
|
(init_type, self.manifest.topdir))
|
2012-10-23 07:41:54 +00:00
|
|
|
|
|
|
|
current_dir = os.getcwd()
|
|
|
|
if current_dir != self.manifest.topdir:
|
2013-01-29 00:49:48 +00:00
|
|
|
print('If this is not the directory in which you want to initialize '
|
2012-11-02 05:59:27 +00:00
|
|
|
'repo, please run:')
|
|
|
|
print(' rm -r %s/.repo' % self.manifest.topdir)
|
|
|
|
print('and try again.')
|
2012-10-23 07:41:54 +00:00
|
|
|
|
2019-08-27 05:10:59 +00:00
|
|
|
def ValidateOptions(self, opt, args):
|
2012-10-05 12:50:05 +00:00
|
|
|
if opt.reference:
|
2018-01-22 16:57:29 +00:00
|
|
|
opt.reference = os.path.expanduser(opt.reference)
|
2012-10-05 12:50:05 +00:00
|
|
|
|
2013-10-16 09:02:35 +00:00
|
|
|
# Check this here, else manifest will be tagged "not new" and init won't be
|
|
|
|
# possible anymore without removing the .repo/manifests directory.
|
2021-11-16 19:48:09 +00:00
|
|
|
if opt.mirror:
|
|
|
|
if opt.archive:
|
|
|
|
self.OptionParser.error('--mirror and --archive cannot be used '
|
|
|
|
'together.')
|
|
|
|
if opt.use_superproject is not None:
|
|
|
|
self.OptionParser.error('--mirror and --use-superproject cannot be '
|
|
|
|
'used together.')
|
2019-08-27 05:10:59 +00:00
|
|
|
|
2021-07-26 23:08:54 +00:00
|
|
|
if opt.standalone_manifest and (
|
|
|
|
opt.manifest_branch or opt.manifest_name != 'default.xml'):
|
|
|
|
self.OptionParser.error('--manifest-branch and --manifest-name cannot'
|
|
|
|
' be used with --standalone-manifest.')
|
|
|
|
|
2020-08-27 05:50:12 +00:00
|
|
|
if args:
|
2021-02-18 20:20:15 +00:00
|
|
|
if opt.manifest_url:
|
|
|
|
self.OptionParser.error(
|
|
|
|
'--manifest-url option and URL argument both specified: only use '
|
|
|
|
'one to select the manifest URL.')
|
|
|
|
|
|
|
|
opt.manifest_url = args.pop(0)
|
|
|
|
|
|
|
|
if args:
|
|
|
|
self.OptionParser.error('too many arguments to init')
|
2020-08-27 05:50:12 +00:00
|
|
|
|
2019-08-27 05:10:59 +00:00
|
|
|
def Execute(self, opt, args):
|
2020-02-11 23:51:08 +00:00
|
|
|
git_require(MIN_GIT_VERSION_HARD, fail=True)
|
|
|
|
if not git_require(MIN_GIT_VERSION_SOFT):
|
|
|
|
print('repo: warning: git-%s+ will soon be required; please upgrade your '
|
|
|
|
'version of git to maintain support.'
|
|
|
|
% ('.'.join(str(x) for x in MIN_GIT_VERSION_SOFT),),
|
|
|
|
file=sys.stderr)
|
2013-10-16 09:02:35 +00:00
|
|
|
|
2020-02-29 07:53:41 +00:00
|
|
|
rp = self.manifest.repoProject
|
|
|
|
|
|
|
|
# Handle new --repo-url requests.
|
|
|
|
if opt.repo_url:
|
|
|
|
remote = rp.GetRemote('origin')
|
|
|
|
remote.url = opt.repo_url
|
|
|
|
remote.Save()
|
|
|
|
|
2020-02-29 07:53:41 +00:00
|
|
|
# Handle new --repo-rev requests.
|
|
|
|
if opt.repo_rev:
|
|
|
|
wrapper = Wrapper()
|
|
|
|
remote_ref, rev = wrapper.check_repo_rev(
|
|
|
|
rp.gitdir, opt.repo_rev, repo_verify=opt.repo_verify, quiet=opt.quiet)
|
|
|
|
branch = rp.GetBranch('default')
|
|
|
|
branch.merge = remote_ref
|
2020-12-06 03:57:19 +00:00
|
|
|
rp.work_git.reset('--hard', rev)
|
2020-02-29 07:53:41 +00:00
|
|
|
branch.Save()
|
|
|
|
|
2020-02-09 07:28:34 +00:00
|
|
|
if opt.worktree:
|
|
|
|
# Older versions of git supported worktree, but had dangerous gc bugs.
|
|
|
|
git_require((2, 15, 0), fail=True, msg='git gc worktree corruption')
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
self._SyncManifest(opt)
|
|
|
|
self._LinkManifest(opt.manifest_name)
|
|
|
|
|
2021-02-09 08:26:31 +00:00
|
|
|
if self.manifest.manifestProject.config.GetBoolean('repo.superproject'):
|
2021-03-04 18:29:40 +00:00
|
|
|
self._CloneSuperproject(opt)
|
2021-02-09 08:26:31 +00:00
|
|
|
|
2009-03-19 17:17:12 +00:00
|
|
|
if os.isatty(0) and os.isatty(1) and not self.manifest.IsMirror:
|
2020-02-22 03:48:40 +00:00
|
|
|
if opt.config_name or self._ShouldConfigureUser(opt):
|
|
|
|
self._ConfigureUser(opt)
|
2008-10-21 14:00:00 +00:00
|
|
|
self._ConfigureColor()
|
|
|
|
|
2020-02-22 03:48:40 +00:00
|
|
|
self._DisplayResult(opt)
|