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.
|
|
|
|
|
2019-06-13 06:24:21 +00:00
|
|
|
import http.cookiejar as cookielib
|
2014-05-06 14:57:48 +00:00
|
|
|
import json
|
2012-08-24 01:21:02 +00:00
|
|
|
import netrc
|
2009-04-10 23:51:53 +00:00
|
|
|
from optparse import SUPPRESS_HELP
|
2008-10-21 14:00:00 +00:00
|
|
|
import os
|
|
|
|
import re
|
2010-04-06 17:40:01 +00:00
|
|
|
import socket
|
2008-10-21 14:00:00 +00:00
|
|
|
import subprocess
|
|
|
|
import sys
|
2015-08-17 20:41:45 +00:00
|
|
|
import tempfile
|
2009-04-18 17:49:00 +00:00
|
|
|
import time
|
2019-06-13 06:24:21 +00:00
|
|
|
import urllib.error
|
|
|
|
import urllib.parse
|
|
|
|
import urllib.request
|
|
|
|
import xmlrpc.client
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2010-05-08 20:32:08 +00:00
|
|
|
try:
|
|
|
|
import threading as _threading
|
|
|
|
except ImportError:
|
|
|
|
import dummy_threading as _threading
|
|
|
|
|
2011-09-23 00:23:41 +00:00
|
|
|
try:
|
|
|
|
import resource
|
2020-02-12 06:20:19 +00:00
|
|
|
|
2011-09-23 00:23:41 +00:00
|
|
|
def _rlimit_nofile():
|
|
|
|
return resource.getrlimit(resource.RLIMIT_NOFILE)
|
|
|
|
except ImportError:
|
|
|
|
def _rlimit_nofile():
|
|
|
|
return (256, 256)
|
|
|
|
|
2012-10-24 00:02:59 +00:00
|
|
|
try:
|
|
|
|
import multiprocessing
|
|
|
|
except ImportError:
|
|
|
|
multiprocessing = None
|
|
|
|
|
2017-04-05 07:02:59 +00:00
|
|
|
import event_log
|
2012-10-31 19:24:38 +00:00
|
|
|
from git_command import GIT, git_require
|
2015-08-20 07:55:42 +00:00
|
|
|
from git_config import GetUrlCookieFile
|
2012-09-07 00:52:04 +00:00
|
|
|
from git_refs import R_HEADS, HEAD
|
2021-01-15 03:17:50 +00:00
|
|
|
import git_superproject
|
2015-08-10 20:23:23 +00:00
|
|
|
import gitc_utils
|
2009-06-02 04:10:33 +00:00
|
|
|
from project import Project
|
|
|
|
from project import RemoteSpec
|
2009-03-04 01:47:06 +00:00
|
|
|
from command import Command, MirrorSafeCommand
|
2021-02-04 22:39:38 +00:00
|
|
|
from error import RepoChangedException, GitError, ManifestParseError
|
2016-11-03 17:37:53 +00:00
|
|
|
import platform_utils
|
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
|
|
|
from project import SyncBuffer
|
2009-04-10 23:48:52 +00:00
|
|
|
from progress import Progress
|
2014-01-30 23:09:59 +00:00
|
|
|
from wrapper import Wrapper
|
2015-09-08 20:27:20 +00:00
|
|
|
from manifest_xml import GitcManifest
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2012-10-23 22:00:54 +00:00
|
|
|
_ONE_DAY_S = 24 * 60 * 60
|
|
|
|
|
2020-02-12 06:20:19 +00:00
|
|
|
|
2011-03-16 22:49:18 +00:00
|
|
|
class _FetchError(Exception):
|
|
|
|
"""Internal error thrown in _FetchHelper() when we don't want stack trace."""
|
|
|
|
pass
|
|
|
|
|
2020-02-12 06:20:19 +00:00
|
|
|
|
2019-06-03 18:24:30 +00:00
|
|
|
class _CheckoutError(Exception):
|
|
|
|
"""Internal error thrown in _CheckoutOne() when we don't want stack trace."""
|
|
|
|
|
2020-02-12 06:20:19 +00:00
|
|
|
|
2009-03-04 01:47:06 +00:00
|
|
|
class Sync(Command, MirrorSafeCommand):
|
2010-05-08 20:32:08 +00:00
|
|
|
jobs = 1
|
2008-10-21 14:00:00 +00:00
|
|
|
common = True
|
|
|
|
helpSummary = "Update working tree to the latest revision"
|
|
|
|
helpUsage = """
|
|
|
|
%prog [<project>...]
|
|
|
|
"""
|
|
|
|
helpDescription = """
|
|
|
|
The '%prog' command synchronizes local project directories
|
|
|
|
with the remote repositories specified in the manifest. If a local
|
|
|
|
project does not yet exist, it will clone a new local directory from
|
|
|
|
the remote repository and set up tracking branches as specified in
|
|
|
|
the manifest. If the local project already exists, '%prog'
|
|
|
|
will update the remote branches and rebase any new local changes
|
|
|
|
on top of the new remote changes.
|
|
|
|
|
|
|
|
'%prog' will synchronize all projects listed at the command
|
|
|
|
line. Projects can be specified either by name, or by a relative
|
|
|
|
or absolute path to the project's local directory. If no projects
|
|
|
|
are specified, '%prog' will synchronize all projects listed in
|
|
|
|
the manifest.
|
2009-04-10 23:59:36 +00:00
|
|
|
|
|
|
|
The -d/--detach option can be used to switch specified projects
|
|
|
|
back to the manifest revision. This option is especially helpful
|
|
|
|
if the project is currently on a topic branch, but the manifest
|
|
|
|
revision is temporarily needed.
|
2009-04-21 15:02:04 +00:00
|
|
|
|
2010-04-06 17:40:01 +00:00
|
|
|
The -s/--smart-sync option can be used to sync to a known good
|
|
|
|
build as specified by the manifest-server element in the current
|
2011-04-19 08:32:52 +00:00
|
|
|
manifest. The -t/--smart-tag option is similar and allows you to
|
|
|
|
specify a custom tag/label.
|
2010-04-06 17:40:01 +00:00
|
|
|
|
2012-09-14 01:31:42 +00:00
|
|
|
The -u/--manifest-server-username and -p/--manifest-server-password
|
|
|
|
options can be used to specify a username and password to authenticate
|
|
|
|
with the manifest server when using the -s or -t option.
|
|
|
|
|
|
|
|
If -u and -p are not specified when using the -s or -t option, '%prog'
|
|
|
|
will attempt to read authentication credentials for the manifest server
|
|
|
|
from the user's .netrc file.
|
|
|
|
|
|
|
|
'%prog' will not use authentication credentials from -u/-p or .netrc
|
|
|
|
if the manifest server specified in the manifest file already includes
|
|
|
|
credentials.
|
|
|
|
|
2019-08-26 07:12:55 +00:00
|
|
|
By default, all projects will be synced. The --fail-fast option can be used
|
2020-05-24 18:56:52 +00:00
|
|
|
to halt syncing as soon as possible when the first project fails to sync.
|
2010-07-02 22:58:31 +00:00
|
|
|
|
2014-11-12 18:27:45 +00:00
|
|
|
The --force-sync option can be used to overwrite existing git
|
|
|
|
directories if they have previously been linked to a different
|
2020-06-05 17:33:40 +00:00
|
|
|
object directory. WARNING: This may cause data to be lost since
|
2014-11-12 18:27:45 +00:00
|
|
|
refs may be removed when overwriting.
|
|
|
|
|
2018-12-18 00:23:44 +00:00
|
|
|
The --force-remove-dirty option can be used to remove previously used
|
|
|
|
projects with uncommitted changes. WARNING: This may cause data to be
|
|
|
|
lost since uncommitted changes may be removed with projects that no longer
|
|
|
|
exist in the manifest.
|
|
|
|
|
2012-03-14 22:36:59 +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.
|
|
|
|
|
Represent git-submodule as nested projects, take 2
(Previous submission of this change broke Android buildbot due to
incorrect regular expression for parsing git-config output. During
investigation, we also found that Android, which pulls Chromium, has a
workaround for Chromium's submodules; its manifest includes Chromium's
submodules. This new change, in addition to fixing the regex, also
take this type of workarounds into consideration; it adds a new
attribute that makes repo not fetch submodules unless submodules have a
project element defined in the manifest, or this attribute is
overridden by a parent project element or by the default element.)
We need a representation of git-submodule in repo; otherwise repo will
not sync submodules, and leave workspace in a broken state. Of course
this will not be a problem if all projects are owned by the owner of the
manifest file, who may simply choose not to use git-submodule in all
projects. However, this is not possible in practice because manifest
file owner is unlikely to own all upstream projects.
As git submodules are simply git repositories, it is natural to treat
them as plain repo projects that live inside a repo project. That is,
we could use recursively declared projects to denote the is-submodule
relation of git repositories.
The behavior of repo remains the same to projects that do not have a
sub-project within. As for parent projects, repo fetches them and their
sub-projects as normal projects, and then checks out subprojects at the
commit specified in parent's commit object. The sub-project is fetched
at a path relative to parent project's working directory; so the path
specified in manifest file should match that of .gitmodules file.
If a submodule is not registered in repo manifest, repo will derive its
properties from itself and its parent project, which might not always be
correct. In such cases, the subproject is called a derived subproject.
To a user, a sub-project is merely a git-submodule; so all tips of
working with a git-submodule apply here, too. For example, you should
not run `repo sync` in a parent repository if its submodule is dirty.
Change-Id: I4b8344c1b9ccad2f58ad304573133e5d52e1faef
2012-01-11 03:28:42 +00:00
|
|
|
The --fetch-submodules option enables fetching Git submodules
|
|
|
|
of a project from server.
|
|
|
|
|
2015-01-29 05:36:28 +00:00
|
|
|
The -c/--current-branch option can be used to only fetch objects that
|
|
|
|
are on the branch specified by a project's revision.
|
|
|
|
|
2014-09-04 12:28:09 +00:00
|
|
|
The --optimized-fetch option can be used to only fetch projects that
|
|
|
|
are fixed to a sha1 revision if the sha1 revision does not already
|
|
|
|
exist locally.
|
|
|
|
|
2015-10-14 01:50:15 +00:00
|
|
|
The --prune option can be used to remove any refs that no longer
|
|
|
|
exist on the remote.
|
|
|
|
|
2018-10-10 05:05:11 +00:00
|
|
|
# SSH Connections
|
2009-04-21 15:02:04 +00:00
|
|
|
|
|
|
|
If at least one project remote URL uses an SSH connection (ssh://,
|
|
|
|
git+ssh://, or user@host:path syntax) repo will automatically
|
|
|
|
enable the SSH ControlMaster option when connecting to that host.
|
|
|
|
This feature permits other projects in the same '%prog' session to
|
|
|
|
reuse the same SSH tunnel, saving connection setup overheads.
|
|
|
|
|
|
|
|
To disable this behavior on UNIX platforms, set the GIT_SSH
|
|
|
|
environment variable to 'ssh'. For example:
|
|
|
|
|
|
|
|
export GIT_SSH=ssh
|
|
|
|
%prog
|
|
|
|
|
2018-10-10 05:05:11 +00:00
|
|
|
# Compatibility
|
2009-04-21 15:02:04 +00:00
|
|
|
|
|
|
|
This feature is automatically disabled on Windows, due to the lack
|
|
|
|
of UNIX domain socket support.
|
|
|
|
|
|
|
|
This feature is not compatible with url.insteadof rewrites in the
|
|
|
|
user's ~/.gitconfig. '%prog' is currently not able to perform the
|
|
|
|
rewrite early enough to establish the ControlMaster tunnel.
|
|
|
|
|
|
|
|
If the remote SSH daemon is Gerrit Code Review, version 2.0.10 or
|
|
|
|
later is required to fix a server side protocol bug.
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
"""
|
|
|
|
|
2010-05-11 19:57:01 +00:00
|
|
|
def _Options(self, p, show_smart=True):
|
2012-12-05 10:58:06 +00:00
|
|
|
try:
|
|
|
|
self.jobs = self.manifest.default.sync_j
|
|
|
|
except ManifestParseError:
|
|
|
|
self.jobs = 1
|
2011-09-23 00:44:31 +00:00
|
|
|
|
2010-07-02 22:58:31 +00:00
|
|
|
p.add_option('-f', '--force-broken',
|
2019-08-30 08:20:15 +00:00
|
|
|
dest='force_broken', action='store_true',
|
2019-08-26 07:12:55 +00:00
|
|
|
help='obsolete option (to be deleted in the future)')
|
|
|
|
p.add_option('--fail-fast',
|
|
|
|
dest='fail_fast', action='store_true',
|
|
|
|
help='stop syncing after first error is hit')
|
2014-11-12 18:27:45 +00:00
|
|
|
p.add_option('--force-sync',
|
|
|
|
dest='force_sync', action='store_true',
|
|
|
|
help="overwrite an existing git directory if it needs to "
|
|
|
|
"point to a different object directory. WARNING: this "
|
|
|
|
"may cause loss of data")
|
2018-12-18 00:23:44 +00:00
|
|
|
p.add_option('--force-remove-dirty',
|
|
|
|
dest='force_remove_dirty', action='store_true',
|
|
|
|
help="force remove projects with uncommitted modifications if "
|
|
|
|
"projects no longer exist in the manifest. "
|
|
|
|
"WARNING: this may cause loss of data")
|
2012-11-14 03:09:38 +00:00
|
|
|
p.add_option('-l', '--local-only',
|
2009-04-11 00:04:08 +00:00
|
|
|
dest='local_only', action='store_true',
|
|
|
|
help="only update working tree, don't fetch")
|
2020-02-12 05:31:05 +00:00
|
|
|
p.add_option('--no-manifest-update', '--nmu',
|
2019-11-22 08:04:31 +00:00
|
|
|
dest='mp_update', action='store_false', default='true',
|
|
|
|
help='use the existing manifest checkout as-is. '
|
|
|
|
'(do not update to the latest revision)')
|
2012-11-14 03:09:38 +00:00
|
|
|
p.add_option('-n', '--network-only',
|
2009-04-10 23:29:20 +00:00
|
|
|
dest='network_only', action='store_true',
|
|
|
|
help="fetch only, don't update working tree")
|
2012-11-14 03:09:38 +00:00
|
|
|
p.add_option('-d', '--detach',
|
2009-04-10 23:59:36 +00:00
|
|
|
dest='detach_head', action='store_true',
|
|
|
|
help='detach projects back to manifest revision')
|
2012-11-14 03:09:38 +00:00
|
|
|
p.add_option('-c', '--current-branch',
|
2011-08-26 00:21:47 +00:00
|
|
|
dest='current_branch_only', action='store_true',
|
|
|
|
help='fetch only current branch from server')
|
2020-02-17 06:51:49 +00:00
|
|
|
p.add_option('-v', '--verbose',
|
|
|
|
dest='output_mode', action='store_true',
|
|
|
|
help='show all sync output')
|
2012-11-14 03:09:38 +00:00
|
|
|
p.add_option('-q', '--quiet',
|
2020-02-17 06:51:49 +00:00
|
|
|
dest='output_mode', action='store_false',
|
|
|
|
help='only show errors')
|
2012-11-14 03:09:38 +00:00
|
|
|
p.add_option('-j', '--jobs',
|
2010-05-08 20:32:08 +00:00
|
|
|
dest='jobs', action='store', type='int',
|
2011-09-23 00:44:31 +00:00
|
|
|
help="projects to fetch simultaneously (default %d)" % self.jobs)
|
2012-01-26 16:36:18 +00:00
|
|
|
p.add_option('-m', '--manifest-name',
|
|
|
|
dest='manifest_name',
|
|
|
|
help='temporary manifest to use for this sync', metavar='NAME.xml')
|
2020-05-20 23:03:45 +00:00
|
|
|
p.add_option('--clone-bundle', action='store_true',
|
|
|
|
help='enable use of /clone.bundle on HTTP/HTTPS')
|
|
|
|
p.add_option('--no-clone-bundle', dest='clone_bundle', action='store_false',
|
2012-03-14 22:36:59 +00:00
|
|
|
help='disable use of /clone.bundle on HTTP/HTTPS')
|
2012-11-06 21:14:31 +00:00
|
|
|
p.add_option('-u', '--manifest-server-username', action='store',
|
|
|
|
dest='manifest_server_username',
|
|
|
|
help='username to authenticate with the manifest server')
|
|
|
|
p.add_option('-p', '--manifest-server-password', action='store',
|
|
|
|
dest='manifest_server_password',
|
|
|
|
help='password to authenticate with the manifest server')
|
Represent git-submodule as nested projects, take 2
(Previous submission of this change broke Android buildbot due to
incorrect regular expression for parsing git-config output. During
investigation, we also found that Android, which pulls Chromium, has a
workaround for Chromium's submodules; its manifest includes Chromium's
submodules. This new change, in addition to fixing the regex, also
take this type of workarounds into consideration; it adds a new
attribute that makes repo not fetch submodules unless submodules have a
project element defined in the manifest, or this attribute is
overridden by a parent project element or by the default element.)
We need a representation of git-submodule in repo; otherwise repo will
not sync submodules, and leave workspace in a broken state. Of course
this will not be a problem if all projects are owned by the owner of the
manifest file, who may simply choose not to use git-submodule in all
projects. However, this is not possible in practice because manifest
file owner is unlikely to own all upstream projects.
As git submodules are simply git repositories, it is natural to treat
them as plain repo projects that live inside a repo project. That is,
we could use recursively declared projects to denote the is-submodule
relation of git repositories.
The behavior of repo remains the same to projects that do not have a
sub-project within. As for parent projects, repo fetches them and their
sub-projects as normal projects, and then checks out subprojects at the
commit specified in parent's commit object. The sub-project is fetched
at a path relative to parent project's working directory; so the path
specified in manifest file should match that of .gitmodules file.
If a submodule is not registered in repo manifest, repo will derive its
properties from itself and its parent project, which might not always be
correct. In such cases, the subproject is called a derived subproject.
To a user, a sub-project is merely a git-submodule; so all tips of
working with a git-submodule apply here, too. For example, you should
not run `repo sync` in a parent repository if its submodule is dirty.
Change-Id: I4b8344c1b9ccad2f58ad304573133e5d52e1faef
2012-01-11 03:28:42 +00:00
|
|
|
p.add_option('--fetch-submodules',
|
|
|
|
dest='fetch_submodules', action='store_true',
|
|
|
|
help='fetch submodules from server')
|
2021-01-15 03:17:50 +00:00
|
|
|
p.add_option('--use-superproject', action='store_true',
|
|
|
|
help='use the manifest superproject to sync projects')
|
2012-10-29 17:18:34 +00:00
|
|
|
p.add_option('--no-tags',
|
2020-02-17 19:36:08 +00:00
|
|
|
dest='tags', default=True, action='store_false',
|
2012-10-29 17:18:34 +00:00
|
|
|
help="don't fetch tags")
|
2014-09-04 12:28:09 +00:00
|
|
|
p.add_option('--optimized-fetch',
|
|
|
|
dest='optimized_fetch', action='store_true',
|
|
|
|
help='only fetch projects fixed to sha1 if revision does not exist locally')
|
2020-04-02 18:36:09 +00:00
|
|
|
p.add_option('--retry-fetches',
|
|
|
|
default=0, action='store', type='int',
|
|
|
|
help='number of times to retry fetches on transient errors')
|
2015-10-14 01:50:15 +00:00
|
|
|
p.add_option('--prune', dest='prune', action='store_true',
|
|
|
|
help='delete refs that no longer exist on the remote')
|
2010-05-11 19:57:01 +00:00
|
|
|
if show_smart:
|
|
|
|
p.add_option('-s', '--smart-sync',
|
|
|
|
dest='smart_sync', action='store_true',
|
2016-04-13 09:03:00 +00:00
|
|
|
help='smart sync using manifest from the latest known good build')
|
2011-04-19 08:32:52 +00:00
|
|
|
p.add_option('-t', '--smart-tag',
|
|
|
|
dest='smart_tag', action='store',
|
|
|
|
help='smart sync using manifest from a known tag')
|
2009-04-10 23:59:36 +00:00
|
|
|
|
2009-04-18 18:28:57 +00:00
|
|
|
g = p.add_option_group('repo Version options')
|
|
|
|
g.add_option('--no-repo-verify',
|
2020-02-17 19:36:08 +00:00
|
|
|
dest='repo_verify', default=True, action='store_false',
|
2008-10-21 14:00:00 +00:00
|
|
|
help='do not verify repo source code')
|
2009-04-18 18:28:57 +00:00
|
|
|
g.add_option('--repo-upgraded',
|
2008-11-03 18:32:09 +00:00
|
|
|
dest='repo_upgraded', action='store_true',
|
2009-04-10 23:51:53 +00:00
|
|
|
help=SUPPRESS_HELP)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2021-02-08 00:30:27 +00:00
|
|
|
def _GetBranch(self):
|
|
|
|
"""Returns the branch name for getting the approved manifest."""
|
|
|
|
p = self.manifest.manifestProject
|
|
|
|
b = p.GetBranch(p.CurrentBranch)
|
|
|
|
branch = b.merge
|
|
|
|
if branch.startswith(R_HEADS):
|
|
|
|
branch = branch[len(R_HEADS):]
|
|
|
|
return branch
|
|
|
|
|
2021-02-04 22:39:38 +00:00
|
|
|
def _UpdateProjectsRevisionId(self, opt, args):
|
|
|
|
"""Update revisionId of every project with the SHA from superproject.
|
|
|
|
|
|
|
|
This function updates each project's revisionId with SHA from superproject.
|
|
|
|
It writes the updated manifest into a file and reloads the manifest from it.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
opt: Program options returned from optparse. See _Options().
|
|
|
|
args: Arguments to pass to GetProjects. See the GetProjects
|
|
|
|
docstring for details.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Returns path to the overriding manifest file.
|
|
|
|
"""
|
2021-02-09 08:26:31 +00:00
|
|
|
superproject = git_superproject.Superproject(self.manifest,
|
|
|
|
self.repodir)
|
2021-02-04 22:39:38 +00:00
|
|
|
all_projects = self.GetProjects(args,
|
|
|
|
missing_ok=True,
|
|
|
|
submodules_ok=opt.fetch_submodules)
|
2021-02-09 08:26:31 +00:00
|
|
|
manifest_path = superproject.UpdateProjectsRevisionId(all_projects)
|
2021-02-04 22:39:38 +00:00
|
|
|
if not manifest_path:
|
|
|
|
print('error: Update of revsionId from superproject has failed',
|
|
|
|
file=sys.stderr)
|
|
|
|
sys.exit(1)
|
|
|
|
self._ReloadManifest(manifest_path)
|
|
|
|
return manifest_path
|
|
|
|
|
2016-06-17 21:51:07 +00:00
|
|
|
def _FetchProjectList(self, opt, projects, sem, *args, **kwargs):
|
2019-06-03 18:24:30 +00:00
|
|
|
"""Main function of the fetch threads.
|
2012-11-14 02:36:51 +00:00
|
|
|
|
2013-10-12 00:03:19 +00:00
|
|
|
Delegates most of the work to _FetchHelper.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
opt: Program options returned from optparse. See _Options().
|
|
|
|
projects: Projects to fetch.
|
2016-06-17 21:51:07 +00:00
|
|
|
sem: We'll release() this semaphore when we exit so that another thread
|
|
|
|
can be started up.
|
2014-01-10 02:51:58 +00:00
|
|
|
*args, **kwargs: Remaining arguments to pass to _FetchHelper. See the
|
2013-10-12 00:03:19 +00:00
|
|
|
_FetchHelper docstring for details.
|
|
|
|
"""
|
2016-06-17 21:51:07 +00:00
|
|
|
try:
|
|
|
|
for project in projects:
|
|
|
|
success = self._FetchHelper(opt, project, *args, **kwargs)
|
2019-08-26 07:12:55 +00:00
|
|
|
if not success and opt.fail_fast:
|
2016-06-17 21:51:07 +00:00
|
|
|
break
|
|
|
|
finally:
|
|
|
|
sem.release()
|
2013-10-12 00:03:19 +00:00
|
|
|
|
2019-06-03 18:24:30 +00:00
|
|
|
def _FetchHelper(self, opt, project, lock, fetched, pm, err_event,
|
|
|
|
clone_filter):
|
2013-10-12 00:03:19 +00:00
|
|
|
"""Fetch git objects for a single project.
|
|
|
|
|
2012-11-14 02:36:51 +00:00
|
|
|
Args:
|
|
|
|
opt: Program options returned from optparse. See _Options().
|
|
|
|
project: Project object for the project to fetch.
|
|
|
|
lock: Lock for accessing objects that are shared amongst multiple
|
|
|
|
_FetchHelper() threads.
|
|
|
|
fetched: set object that we will add project.gitdir to when we're done
|
|
|
|
(with our lock held).
|
|
|
|
pm: Instance of a Project object. We will call pm.update() (with our
|
|
|
|
lock held).
|
|
|
|
err_event: We'll set this event in the case of an error (after printing
|
|
|
|
out info about the error).
|
2019-06-03 18:24:30 +00:00
|
|
|
clone_filter: Filter for use in a partial clone.
|
2013-10-12 00:03:19 +00:00
|
|
|
|
|
|
|
Returns:
|
|
|
|
Whether the fetch was successful.
|
2012-11-14 02:36:51 +00:00
|
|
|
"""
|
|
|
|
# We'll set to true once we've locked the lock.
|
|
|
|
did_lock = False
|
|
|
|
|
|
|
|
# Encapsulate everything in a try/except/finally so that:
|
|
|
|
# - We always set err_event in the case of an exception.
|
|
|
|
# - We always make sure we unlock the lock if we locked it.
|
2017-04-05 07:02:59 +00:00
|
|
|
start = time.time()
|
|
|
|
success = False
|
2012-11-14 02:36:51 +00:00
|
|
|
try:
|
2011-03-16 22:49:18 +00:00
|
|
|
try:
|
2012-11-14 02:36:51 +00:00
|
|
|
success = project.Sync_NetworkHalf(
|
2020-02-12 05:58:39 +00:00
|
|
|
quiet=opt.quiet,
|
2020-02-17 06:51:49 +00:00
|
|
|
verbose=opt.verbose,
|
2020-02-12 05:58:39 +00:00
|
|
|
current_branch_only=opt.current_branch_only,
|
|
|
|
force_sync=opt.force_sync,
|
2020-02-17 19:36:08 +00:00
|
|
|
clone_bundle=opt.clone_bundle,
|
|
|
|
tags=opt.tags, archive=self.manifest.IsArchive,
|
2020-02-12 05:58:39 +00:00
|
|
|
optimized_fetch=opt.optimized_fetch,
|
2020-04-02 18:36:09 +00:00
|
|
|
retry_fetches=opt.retry_fetches,
|
2020-02-12 05:58:39 +00:00
|
|
|
prune=opt.prune,
|
|
|
|
clone_filter=clone_filter)
|
2012-11-14 02:36:51 +00:00
|
|
|
self._fetch_times.Set(project, time.time() - start)
|
|
|
|
|
|
|
|
# Lock around all the rest of the code, since printing, updating a set
|
|
|
|
# and Progress.update() are not thread safe.
|
|
|
|
lock.acquire()
|
|
|
|
did_lock = True
|
|
|
|
|
|
|
|
if not success:
|
2015-11-25 07:52:26 +00:00
|
|
|
err_event.set()
|
2017-04-05 05:03:53 +00:00
|
|
|
print('error: Cannot fetch %s from %s'
|
|
|
|
% (project.name, project.remote.url),
|
|
|
|
file=sys.stderr)
|
2019-08-26 07:12:55 +00:00
|
|
|
if opt.fail_fast:
|
2012-11-14 02:36:51 +00:00
|
|
|
raise _FetchError()
|
2011-03-16 22:49:18 +00:00
|
|
|
|
2012-11-14 02:36:51 +00:00
|
|
|
fetched.add(project.gitdir)
|
2019-08-26 19:32:06 +00:00
|
|
|
pm.update(msg=project.name)
|
2012-11-14 02:36:51 +00:00
|
|
|
except _FetchError:
|
2015-11-25 07:52:26 +00:00
|
|
|
pass
|
2015-07-31 13:37:53 +00:00
|
|
|
except Exception as e:
|
2020-02-12 05:37:15 +00:00
|
|
|
print('error: Cannot fetch %s (%s: %s)'
|
2020-02-12 05:58:39 +00:00
|
|
|
% (project.name, type(e).__name__, str(e)), file=sys.stderr)
|
2012-11-14 02:36:51 +00:00
|
|
|
err_event.set()
|
|
|
|
raise
|
|
|
|
finally:
|
|
|
|
if did_lock:
|
|
|
|
lock.release()
|
2017-04-05 07:02:59 +00:00
|
|
|
finish = time.time()
|
|
|
|
self.event_log.AddSync(project, event_log.TASK_SYNC_NETWORK,
|
|
|
|
start, finish, success)
|
2010-05-08 20:32:08 +00:00
|
|
|
|
2013-10-12 00:03:19 +00:00
|
|
|
return success
|
|
|
|
|
2019-09-23 23:21:20 +00:00
|
|
|
def _Fetch(self, projects, opt, err_event):
|
2008-10-21 14:00:00 +00:00
|
|
|
fetched = set()
|
2014-01-10 02:51:58 +00:00
|
|
|
lock = _threading.Lock()
|
2017-06-05 13:01:41 +00:00
|
|
|
pm = Progress('Fetching projects', len(projects),
|
2017-06-28 16:29:23 +00:00
|
|
|
always_print_percentage=opt.quiet)
|
2010-05-08 20:32:08 +00:00
|
|
|
|
2014-01-10 02:51:58 +00:00
|
|
|
objdir_project_map = dict()
|
|
|
|
for project in projects:
|
|
|
|
objdir_project_map.setdefault(project.objdir, []).append(project)
|
|
|
|
|
|
|
|
threads = set()
|
|
|
|
sem = _threading.Semaphore(self.jobs)
|
|
|
|
for project_list in objdir_project_map.values():
|
|
|
|
# Check for any errors before running any more tasks.
|
|
|
|
# ...we'll let existing threads finish, though.
|
2019-08-26 07:12:55 +00:00
|
|
|
if err_event.isSet() and opt.fail_fast:
|
2014-01-10 02:51:58 +00:00
|
|
|
break
|
|
|
|
|
|
|
|
sem.acquire()
|
|
|
|
kwargs = dict(opt=opt,
|
|
|
|
projects=project_list,
|
2016-06-17 21:51:07 +00:00
|
|
|
sem=sem,
|
2014-01-10 02:51:58 +00:00
|
|
|
lock=lock,
|
|
|
|
fetched=fetched,
|
|
|
|
pm=pm,
|
2019-06-03 18:24:30 +00:00
|
|
|
err_event=err_event,
|
|
|
|
clone_filter=self.manifest.CloneFilter)
|
2014-01-10 02:51:58 +00:00
|
|
|
if self.jobs > 1:
|
2020-02-12 04:56:59 +00:00
|
|
|
t = _threading.Thread(target=self._FetchProjectList,
|
|
|
|
kwargs=kwargs)
|
2012-09-05 08:35:06 +00:00
|
|
|
# Ensure that Ctrl-C will not freeze the repo process.
|
|
|
|
t.daemon = True
|
2010-05-08 20:32:08 +00:00
|
|
|
threads.add(t)
|
|
|
|
t.start()
|
2014-01-10 02:51:58 +00:00
|
|
|
else:
|
|
|
|
self._FetchProjectList(**kwargs)
|
2010-05-08 20:32:08 +00:00
|
|
|
|
2014-01-10 02:51:58 +00:00
|
|
|
for t in threads:
|
|
|
|
t.join()
|
2010-05-08 20:32:08 +00:00
|
|
|
|
2009-04-10 23:48:52 +00:00
|
|
|
pm.end()
|
2012-10-23 22:00:54 +00:00
|
|
|
self._fetch_times.Save()
|
2012-10-24 00:02:59 +00:00
|
|
|
|
2013-10-16 09:02:35 +00:00
|
|
|
if not self.manifest.IsArchive:
|
2019-09-23 23:21:20 +00:00
|
|
|
self._GCProjects(projects, opt, err_event)
|
2013-10-16 09:02:35 +00:00
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
return fetched
|
|
|
|
|
2019-06-03 18:24:30 +00:00
|
|
|
def _CheckoutWorker(self, opt, sem, project, *args, **kwargs):
|
|
|
|
"""Main function of the fetch threads.
|
|
|
|
|
|
|
|
Delegates most of the work to _CheckoutOne.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
opt: Program options returned from optparse. See _Options().
|
|
|
|
projects: Projects to fetch.
|
|
|
|
sem: We'll release() this semaphore when we exit so that another thread
|
|
|
|
can be started up.
|
|
|
|
*args, **kwargs: Remaining arguments to pass to _CheckoutOne. See the
|
|
|
|
_CheckoutOne docstring for details.
|
|
|
|
"""
|
|
|
|
try:
|
2019-08-07 22:07:31 +00:00
|
|
|
return self._CheckoutOne(opt, project, *args, **kwargs)
|
2019-06-03 18:24:30 +00:00
|
|
|
finally:
|
|
|
|
sem.release()
|
|
|
|
|
2019-11-06 19:05:00 +00:00
|
|
|
def _CheckoutOne(self, opt, project, lock, pm, err_event, err_results):
|
2019-06-03 18:24:30 +00:00
|
|
|
"""Checkout work tree for one project
|
|
|
|
|
|
|
|
Args:
|
|
|
|
opt: Program options returned from optparse. See _Options().
|
|
|
|
project: Project object for the project to checkout.
|
|
|
|
lock: Lock for accessing objects that are shared amongst multiple
|
|
|
|
_CheckoutWorker() threads.
|
|
|
|
pm: Instance of a Project object. We will call pm.update() (with our
|
|
|
|
lock held).
|
|
|
|
err_event: We'll set this event in the case of an error (after printing
|
|
|
|
out info about the error).
|
2019-11-06 19:05:00 +00:00
|
|
|
err_results: A list of strings, paths to git repos where checkout
|
|
|
|
failed.
|
2019-06-03 18:24:30 +00:00
|
|
|
|
|
|
|
Returns:
|
|
|
|
Whether the fetch was successful.
|
|
|
|
"""
|
|
|
|
# We'll set to true once we've locked the lock.
|
|
|
|
did_lock = False
|
|
|
|
|
|
|
|
# Encapsulate everything in a try/except/finally so that:
|
|
|
|
# - We always set err_event in the case of an exception.
|
|
|
|
# - We always make sure we unlock the lock if we locked it.
|
|
|
|
start = time.time()
|
|
|
|
syncbuf = SyncBuffer(self.manifest.manifestProject.config,
|
|
|
|
detach_head=opt.detach_head)
|
|
|
|
success = False
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
project.Sync_LocalHalf(syncbuf, force_sync=opt.force_sync)
|
|
|
|
|
|
|
|
# Lock around all the rest of the code, since printing, updating a set
|
|
|
|
# and Progress.update() are not thread safe.
|
|
|
|
lock.acquire()
|
2019-08-26 19:32:06 +00:00
|
|
|
success = syncbuf.Finish()
|
2019-06-03 18:24:30 +00:00
|
|
|
did_lock = True
|
|
|
|
|
|
|
|
if not success:
|
|
|
|
err_event.set()
|
|
|
|
print('error: Cannot checkout %s' % (project.name),
|
|
|
|
file=sys.stderr)
|
|
|
|
raise _CheckoutError()
|
|
|
|
|
2019-08-26 19:32:06 +00:00
|
|
|
pm.update(msg=project.name)
|
2019-06-03 18:24:30 +00:00
|
|
|
except _CheckoutError:
|
|
|
|
pass
|
|
|
|
except Exception as e:
|
|
|
|
print('error: Cannot checkout %s: %s: %s' %
|
|
|
|
(project.name, type(e).__name__, str(e)),
|
|
|
|
file=sys.stderr)
|
|
|
|
err_event.set()
|
|
|
|
raise
|
|
|
|
finally:
|
|
|
|
if did_lock:
|
2019-11-06 19:05:00 +00:00
|
|
|
if not success:
|
|
|
|
err_results.append(project.relpath)
|
2019-06-03 18:24:30 +00:00
|
|
|
lock.release()
|
|
|
|
finish = time.time()
|
|
|
|
self.event_log.AddSync(project, event_log.TASK_SYNC_LOCAL,
|
|
|
|
start, finish, success)
|
|
|
|
|
|
|
|
return success
|
|
|
|
|
2019-09-23 23:21:20 +00:00
|
|
|
def _Checkout(self, all_projects, opt, err_event, err_results):
|
2019-06-03 18:24:30 +00:00
|
|
|
"""Checkout projects listed in all_projects
|
|
|
|
|
|
|
|
Args:
|
|
|
|
all_projects: List of all projects that should be checked out.
|
|
|
|
opt: Program options returned from optparse. See _Options().
|
2019-09-23 23:21:20 +00:00
|
|
|
err_event: We'll set this event in the case of an error (after printing
|
|
|
|
out info about the error).
|
|
|
|
err_results: A list of strings, paths to git repos where checkout
|
|
|
|
failed.
|
2019-06-03 18:24:30 +00:00
|
|
|
"""
|
|
|
|
|
|
|
|
# Perform checkouts in multiple threads when we are using partial clone.
|
|
|
|
# Without partial clone, all needed git objects are already downloaded,
|
|
|
|
# in this situation it's better to use only one process because the checkout
|
|
|
|
# would be mostly disk I/O; with partial clone, the objects are only
|
|
|
|
# downloaded when demanded (at checkout time), which is similar to the
|
|
|
|
# Sync_NetworkHalf case and parallelism would be helpful.
|
|
|
|
if self.manifest.CloneFilter:
|
|
|
|
syncjobs = self.jobs
|
|
|
|
else:
|
|
|
|
syncjobs = 1
|
|
|
|
|
|
|
|
lock = _threading.Lock()
|
2019-08-26 19:32:06 +00:00
|
|
|
pm = Progress('Checking out projects', len(all_projects))
|
2019-06-03 18:24:30 +00:00
|
|
|
|
|
|
|
threads = set()
|
|
|
|
sem = _threading.Semaphore(syncjobs)
|
|
|
|
|
|
|
|
for project in all_projects:
|
|
|
|
# Check for any errors before running any more tasks.
|
|
|
|
# ...we'll let existing threads finish, though.
|
2019-08-26 07:12:55 +00:00
|
|
|
if err_event.isSet() and opt.fail_fast:
|
2019-06-03 18:24:30 +00:00
|
|
|
break
|
|
|
|
|
|
|
|
sem.acquire()
|
|
|
|
if project.worktree:
|
|
|
|
kwargs = dict(opt=opt,
|
|
|
|
sem=sem,
|
|
|
|
project=project,
|
|
|
|
lock=lock,
|
|
|
|
pm=pm,
|
2019-11-06 19:05:00 +00:00
|
|
|
err_event=err_event,
|
|
|
|
err_results=err_results)
|
2019-06-03 18:24:30 +00:00
|
|
|
if syncjobs > 1:
|
|
|
|
t = _threading.Thread(target=self._CheckoutWorker,
|
|
|
|
kwargs=kwargs)
|
|
|
|
# Ensure that Ctrl-C will not freeze the repo process.
|
|
|
|
t.daemon = True
|
|
|
|
threads.add(t)
|
|
|
|
t.start()
|
|
|
|
else:
|
|
|
|
self._CheckoutWorker(**kwargs)
|
|
|
|
|
|
|
|
for t in threads:
|
|
|
|
t.join()
|
|
|
|
|
|
|
|
pm.end()
|
|
|
|
|
2019-09-23 23:21:20 +00:00
|
|
|
def _GCProjects(self, projects, opt, err_event):
|
2014-10-10 00:54:35 +00:00
|
|
|
gc_gitdirs = {}
|
2013-10-12 00:03:19 +00:00
|
|
|
for project in projects:
|
2020-02-11 08:23:24 +00:00
|
|
|
# Make sure pruning never kicks in with shared projects.
|
2020-02-09 07:28:34 +00:00
|
|
|
if (not project.use_git_worktrees and
|
2020-02-20 01:47:26 +00:00
|
|
|
len(project.manifest.GetProjectsWithName(project.name)) > 1):
|
2021-01-18 09:32:36 +00:00
|
|
|
if not opt.quiet:
|
|
|
|
print('%s: Shared project %s found, disabling pruning.' %
|
|
|
|
(project.relpath, project.name))
|
2020-02-11 08:23:24 +00:00
|
|
|
if git_require((2, 7, 0)):
|
2020-02-19 20:50:00 +00:00
|
|
|
project.EnableRepositoryExtension('preciousObjects')
|
2020-02-11 08:23:24 +00:00
|
|
|
else:
|
|
|
|
# This isn't perfect, but it's the best we can do with old git.
|
|
|
|
print('%s: WARNING: shared projects are unreliable when using old '
|
|
|
|
'versions of git; please upgrade to git-2.7.0+.'
|
|
|
|
% (project.relpath,),
|
|
|
|
file=sys.stderr)
|
|
|
|
project.config.SetString('gc.pruneExpire', 'never')
|
2014-10-10 00:54:35 +00:00
|
|
|
gc_gitdirs[project.gitdir] = project.bare_git
|
2013-10-12 00:03:19 +00:00
|
|
|
|
2020-02-04 05:09:23 +00:00
|
|
|
if multiprocessing:
|
2012-10-24 00:02:59 +00:00
|
|
|
cpu_count = multiprocessing.cpu_count()
|
|
|
|
else:
|
|
|
|
cpu_count = 1
|
|
|
|
jobs = min(self.jobs, cpu_count)
|
|
|
|
|
|
|
|
if jobs < 2:
|
2014-10-10 00:54:35 +00:00
|
|
|
for bare_git in gc_gitdirs.values():
|
2013-10-12 00:03:19 +00:00
|
|
|
bare_git.gc('--auto')
|
2012-10-24 00:02:59 +00:00
|
|
|
return
|
|
|
|
|
2019-06-13 16:42:39 +00:00
|
|
|
config = {'pack.threads': cpu_count // jobs if cpu_count > jobs else 1}
|
2012-10-24 00:02:59 +00:00
|
|
|
|
|
|
|
threads = set()
|
|
|
|
sem = _threading.Semaphore(jobs)
|
|
|
|
|
2013-10-12 00:03:19 +00:00
|
|
|
def GC(bare_git):
|
2012-10-24 00:02:59 +00:00
|
|
|
try:
|
|
|
|
try:
|
2013-10-12 00:03:19 +00:00
|
|
|
bare_git.gc('--auto', config=config)
|
2012-10-24 00:02:59 +00:00
|
|
|
except GitError:
|
|
|
|
err_event.set()
|
2020-02-12 06:40:47 +00:00
|
|
|
except Exception:
|
2012-10-24 00:02:59 +00:00
|
|
|
err_event.set()
|
|
|
|
raise
|
|
|
|
finally:
|
|
|
|
sem.release()
|
|
|
|
|
2014-10-10 00:54:35 +00:00
|
|
|
for bare_git in gc_gitdirs.values():
|
2019-09-23 23:21:20 +00:00
|
|
|
if err_event.isSet() and opt.fail_fast:
|
2012-10-24 00:02:59 +00:00
|
|
|
break
|
|
|
|
sem.acquire()
|
2013-10-12 00:03:19 +00:00
|
|
|
t = _threading.Thread(target=GC, args=(bare_git,))
|
2012-10-24 00:02:59 +00:00
|
|
|
t.daemon = True
|
|
|
|
threads.add(t)
|
|
|
|
t.start()
|
|
|
|
|
|
|
|
for t in threads:
|
|
|
|
t.join()
|
|
|
|
|
2013-03-08 23:02:49 +00:00
|
|
|
def _ReloadManifest(self, manifest_name=None):
|
|
|
|
if manifest_name:
|
|
|
|
# Override calls _Unload already
|
|
|
|
self.manifest.Override(manifest_name)
|
|
|
|
else:
|
|
|
|
self.manifest._Unload()
|
|
|
|
|
2018-12-18 00:23:44 +00:00
|
|
|
def UpdateProjectList(self, opt):
|
2009-06-02 04:10:33 +00:00
|
|
|
new_project_paths = []
|
2012-03-29 03:15:45 +00:00
|
|
|
for project in self.GetProjects(None, missing_ok=True):
|
2009-06-04 23:18:09 +00:00
|
|
|
if project.relpath:
|
|
|
|
new_project_paths.append(project.relpath)
|
2009-06-02 04:10:33 +00:00
|
|
|
file_name = 'project.list'
|
2021-02-10 04:45:28 +00:00
|
|
|
file_path = os.path.join(self.repodir, file_name)
|
2009-06-02 04:10:33 +00:00
|
|
|
old_project_paths = []
|
|
|
|
|
|
|
|
if os.path.exists(file_path):
|
2019-11-11 10:40:22 +00:00
|
|
|
with open(file_path, 'r') as fd:
|
2009-06-02 04:10:33 +00:00
|
|
|
old_project_paths = fd.read().split('\n')
|
2019-04-05 16:49:47 +00:00
|
|
|
# In reversed order, so subfolders are deleted before parent folder.
|
|
|
|
for path in sorted(old_project_paths, reverse=True):
|
2009-06-04 23:18:09 +00:00
|
|
|
if not path:
|
|
|
|
continue
|
2009-06-02 04:10:33 +00:00
|
|
|
if path not in new_project_paths:
|
2012-09-24 03:15:13 +00:00
|
|
|
# If the path has already been deleted, we don't need to do it
|
On project cleanup, don't remove nested projects
When there are nested projects in a manifest, like on AOSP right now:
<project path="build" name="platform/build" />
<project path="build/blueprint" name="platform/build/blueprint" />
<project path="build/kati" name="platform/build/kati" />
<project path="build/soong" name="platform/build/soong" />
And the top "build" project is removed (or renamed to remove the
nesting), repo just wipes away everything under build/ and re-creates
the projects that are still there. But it only checks to see if the
build/ project is dirty, so if there are dirty files in a nested
project, they'll just be blown away, and a fresh worktree checked out.
Instead, behave similarly to how `git clean -dxf` behaves and preserve
any subdirectories that have git repositories in them. This isn't as
strict as git -- it does not check to see if the '.git' entry is a
readable gitdir, just whether an entry named '.git' exists.
If it encounters any errors removing files, we'll print them all out to
stderr and tell the user that we were unable to clean up the obsolete
project, that they should clean it up manually, then sync again.
Change-Id: I2f6a7dd205a8e0b7590ca5369e9b0ba21d5a6f77
2016-09-01 23:26:02 +00:00
|
|
|
gitdir = os.path.join(self.manifest.topdir, path, '.git')
|
|
|
|
if os.path.exists(gitdir):
|
2012-11-14 02:36:51 +00:00
|
|
|
project = Project(
|
2020-02-12 05:58:39 +00:00
|
|
|
manifest=self.manifest,
|
|
|
|
name=path,
|
|
|
|
remote=RemoteSpec('origin'),
|
|
|
|
gitdir=gitdir,
|
|
|
|
objdir=gitdir,
|
2020-02-20 00:19:18 +00:00
|
|
|
use_git_worktrees=os.path.isfile(gitdir),
|
2020-02-12 05:58:39 +00:00
|
|
|
worktree=os.path.join(self.manifest.topdir, path),
|
|
|
|
relpath=path,
|
|
|
|
revisionExpr='HEAD',
|
|
|
|
revisionId=None,
|
|
|
|
groups=None)
|
2020-02-20 00:19:18 +00:00
|
|
|
if not project.DeleteWorktree(
|
2020-02-20 01:47:26 +00:00
|
|
|
quiet=opt.quiet,
|
|
|
|
force=opt.force_remove_dirty):
|
2019-08-07 21:19:24 +00:00
|
|
|
return 1
|
2009-06-02 04:10:33 +00:00
|
|
|
|
2009-06-05 03:41:02 +00:00
|
|
|
new_project_paths.sort()
|
2019-11-11 10:40:22 +00:00
|
|
|
with open(file_path, 'w') as fd:
|
2009-06-02 04:10:33 +00:00
|
|
|
fd.write('\n'.join(new_project_paths))
|
2009-06-04 23:18:09 +00:00
|
|
|
fd.write('\n')
|
2009-06-02 04:10:33 +00:00
|
|
|
return 0
|
|
|
|
|
2019-08-27 05:56:43 +00:00
|
|
|
def _SmartSyncSetup(self, opt, smart_sync_manifest_path):
|
|
|
|
if not self.manifest.manifest_server:
|
|
|
|
print('error: cannot smart sync: no manifest server defined in '
|
|
|
|
'manifest', file=sys.stderr)
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
manifest_server = self.manifest.manifest_server
|
|
|
|
if not opt.quiet:
|
|
|
|
print('Using manifest server %s' % manifest_server)
|
|
|
|
|
2020-02-12 02:24:10 +00:00
|
|
|
if '@' not in manifest_server:
|
2019-08-27 05:56:43 +00:00
|
|
|
username = None
|
|
|
|
password = None
|
|
|
|
if opt.manifest_server_username and opt.manifest_server_password:
|
|
|
|
username = opt.manifest_server_username
|
|
|
|
password = opt.manifest_server_password
|
|
|
|
else:
|
|
|
|
try:
|
|
|
|
info = netrc.netrc()
|
|
|
|
except IOError:
|
|
|
|
# .netrc file does not exist or could not be opened
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
try:
|
|
|
|
parse_result = urllib.parse.urlparse(manifest_server)
|
|
|
|
if parse_result.hostname:
|
|
|
|
auth = info.authenticators(parse_result.hostname)
|
|
|
|
if auth:
|
|
|
|
username, _account, password = auth
|
|
|
|
else:
|
|
|
|
print('No credentials found for %s in .netrc'
|
|
|
|
% parse_result.hostname, file=sys.stderr)
|
|
|
|
except netrc.NetrcParseError as e:
|
|
|
|
print('Error parsing .netrc file: %s' % e, file=sys.stderr)
|
|
|
|
|
|
|
|
if (username and password):
|
|
|
|
manifest_server = manifest_server.replace('://', '://%s:%s@' %
|
|
|
|
(username, password),
|
|
|
|
1)
|
|
|
|
|
|
|
|
transport = PersistentTransport(manifest_server)
|
|
|
|
if manifest_server.startswith('persistent-'):
|
|
|
|
manifest_server = manifest_server[len('persistent-'):]
|
|
|
|
|
|
|
|
try:
|
|
|
|
server = xmlrpc.client.Server(manifest_server, transport=transport)
|
|
|
|
if opt.smart_sync:
|
2021-02-08 00:30:27 +00:00
|
|
|
branch = self._GetBranch()
|
2019-08-27 05:56:43 +00:00
|
|
|
|
2019-12-05 00:30:48 +00:00
|
|
|
if 'SYNC_TARGET' in os.environ:
|
2020-03-07 06:53:53 +00:00
|
|
|
target = os.environ['SYNC_TARGET']
|
2019-08-27 05:56:43 +00:00
|
|
|
[success, manifest_str] = server.GetApprovedManifest(branch, target)
|
2019-12-05 00:30:48 +00:00
|
|
|
elif ('TARGET_PRODUCT' in os.environ and
|
|
|
|
'TARGET_BUILD_VARIANT' in os.environ):
|
2020-03-07 06:53:53 +00:00
|
|
|
target = '%s-%s' % (os.environ['TARGET_PRODUCT'],
|
|
|
|
os.environ['TARGET_BUILD_VARIANT'])
|
2019-08-27 05:56:43 +00:00
|
|
|
[success, manifest_str] = server.GetApprovedManifest(branch, target)
|
|
|
|
else:
|
|
|
|
[success, manifest_str] = server.GetApprovedManifest(branch)
|
|
|
|
else:
|
|
|
|
assert(opt.smart_tag)
|
|
|
|
[success, manifest_str] = server.GetManifest(opt.smart_tag)
|
|
|
|
|
|
|
|
if success:
|
|
|
|
manifest_name = os.path.basename(smart_sync_manifest_path)
|
|
|
|
try:
|
2019-11-11 10:40:22 +00:00
|
|
|
with open(smart_sync_manifest_path, 'w') as f:
|
2019-08-27 05:56:43 +00:00
|
|
|
f.write(manifest_str)
|
|
|
|
except IOError as e:
|
|
|
|
print('error: cannot write manifest to %s:\n%s'
|
|
|
|
% (smart_sync_manifest_path, e),
|
|
|
|
file=sys.stderr)
|
|
|
|
sys.exit(1)
|
|
|
|
self._ReloadManifest(manifest_name)
|
|
|
|
else:
|
|
|
|
print('error: manifest server RPC call failed: %s' %
|
|
|
|
manifest_str, file=sys.stderr)
|
|
|
|
sys.exit(1)
|
|
|
|
except (socket.error, IOError, xmlrpc.client.Fault) as e:
|
|
|
|
print('error: cannot connect to manifest server %s:\n%s'
|
|
|
|
% (self.manifest.manifest_server, e), file=sys.stderr)
|
|
|
|
sys.exit(1)
|
|
|
|
except xmlrpc.client.ProtocolError as e:
|
|
|
|
print('error: cannot connect to manifest server %s:\n%d %s'
|
|
|
|
% (self.manifest.manifest_server, e.errcode, e.errmsg),
|
|
|
|
file=sys.stderr)
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
return manifest_name
|
|
|
|
|
2019-08-27 06:34:32 +00:00
|
|
|
def _UpdateManifestProject(self, opt, mp, manifest_name):
|
|
|
|
"""Fetch & update the local manifest project."""
|
|
|
|
if not opt.local_only:
|
|
|
|
start = time.time()
|
2020-02-17 06:51:49 +00:00
|
|
|
success = mp.Sync_NetworkHalf(quiet=opt.quiet, verbose=opt.verbose,
|
2019-08-27 06:34:32 +00:00
|
|
|
current_branch_only=opt.current_branch_only,
|
2019-06-18 11:49:12 +00:00
|
|
|
force_sync=opt.force_sync,
|
2020-02-17 19:36:08 +00:00
|
|
|
tags=opt.tags,
|
2019-08-27 06:34:32 +00:00
|
|
|
optimized_fetch=opt.optimized_fetch,
|
2020-04-02 18:36:09 +00:00
|
|
|
retry_fetches=opt.retry_fetches,
|
2019-08-27 06:34:32 +00:00
|
|
|
submodules=self.manifest.HasSubmodules,
|
|
|
|
clone_filter=self.manifest.CloneFilter)
|
|
|
|
finish = time.time()
|
|
|
|
self.event_log.AddSync(mp, event_log.TASK_SYNC_NETWORK,
|
|
|
|
start, finish, success)
|
|
|
|
|
|
|
|
if mp.HasChanges:
|
|
|
|
syncbuf = SyncBuffer(mp.config)
|
|
|
|
start = time.time()
|
|
|
|
mp.Sync_LocalHalf(syncbuf, submodules=self.manifest.HasSubmodules)
|
|
|
|
clean = syncbuf.Finish()
|
|
|
|
self.event_log.AddSync(mp, event_log.TASK_SYNC_LOCAL,
|
|
|
|
start, time.time(), clean)
|
|
|
|
if not clean:
|
|
|
|
sys.exit(1)
|
|
|
|
self._ReloadManifest(opt.manifest_name)
|
|
|
|
if opt.jobs is None:
|
|
|
|
self.jobs = self.manifest.default.sync_j
|
|
|
|
|
2019-08-27 05:10:59 +00:00
|
|
|
def ValidateOptions(self, opt, args):
|
2019-08-26 07:12:55 +00:00
|
|
|
if opt.force_broken:
|
|
|
|
print('warning: -f/--force-broken is now the default behavior, and the '
|
|
|
|
'options are deprecated', file=sys.stderr)
|
2009-04-10 23:59:36 +00:00
|
|
|
if opt.network_only and opt.detach_head:
|
2019-08-27 05:10:59 +00:00
|
|
|
self.OptionParser.error('cannot combine -n and -d')
|
2009-04-11 00:04:08 +00:00
|
|
|
if opt.network_only and opt.local_only:
|
2019-08-27 05:10:59 +00:00
|
|
|
self.OptionParser.error('cannot combine -n and -l')
|
2012-01-26 16:36:18 +00:00
|
|
|
if opt.manifest_name and opt.smart_sync:
|
2019-08-27 05:10:59 +00:00
|
|
|
self.OptionParser.error('cannot combine -m and -s')
|
2012-01-26 16:36:18 +00:00
|
|
|
if opt.manifest_name and opt.smart_tag:
|
2019-08-27 05:10:59 +00:00
|
|
|
self.OptionParser.error('cannot combine -m and -t')
|
2012-09-14 01:31:42 +00:00
|
|
|
if opt.manifest_server_username or opt.manifest_server_password:
|
|
|
|
if not (opt.smart_sync or opt.smart_tag):
|
2019-08-27 05:10:59 +00:00
|
|
|
self.OptionParser.error('-u and -p may only be combined with -s or -t')
|
2012-09-14 01:31:42 +00:00
|
|
|
if None in [opt.manifest_server_username, opt.manifest_server_password]:
|
2019-08-27 05:10:59 +00:00
|
|
|
self.OptionParser.error('both -u and -p must be given')
|
|
|
|
|
|
|
|
def Execute(self, opt, args):
|
|
|
|
if opt.jobs:
|
|
|
|
self.jobs = opt.jobs
|
|
|
|
if self.jobs > 1:
|
|
|
|
soft_limit, _ = _rlimit_nofile()
|
|
|
|
self.jobs = min(self.jobs, (soft_limit - 5) // 3)
|
2012-01-26 16:36:18 +00:00
|
|
|
|
2020-02-17 06:51:49 +00:00
|
|
|
opt.quiet = opt.output_mode is False
|
|
|
|
opt.verbose = opt.output_mode is True
|
|
|
|
|
2012-01-26 16:36:18 +00:00
|
|
|
if opt.manifest_name:
|
|
|
|
self.manifest.Override(opt.manifest_name)
|
2009-04-10 23:59:36 +00:00
|
|
|
|
2013-06-11 08:48:46 +00:00
|
|
|
manifest_name = opt.manifest_name
|
2015-05-07 05:36:09 +00:00
|
|
|
smart_sync_manifest_path = os.path.join(
|
2020-02-12 05:58:39 +00:00
|
|
|
self.manifest.manifestProject.worktree, 'smart_sync_override.xml')
|
2013-06-11 08:48:46 +00:00
|
|
|
|
2020-05-20 23:03:45 +00:00
|
|
|
if opt.clone_bundle is None:
|
|
|
|
opt.clone_bundle = self.manifest.CloneBundle
|
|
|
|
|
2011-04-19 08:32:52 +00:00
|
|
|
if opt.smart_sync or opt.smart_tag:
|
2019-08-27 05:56:43 +00:00
|
|
|
manifest_name = self._SmartSyncSetup(opt, smart_sync_manifest_path)
|
|
|
|
else:
|
2015-05-07 05:36:09 +00:00
|
|
|
if os.path.isfile(smart_sync_manifest_path):
|
|
|
|
try:
|
2016-11-11 22:25:29 +00:00
|
|
|
platform_utils.remove(smart_sync_manifest_path)
|
2015-05-07 05:36:09 +00:00
|
|
|
except OSError as e:
|
|
|
|
print('error: failed to remove existing smart sync override manifest: %s' %
|
|
|
|
e, file=sys.stderr)
|
2010-04-06 17:40:01 +00:00
|
|
|
|
2019-09-23 23:21:20 +00:00
|
|
|
err_event = _threading.Event()
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
rp = self.manifest.repoProject
|
|
|
|
rp.PreSync()
|
2020-02-29 07:52:44 +00:00
|
|
|
cb = rp.CurrentBranch
|
|
|
|
if cb:
|
|
|
|
base = rp.GetBranch(cb).merge
|
|
|
|
if not base or not base.startswith('refs/heads/'):
|
|
|
|
print('warning: repo is not tracking a remote branch, so it will not '
|
2020-03-14 18:35:26 +00:00
|
|
|
'receive updates; run `repo init --repo-rev=stable` to fix.',
|
2020-02-29 07:52:44 +00:00
|
|
|
file=sys.stderr)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
mp = self.manifest.manifestProject
|
|
|
|
mp.PreSync()
|
|
|
|
|
2008-11-03 18:32:09 +00:00
|
|
|
if opt.repo_upgraded:
|
2012-10-26 19:23:05 +00:00
|
|
|
_PostRepoUpgrade(self.manifest, quiet=opt.quiet)
|
2008-11-03 18:32:09 +00:00
|
|
|
|
2019-11-22 08:04:31 +00:00
|
|
|
if not opt.mp_update:
|
|
|
|
print('Skipping update of local manifest project.')
|
|
|
|
else:
|
|
|
|
self._UpdateManifestProject(opt, mp, manifest_name)
|
2015-08-20 19:19:28 +00:00
|
|
|
|
2021-02-04 22:39:38 +00:00
|
|
|
if opt.use_superproject:
|
|
|
|
manifest_name = self._UpdateProjectsRevisionId(opt, args)
|
|
|
|
|
2015-08-20 19:19:28 +00:00
|
|
|
if self.gitc_manifest:
|
|
|
|
gitc_manifest_projects = self.GetProjects(args,
|
|
|
|
missing_ok=True)
|
|
|
|
gitc_projects = []
|
|
|
|
opened_projects = []
|
|
|
|
for project in gitc_manifest_projects:
|
2015-09-08 20:27:20 +00:00
|
|
|
if project.relpath in self.gitc_manifest.paths and \
|
|
|
|
self.gitc_manifest.paths[project.relpath].old_revision:
|
|
|
|
opened_projects.append(project.relpath)
|
2015-08-20 19:19:28 +00:00
|
|
|
else:
|
2015-09-08 20:27:20 +00:00
|
|
|
gitc_projects.append(project.relpath)
|
2015-08-20 19:19:28 +00:00
|
|
|
|
2015-09-08 20:27:20 +00:00
|
|
|
if not args:
|
|
|
|
gitc_projects = None
|
|
|
|
|
|
|
|
if gitc_projects != [] and not opt.local_only:
|
2015-08-20 19:19:28 +00:00
|
|
|
print('Updating GITC client: %s' % self.gitc_manifest.gitc_client_name)
|
2015-09-08 20:27:20 +00:00
|
|
|
manifest = GitcManifest(self.repodir, self.gitc_manifest.gitc_client_name)
|
|
|
|
if manifest_name:
|
|
|
|
manifest.Override(manifest_name)
|
|
|
|
else:
|
|
|
|
manifest.Override(self.manifest.manifestFile)
|
|
|
|
gitc_utils.generate_gitc_manifest(self.gitc_manifest,
|
|
|
|
manifest,
|
2015-08-20 19:19:28 +00:00
|
|
|
gitc_projects)
|
|
|
|
print('GITC client successfully synced.')
|
|
|
|
|
|
|
|
# The opened projects need to be synced as normal, therefore we
|
|
|
|
# generate a new args list to represent the opened projects.
|
2015-09-08 20:27:20 +00:00
|
|
|
# TODO: make this more reliable -- if there's a project name/path overlap,
|
|
|
|
# this may choose the wrong project.
|
2017-07-10 13:42:22 +00:00
|
|
|
args = [os.path.relpath(self.manifest.paths[path].worktree, os.getcwd())
|
|
|
|
for path in opened_projects]
|
2015-08-20 19:19:28 +00:00
|
|
|
if not args:
|
|
|
|
return
|
Represent git-submodule as nested projects, take 2
(Previous submission of this change broke Android buildbot due to
incorrect regular expression for parsing git-config output. During
investigation, we also found that Android, which pulls Chromium, has a
workaround for Chromium's submodules; its manifest includes Chromium's
submodules. This new change, in addition to fixing the regex, also
take this type of workarounds into consideration; it adds a new
attribute that makes repo not fetch submodules unless submodules have a
project element defined in the manifest, or this attribute is
overridden by a parent project element or by the default element.)
We need a representation of git-submodule in repo; otherwise repo will
not sync submodules, and leave workspace in a broken state. Of course
this will not be a problem if all projects are owned by the owner of the
manifest file, who may simply choose not to use git-submodule in all
projects. However, this is not possible in practice because manifest
file owner is unlikely to own all upstream projects.
As git submodules are simply git repositories, it is natural to treat
them as plain repo projects that live inside a repo project. That is,
we could use recursively declared projects to denote the is-submodule
relation of git repositories.
The behavior of repo remains the same to projects that do not have a
sub-project within. As for parent projects, repo fetches them and their
sub-projects as normal projects, and then checks out subprojects at the
commit specified in parent's commit object. The sub-project is fetched
at a path relative to parent project's working directory; so the path
specified in manifest file should match that of .gitmodules file.
If a submodule is not registered in repo manifest, repo will derive its
properties from itself and its parent project, which might not always be
correct. In such cases, the subproject is called a derived subproject.
To a user, a sub-project is merely a git-submodule; so all tips of
working with a git-submodule apply here, too. For example, you should
not run `repo sync` in a parent repository if its submodule is dirty.
Change-Id: I4b8344c1b9ccad2f58ad304573133e5d52e1faef
2012-01-11 03:28:42 +00:00
|
|
|
all_projects = self.GetProjects(args,
|
|
|
|
missing_ok=True,
|
|
|
|
submodules_ok=opt.fetch_submodules)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2019-09-23 23:21:20 +00:00
|
|
|
err_network_sync = False
|
|
|
|
err_update_projects = False
|
|
|
|
err_checkout = False
|
|
|
|
|
2012-10-23 22:00:54 +00:00
|
|
|
self._fetch_times = _FetchTimes(self.manifest)
|
2009-04-11 00:04:08 +00:00
|
|
|
if not opt.local_only:
|
2009-04-18 17:49:00 +00:00
|
|
|
to_fetch = []
|
|
|
|
now = time.time()
|
2012-10-23 22:00:54 +00:00
|
|
|
if _ONE_DAY_S <= (now - rp.LastFetch):
|
2009-04-18 17:49:00 +00:00
|
|
|
to_fetch.append(rp)
|
2012-09-24 03:15:13 +00:00
|
|
|
to_fetch.extend(all_projects)
|
2012-10-23 22:00:54 +00:00
|
|
|
to_fetch.sort(key=self._fetch_times.Get, reverse=True)
|
2009-04-18 17:49:00 +00:00
|
|
|
|
2019-09-23 23:21:20 +00:00
|
|
|
fetched = self._Fetch(to_fetch, opt, err_event)
|
|
|
|
|
2020-02-17 19:36:08 +00:00
|
|
|
_PostRepoFetch(rp, opt.repo_verify)
|
2009-04-11 00:04:08 +00:00
|
|
|
if opt.network_only:
|
|
|
|
# bail out now; the rest touches the working tree
|
2019-09-23 23:21:20 +00:00
|
|
|
if err_event.isSet():
|
|
|
|
print('\nerror: Exited sync due to fetch errors.\n', file=sys.stderr)
|
|
|
|
sys.exit(1)
|
2009-04-11 00:04:08 +00:00
|
|
|
return
|
|
|
|
|
Represent git-submodule as nested projects, take 2
(Previous submission of this change broke Android buildbot due to
incorrect regular expression for parsing git-config output. During
investigation, we also found that Android, which pulls Chromium, has a
workaround for Chromium's submodules; its manifest includes Chromium's
submodules. This new change, in addition to fixing the regex, also
take this type of workarounds into consideration; it adds a new
attribute that makes repo not fetch submodules unless submodules have a
project element defined in the manifest, or this attribute is
overridden by a parent project element or by the default element.)
We need a representation of git-submodule in repo; otherwise repo will
not sync submodules, and leave workspace in a broken state. Of course
this will not be a problem if all projects are owned by the owner of the
manifest file, who may simply choose not to use git-submodule in all
projects. However, this is not possible in practice because manifest
file owner is unlikely to own all upstream projects.
As git submodules are simply git repositories, it is natural to treat
them as plain repo projects that live inside a repo project. That is,
we could use recursively declared projects to denote the is-submodule
relation of git repositories.
The behavior of repo remains the same to projects that do not have a
sub-project within. As for parent projects, repo fetches them and their
sub-projects as normal projects, and then checks out subprojects at the
commit specified in parent's commit object. The sub-project is fetched
at a path relative to parent project's working directory; so the path
specified in manifest file should match that of .gitmodules file.
If a submodule is not registered in repo manifest, repo will derive its
properties from itself and its parent project, which might not always be
correct. In such cases, the subproject is called a derived subproject.
To a user, a sub-project is merely a git-submodule; so all tips of
working with a git-submodule apply here, too. For example, you should
not run `repo sync` in a parent repository if its submodule is dirty.
Change-Id: I4b8344c1b9ccad2f58ad304573133e5d52e1faef
2012-01-11 03:28:42 +00:00
|
|
|
# Iteratively fetch missing and/or nested unregistered submodules
|
|
|
|
previously_missing_set = set()
|
|
|
|
while True:
|
2013-03-19 11:20:52 +00:00
|
|
|
self._ReloadManifest(manifest_name)
|
Represent git-submodule as nested projects, take 2
(Previous submission of this change broke Android buildbot due to
incorrect regular expression for parsing git-config output. During
investigation, we also found that Android, which pulls Chromium, has a
workaround for Chromium's submodules; its manifest includes Chromium's
submodules. This new change, in addition to fixing the regex, also
take this type of workarounds into consideration; it adds a new
attribute that makes repo not fetch submodules unless submodules have a
project element defined in the manifest, or this attribute is
overridden by a parent project element or by the default element.)
We need a representation of git-submodule in repo; otherwise repo will
not sync submodules, and leave workspace in a broken state. Of course
this will not be a problem if all projects are owned by the owner of the
manifest file, who may simply choose not to use git-submodule in all
projects. However, this is not possible in practice because manifest
file owner is unlikely to own all upstream projects.
As git submodules are simply git repositories, it is natural to treat
them as plain repo projects that live inside a repo project. That is,
we could use recursively declared projects to denote the is-submodule
relation of git repositories.
The behavior of repo remains the same to projects that do not have a
sub-project within. As for parent projects, repo fetches them and their
sub-projects as normal projects, and then checks out subprojects at the
commit specified in parent's commit object. The sub-project is fetched
at a path relative to parent project's working directory; so the path
specified in manifest file should match that of .gitmodules file.
If a submodule is not registered in repo manifest, repo will derive its
properties from itself and its parent project, which might not always be
correct. In such cases, the subproject is called a derived subproject.
To a user, a sub-project is merely a git-submodule; so all tips of
working with a git-submodule apply here, too. For example, you should
not run `repo sync` in a parent repository if its submodule is dirty.
Change-Id: I4b8344c1b9ccad2f58ad304573133e5d52e1faef
2012-01-11 03:28:42 +00:00
|
|
|
all_projects = self.GetProjects(args,
|
|
|
|
missing_ok=True,
|
|
|
|
submodules_ok=opt.fetch_submodules)
|
|
|
|
missing = []
|
|
|
|
for project in all_projects:
|
|
|
|
if project.gitdir not in fetched:
|
|
|
|
missing.append(project)
|
|
|
|
if not missing:
|
|
|
|
break
|
|
|
|
# Stop us from non-stopped fetching actually-missing repos: If set of
|
|
|
|
# missing repos has not been changed from last fetch, we break.
|
|
|
|
missing_set = set(p.name for p in missing)
|
|
|
|
if previously_missing_set == missing_set:
|
|
|
|
break
|
|
|
|
previously_missing_set = missing_set
|
2019-09-23 23:21:20 +00:00
|
|
|
fetched.update(self._Fetch(missing, opt, err_event))
|
|
|
|
|
|
|
|
# If we saw an error, exit with code 1 so that other scripts can check.
|
|
|
|
if err_event.isSet():
|
|
|
|
err_network_sync = True
|
|
|
|
if opt.fail_fast:
|
|
|
|
print('\nerror: Exited sync due to fetch errors.\n'
|
|
|
|
'Local checkouts *not* updated. Resolve network issues & '
|
|
|
|
'retry.\n'
|
|
|
|
'`repo sync -l` will update some local checkouts.',
|
|
|
|
file=sys.stderr)
|
|
|
|
sys.exit(1)
|
Represent git-submodule as nested projects, take 2
(Previous submission of this change broke Android buildbot due to
incorrect regular expression for parsing git-config output. During
investigation, we also found that Android, which pulls Chromium, has a
workaround for Chromium's submodules; its manifest includes Chromium's
submodules. This new change, in addition to fixing the regex, also
take this type of workarounds into consideration; it adds a new
attribute that makes repo not fetch submodules unless submodules have a
project element defined in the manifest, or this attribute is
overridden by a parent project element or by the default element.)
We need a representation of git-submodule in repo; otherwise repo will
not sync submodules, and leave workspace in a broken state. Of course
this will not be a problem if all projects are owned by the owner of the
manifest file, who may simply choose not to use git-submodule in all
projects. However, this is not possible in practice because manifest
file owner is unlikely to own all upstream projects.
As git submodules are simply git repositories, it is natural to treat
them as plain repo projects that live inside a repo project. That is,
we could use recursively declared projects to denote the is-submodule
relation of git repositories.
The behavior of repo remains the same to projects that do not have a
sub-project within. As for parent projects, repo fetches them and their
sub-projects as normal projects, and then checks out subprojects at the
commit specified in parent's commit object. The sub-project is fetched
at a path relative to parent project's working directory; so the path
specified in manifest file should match that of .gitmodules file.
If a submodule is not registered in repo manifest, repo will derive its
properties from itself and its parent project, which might not always be
correct. In such cases, the subproject is called a derived subproject.
To a user, a sub-project is merely a git-submodule; so all tips of
working with a git-submodule apply here, too. For example, you should
not run `repo sync` in a parent repository if its submodule is dirty.
Change-Id: I4b8344c1b9ccad2f58ad304573133e5d52e1faef
2012-01-11 03:28:42 +00:00
|
|
|
|
2013-10-16 09:02:35 +00:00
|
|
|
if self.manifest.IsMirror or self.manifest.IsArchive:
|
2009-06-04 23:15:53 +00:00
|
|
|
# bail out now, we have no working tree
|
|
|
|
return
|
|
|
|
|
2018-12-18 00:23:44 +00:00
|
|
|
if self.UpdateProjectList(opt):
|
2019-09-23 23:21:20 +00:00
|
|
|
err_event.set()
|
|
|
|
err_update_projects = True
|
|
|
|
if opt.fail_fast:
|
|
|
|
print('\nerror: Local checkouts *not* updated.', file=sys.stderr)
|
|
|
|
sys.exit(1)
|
2009-06-02 04:10:33 +00:00
|
|
|
|
2019-09-23 23:21:20 +00:00
|
|
|
err_results = []
|
|
|
|
self._Checkout(all_projects, opt, err_event, err_results)
|
|
|
|
if err_event.isSet():
|
|
|
|
err_checkout = True
|
|
|
|
# NB: We don't exit here because this is the last step.
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2010-11-01 22:08:06 +00:00
|
|
|
# If there's a notice that's supposed to print at the end of the sync, print
|
|
|
|
# it now...
|
|
|
|
if self.manifest.notice:
|
2012-11-02 05:59:27 +00:00
|
|
|
print(self.manifest.notice)
|
2010-11-01 22:08:06 +00:00
|
|
|
|
2019-09-23 23:21:20 +00:00
|
|
|
# If we saw an error, exit with code 1 so that other scripts can check.
|
|
|
|
if err_event.isSet():
|
|
|
|
print('\nerror: Unable to fully sync the tree.', file=sys.stderr)
|
|
|
|
if err_network_sync:
|
|
|
|
print('error: Downloading network changes failed.', file=sys.stderr)
|
|
|
|
if err_update_projects:
|
|
|
|
print('error: Updating local project lists failed.', file=sys.stderr)
|
|
|
|
if err_checkout:
|
|
|
|
print('error: Checking out local projects failed.', file=sys.stderr)
|
|
|
|
if err_results:
|
|
|
|
print('Failing repos:\n%s' % '\n'.join(err_results), file=sys.stderr)
|
|
|
|
print('Try re-running with "-j1 --fail-fast" to exit at the first error.',
|
|
|
|
file=sys.stderr)
|
|
|
|
sys.exit(1)
|
|
|
|
|
2020-02-12 16:23:32 +00:00
|
|
|
if not opt.quiet:
|
|
|
|
print('repo sync has finished successfully.')
|
|
|
|
|
2020-02-12 06:20:19 +00:00
|
|
|
|
2012-10-26 19:23:05 +00:00
|
|
|
def _PostRepoUpgrade(manifest, quiet=False):
|
2014-01-30 23:09:59 +00:00
|
|
|
wrapper = Wrapper()
|
2012-10-01 23:12:28 +00:00
|
|
|
if wrapper.NeedSetupGnuPG():
|
2012-10-26 19:23:05 +00:00
|
|
|
wrapper.SetupGnuPG(quiet)
|
2014-01-29 21:53:43 +00:00
|
|
|
for project in manifest.projects:
|
2009-04-13 18:51:15 +00:00
|
|
|
if project.Exists:
|
|
|
|
project.PostRepoUpgrade()
|
|
|
|
|
2020-02-12 06:20:19 +00:00
|
|
|
|
2020-02-17 19:36:08 +00:00
|
|
|
def _PostRepoFetch(rp, repo_verify=True, verbose=False):
|
2009-04-13 18:51:15 +00:00
|
|
|
if rp.HasChanges:
|
2012-11-02 05:59:27 +00:00
|
|
|
print('info: A new version of repo is available', file=sys.stderr)
|
|
|
|
print(file=sys.stderr)
|
2020-02-17 19:36:08 +00:00
|
|
|
if not repo_verify or _VerifyTag(rp):
|
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(rp.config)
|
|
|
|
rp.Sync_LocalHalf(syncbuf)
|
|
|
|
if not syncbuf.Finish():
|
2009-04-13 18:51:15 +00:00
|
|
|
sys.exit(1)
|
2012-11-02 05:59:27 +00:00
|
|
|
print('info: Restarting repo with latest version', file=sys.stderr)
|
2009-04-13 18:51:15 +00:00
|
|
|
raise RepoChangedException(['--repo-upgraded'])
|
|
|
|
else:
|
2012-11-02 05:59:27 +00:00
|
|
|
print('warning: Skipped upgrade to unverified version', file=sys.stderr)
|
2009-04-13 18:51:15 +00:00
|
|
|
else:
|
|
|
|
if verbose:
|
2012-11-02 05:59:27 +00:00
|
|
|
print('repo version %s is current' % rp.work_git.describe(HEAD),
|
|
|
|
file=sys.stderr)
|
2009-04-13 18:51:15 +00:00
|
|
|
|
2020-02-12 06:20:19 +00:00
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
def _VerifyTag(project):
|
|
|
|
gpg_dir = os.path.expanduser('~/.repoconfig/gnupg')
|
|
|
|
if not os.path.exists(gpg_dir):
|
2012-11-02 05:59:27 +00:00
|
|
|
print('warning: GnuPG was not available during last "repo init"\n'
|
|
|
|
'warning: Cannot automatically authenticate repo."""',
|
|
|
|
file=sys.stderr)
|
2008-10-21 14:00:00 +00:00
|
|
|
return True
|
|
|
|
|
|
|
|
try:
|
2009-05-30 01:38:17 +00:00
|
|
|
cur = project.bare_git.describe(project.GetRevisionId())
|
2008-10-21 14:00:00 +00:00
|
|
|
except GitError:
|
|
|
|
cur = None
|
|
|
|
|
|
|
|
if not cur \
|
|
|
|
or re.compile(r'^.*-[0-9]{1,}-g[0-9a-f]{1,}$').match(cur):
|
2009-05-30 01:38:17 +00:00
|
|
|
rev = project.revisionExpr
|
2008-10-21 14:00:00 +00:00
|
|
|
if rev.startswith(R_HEADS):
|
|
|
|
rev = rev[len(R_HEADS):]
|
|
|
|
|
2012-11-02 05:59:27 +00:00
|
|
|
print(file=sys.stderr)
|
|
|
|
print("warning: project '%s' branch '%s' is not signed"
|
|
|
|
% (project.name, rev), file=sys.stderr)
|
2008-10-21 14:00:00 +00:00
|
|
|
return False
|
|
|
|
|
2010-12-07 19:41:05 +00:00
|
|
|
env = os.environ.copy()
|
2019-12-05 00:30:48 +00:00
|
|
|
env['GIT_DIR'] = project.gitdir
|
|
|
|
env['GNUPGHOME'] = gpg_dir
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
cmd = [GIT, 'tag', '-v', cur]
|
2021-02-16 07:37:55 +00:00
|
|
|
result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
|
|
|
|
env=env, check=False)
|
|
|
|
if result.returncode:
|
2012-11-02 05:59:27 +00:00
|
|
|
print(file=sys.stderr)
|
2021-02-16 07:37:55 +00:00
|
|
|
print(result.stdout, file=sys.stderr)
|
2012-11-02 05:59:27 +00:00
|
|
|
print(file=sys.stderr)
|
2008-10-21 14:00:00 +00:00
|
|
|
return False
|
|
|
|
return True
|
2012-10-23 22:00:54 +00:00
|
|
|
|
2017-04-05 07:02:59 +00:00
|
|
|
|
2012-10-23 22:00:54 +00:00
|
|
|
class _FetchTimes(object):
|
2012-10-23 23:35:39 +00:00
|
|
|
_ALPHA = 0.5
|
|
|
|
|
2012-10-23 22:00:54 +00:00
|
|
|
def __init__(self, manifest):
|
2014-05-06 14:57:48 +00:00
|
|
|
self._path = os.path.join(manifest.repodir, '.repo_fetchtimes.json')
|
2012-10-23 22:00:54 +00:00
|
|
|
self._times = None
|
2012-10-23 23:35:39 +00:00
|
|
|
self._seen = set()
|
2012-10-23 22:00:54 +00:00
|
|
|
|
|
|
|
def Get(self, project):
|
|
|
|
self._Load()
|
|
|
|
return self._times.get(project.name, _ONE_DAY_S)
|
|
|
|
|
|
|
|
def Set(self, project, t):
|
2012-10-23 23:35:39 +00:00
|
|
|
self._Load()
|
|
|
|
name = project.name
|
|
|
|
old = self._times.get(name, t)
|
|
|
|
self._seen.add(name)
|
|
|
|
a = self._ALPHA
|
2020-02-12 05:31:05 +00:00
|
|
|
self._times[name] = (a * t) + ((1 - a) * old)
|
2012-10-23 22:00:54 +00:00
|
|
|
|
|
|
|
def _Load(self):
|
|
|
|
if self._times is None:
|
|
|
|
try:
|
2019-11-11 10:40:22 +00:00
|
|
|
with open(self._path) as f:
|
2014-05-06 14:57:48 +00:00
|
|
|
self._times = json.load(f)
|
|
|
|
except (IOError, ValueError):
|
|
|
|
try:
|
2016-11-11 22:25:29 +00:00
|
|
|
platform_utils.remove(self._path)
|
2014-05-06 14:57:48 +00:00
|
|
|
except OSError:
|
|
|
|
pass
|
|
|
|
self._times = {}
|
2012-10-23 22:00:54 +00:00
|
|
|
|
|
|
|
def Save(self):
|
|
|
|
if self._times is None:
|
|
|
|
return
|
2012-10-23 23:35:39 +00:00
|
|
|
|
|
|
|
to_delete = []
|
|
|
|
for name in self._times:
|
|
|
|
if name not in self._seen:
|
|
|
|
to_delete.append(name)
|
|
|
|
for name in to_delete:
|
|
|
|
del self._times[name]
|
|
|
|
|
2012-10-23 22:00:54 +00:00
|
|
|
try:
|
2019-11-11 10:40:22 +00:00
|
|
|
with open(self._path, 'w') as f:
|
2014-05-06 14:57:48 +00:00
|
|
|
json.dump(self._times, f, indent=2)
|
|
|
|
except (IOError, TypeError):
|
|
|
|
try:
|
2016-11-11 22:25:29 +00:00
|
|
|
platform_utils.remove(self._path)
|
2014-05-06 14:57:48 +00:00
|
|
|
except OSError:
|
|
|
|
pass
|
2015-08-17 20:41:45 +00:00
|
|
|
|
|
|
|
# This is a replacement for xmlrpc.client.Transport using urllib2
|
|
|
|
# and supporting persistent-http[s]. It cannot change hosts from
|
|
|
|
# request to request like the normal transport, the real url
|
|
|
|
# is passed during initialization.
|
2020-02-12 06:20:19 +00:00
|
|
|
|
|
|
|
|
2015-08-17 20:41:45 +00:00
|
|
|
class PersistentTransport(xmlrpc.client.Transport):
|
|
|
|
def __init__(self, orig_host):
|
|
|
|
self.orig_host = orig_host
|
|
|
|
|
|
|
|
def request(self, host, handler, request_body, verbose=False):
|
|
|
|
with GetUrlCookieFile(self.orig_host, not verbose) as (cookiefile, proxy):
|
|
|
|
# Python doesn't understand cookies with the #HttpOnly_ prefix
|
|
|
|
# Since we're only using them for HTTP, copy the file temporarily,
|
|
|
|
# stripping those prefixes away.
|
2015-08-20 17:09:20 +00:00
|
|
|
if cookiefile:
|
2020-02-18 18:57:32 +00:00
|
|
|
tmpcookiefile = tempfile.NamedTemporaryFile(mode='w')
|
2015-10-02 02:10:10 +00:00
|
|
|
tmpcookiefile.write("# HTTP Cookie File")
|
2015-08-20 17:09:20 +00:00
|
|
|
try:
|
|
|
|
with open(cookiefile) as f:
|
|
|
|
for line in f:
|
|
|
|
if line.startswith("#HttpOnly_"):
|
|
|
|
line = line[len("#HttpOnly_"):]
|
|
|
|
tmpcookiefile.write(line)
|
|
|
|
tmpcookiefile.flush()
|
|
|
|
|
|
|
|
cookiejar = cookielib.MozillaCookieJar(tmpcookiefile.name)
|
2015-09-30 01:35:43 +00:00
|
|
|
try:
|
|
|
|
cookiejar.load()
|
|
|
|
except cookielib.LoadError:
|
|
|
|
cookiejar = cookielib.CookieJar()
|
2015-08-20 17:09:20 +00:00
|
|
|
finally:
|
|
|
|
tmpcookiefile.close()
|
|
|
|
else:
|
|
|
|
cookiejar = cookielib.CookieJar()
|
2015-08-17 20:41:45 +00:00
|
|
|
|
|
|
|
proxyhandler = urllib.request.ProxyHandler
|
|
|
|
if proxy:
|
|
|
|
proxyhandler = urllib.request.ProxyHandler({
|
|
|
|
"http": proxy,
|
2020-02-12 05:31:05 +00:00
|
|
|
"https": proxy})
|
2015-08-17 20:41:45 +00:00
|
|
|
|
|
|
|
opener = urllib.request.build_opener(
|
|
|
|
urllib.request.HTTPCookieProcessor(cookiejar),
|
|
|
|
proxyhandler)
|
|
|
|
|
|
|
|
url = urllib.parse.urljoin(self.orig_host, handler)
|
|
|
|
parse_results = urllib.parse.urlparse(url)
|
|
|
|
|
|
|
|
scheme = parse_results.scheme
|
|
|
|
if scheme == 'persistent-http':
|
|
|
|
scheme = 'http'
|
|
|
|
if scheme == 'persistent-https':
|
|
|
|
# If we're proxying through persistent-https, use http. The
|
|
|
|
# proxy itself will do the https.
|
|
|
|
if proxy:
|
|
|
|
scheme = 'http'
|
|
|
|
else:
|
|
|
|
scheme = 'https'
|
|
|
|
|
|
|
|
# Parse out any authentication information using the base class
|
|
|
|
host, extra_headers, _ = self.get_host_info(parse_results.netloc)
|
|
|
|
|
|
|
|
url = urllib.parse.urlunparse((
|
|
|
|
scheme,
|
|
|
|
host,
|
|
|
|
parse_results.path,
|
|
|
|
parse_results.params,
|
|
|
|
parse_results.query,
|
|
|
|
parse_results.fragment))
|
|
|
|
|
|
|
|
request = urllib.request.Request(url, request_body)
|
|
|
|
if extra_headers is not None:
|
|
|
|
for (name, header) in extra_headers:
|
|
|
|
request.add_header(name, header)
|
|
|
|
request.add_header('Content-Type', 'text/xml')
|
|
|
|
try:
|
|
|
|
response = opener.open(request)
|
|
|
|
except urllib.error.HTTPError as e:
|
|
|
|
if e.code == 501:
|
|
|
|
# We may have been redirected through a login process
|
|
|
|
# but our POST turned into a GET. Retry.
|
|
|
|
response = opener.open(request)
|
|
|
|
else:
|
|
|
|
raise
|
|
|
|
|
|
|
|
p, u = xmlrpc.client.getparser()
|
|
|
|
while 1:
|
|
|
|
data = response.read(1024)
|
|
|
|
if not data:
|
|
|
|
break
|
|
|
|
p.feed(data)
|
|
|
|
p.close()
|
|
|
|
return u.close()
|
|
|
|
|
|
|
|
def close(self):
|
|
|
|
pass
|