mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
8d43dea6ea
Changed "git pull" to "git fetch" as we are using --bare option. Used the following command to fetch: git fetch origin +refs/heads/*:refs/heads/* --prune Pass --branch argument to Superproject's UpdateProjectsRevisionId function. Returned False/None when directories don't exist instead of raise GitError exception from _Fetch and _LsTree functions. The caller of Fetch does Clone if Fetch fails. Tested the code with the following commands. $ ./run_tests -v Tested the init and sync code by copying all the repo changes into my Android AOSP checkout and running repo sync with --use-superproject option. Bug: https://crbug.com/gerrit/13709 Bug: https://crbug.com/gerrit/13707 Tested-by: Raman Tenneti <rtenneti@google.com> Change-Id: I3e441ecdfc87c735f46eff0eb98efa63cc2eb22a Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/296222 Reviewed-by: Mike Frysinger <vapier@google.com>
251 lines
8.4 KiB
Python
251 lines
8.4 KiB
Python
# Copyright (C) 2021 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
"""Provide functionality to get all projects and their SHAs from Superproject.
|
|
|
|
For more information on superproject, check out:
|
|
https://en.wikibooks.org/wiki/Git/Submodules_and_Superprojects
|
|
|
|
Examples:
|
|
superproject = Superproject()
|
|
project_shas = superproject.GetAllProjectsSHAs()
|
|
"""
|
|
|
|
import os
|
|
import sys
|
|
|
|
from error import BUG_REPORT_URL, GitError
|
|
from git_command import GitCommand
|
|
import platform_utils
|
|
|
|
_SUPERPROJECT_GIT_NAME = 'superproject.git'
|
|
_SUPERPROJECT_MANIFEST_NAME = 'superproject_override.xml'
|
|
|
|
|
|
class Superproject(object):
|
|
"""Get SHAs from superproject.
|
|
|
|
It does a 'git clone' of superproject and 'git ls-tree' to get list of SHAs for all projects.
|
|
It contains project_shas which is a dictionary with project/sha entries.
|
|
"""
|
|
def __init__(self, repodir, superproject_dir='exp-superproject'):
|
|
"""Initializes superproject.
|
|
|
|
Args:
|
|
repodir: Path to the .repo/ dir for holding all internal checkout state.
|
|
superproject_dir: Relative path under |repodir| to checkout superproject.
|
|
"""
|
|
self._project_shas = None
|
|
self._repodir = os.path.abspath(repodir)
|
|
self._superproject_dir = superproject_dir
|
|
self._superproject_path = os.path.join(self._repodir, superproject_dir)
|
|
self._manifest_path = os.path.join(self._superproject_path,
|
|
_SUPERPROJECT_MANIFEST_NAME)
|
|
self._work_git = os.path.join(self._superproject_path,
|
|
_SUPERPROJECT_GIT_NAME)
|
|
|
|
@property
|
|
def project_shas(self):
|
|
"""Returns a dictionary of projects and their SHAs."""
|
|
return self._project_shas
|
|
|
|
def _Clone(self, url, branch=None):
|
|
"""Do a 'git clone' for the given url and branch.
|
|
|
|
Args:
|
|
url: superproject's url to be passed to git clone.
|
|
branch: The branchname to be passed as argument to git clone.
|
|
|
|
Returns:
|
|
True if 'git clone <url> <branch>' is successful, or False.
|
|
"""
|
|
if not os.path.exists(self._superproject_path):
|
|
os.mkdir(self._superproject_path)
|
|
cmd = ['clone', url, '--filter', 'blob:none', '--bare']
|
|
if branch:
|
|
cmd += ['--branch', branch]
|
|
p = GitCommand(None,
|
|
cmd,
|
|
cwd=self._superproject_path,
|
|
capture_stdout=True,
|
|
capture_stderr=True)
|
|
retval = p.Wait()
|
|
if retval:
|
|
# `git clone` is documented to produce an exit status of `128` if
|
|
# the requested url or branch are not present in the configuration.
|
|
print('repo: error: git clone call failed with return code: %r, stderr: %r' %
|
|
(retval, p.stderr), file=sys.stderr)
|
|
return False
|
|
return True
|
|
|
|
def _Fetch(self):
|
|
"""Do a 'git fetch' to to fetch the latest content.
|
|
|
|
Returns:
|
|
True if 'git fetch' is successful, or False.
|
|
"""
|
|
if not os.path.exists(self._work_git):
|
|
print('git fetch missing drectory: %s' % self._work_git,
|
|
file=sys.stderr)
|
|
return False
|
|
cmd = ['fetch', 'origin', '+refs/heads/*:refs/heads/*', '--prune']
|
|
p = GitCommand(None,
|
|
cmd,
|
|
cwd=self._work_git,
|
|
capture_stdout=True,
|
|
capture_stderr=True)
|
|
retval = p.Wait()
|
|
if retval:
|
|
print('repo: error: git fetch call failed with return code: %r, stderr: %r' %
|
|
(retval, p.stderr), file=sys.stderr)
|
|
return False
|
|
return True
|
|
|
|
def _LsTree(self):
|
|
"""Returns the data from 'git ls-tree -r HEAD'.
|
|
|
|
Works only in git repositories.
|
|
|
|
Returns:
|
|
data: data returned from 'git ls-tree -r HEAD' instead of None.
|
|
"""
|
|
if not os.path.exists(self._work_git):
|
|
print('git ls-tree missing drectory: %s' % self._work_git,
|
|
file=sys.stderr)
|
|
return None
|
|
data = None
|
|
cmd = ['ls-tree', '-z', '-r', 'HEAD']
|
|
p = GitCommand(None,
|
|
cmd,
|
|
cwd=self._work_git,
|
|
capture_stdout=True,
|
|
capture_stderr=True)
|
|
retval = p.Wait()
|
|
if retval == 0:
|
|
data = p.stdout
|
|
else:
|
|
# `git clone` is documented to produce an exit status of `128` if
|
|
# the requested url or branch are not present in the configuration.
|
|
print('repo: error: git ls-tree call failed with return code: %r, stderr: %r' % (
|
|
retval, p.stderr), file=sys.stderr)
|
|
return data
|
|
|
|
def _GetAllProjectsSHAs(self, url, branch=None):
|
|
"""Get SHAs for all projects from superproject and save them in _project_shas.
|
|
|
|
Args:
|
|
url: superproject's url to be passed to git clone or fetch.
|
|
branch: The branchname to be passed as argument to git clone or fetch.
|
|
|
|
Returns:
|
|
A dictionary with the projects/SHAs instead of None.
|
|
"""
|
|
if not url:
|
|
raise ValueError('url argument is not supplied.')
|
|
|
|
do_clone = True
|
|
if os.path.exists(self._superproject_path):
|
|
if not self._Fetch():
|
|
# If fetch fails due to a corrupted git directory, then do a git clone.
|
|
platform_utils.rmtree(self._superproject_path)
|
|
else:
|
|
do_clone = False
|
|
if do_clone:
|
|
if not self._Clone(url, branch):
|
|
raise GitError('git clone failed for url: %s' % url)
|
|
|
|
data = self._LsTree()
|
|
if not data:
|
|
raise GitError('git ls-tree failed for url: %s' % url)
|
|
|
|
# Parse lines like the following to select lines starting with '160000' and
|
|
# build a dictionary with project path (last element) and its SHA (3rd element).
|
|
#
|
|
# 160000 commit 2c2724cb36cd5a9cec6c852c681efc3b7c6b86ea\tart\x00
|
|
# 120000 blob acc2cbdf438f9d2141f0ae424cec1d8fc4b5d97f\tbootstrap.bash\x00
|
|
shas = {}
|
|
for line in data.split('\x00'):
|
|
ls_data = line.split(None, 3)
|
|
if not ls_data:
|
|
break
|
|
if ls_data[0] == '160000':
|
|
shas[ls_data[3]] = ls_data[2]
|
|
|
|
self._project_shas = shas
|
|
return shas
|
|
|
|
def _WriteManfiestFile(self, manifest):
|
|
"""Writes manifest to a file.
|
|
|
|
Args:
|
|
manifest: A Manifest object that is to be written to a file.
|
|
|
|
Returns:
|
|
manifest_path: Path name of the file into which manifest is written instead of None.
|
|
"""
|
|
if not os.path.exists(self._superproject_path):
|
|
print('error: missing superproject directory %s' %
|
|
self._superproject_path,
|
|
file=sys.stderr)
|
|
return None
|
|
manifest_str = manifest.ToXml().toxml()
|
|
manifest_path = self._manifest_path
|
|
try:
|
|
with open(manifest_path, 'w', encoding='utf-8') as fp:
|
|
fp.write(manifest_str)
|
|
except IOError as e:
|
|
print('error: cannot write manifest to %s:\n%s'
|
|
% (manifest_path, e),
|
|
file=sys.stderr)
|
|
return None
|
|
return manifest_path
|
|
|
|
def UpdateProjectsRevisionId(self, manifest, projects, url, branch=None):
|
|
"""Update revisionId of every project in projects with the SHA.
|
|
|
|
Args:
|
|
manifest: A Manifest object that is to be written to a file.
|
|
projects: List of projects whose revisionId needs to be updated.
|
|
url: superproject's url to be passed to git clone or fetch.
|
|
branch: The branchname to be passed as argument to git clone or fetch.
|
|
|
|
Returns:
|
|
manifest_path: Path name of the overriding manfiest file instead of None.
|
|
"""
|
|
try:
|
|
shas = self._GetAllProjectsSHAs(url=url, branch=branch)
|
|
except Exception as e:
|
|
print('error: Cannot get project SHAs for %s: %s: %s' %
|
|
(url, type(e).__name__, str(e)),
|
|
file=sys.stderr)
|
|
return None
|
|
|
|
projects_missing_shas = []
|
|
for project in projects:
|
|
path = project.relpath
|
|
if not path:
|
|
continue
|
|
sha = shas.get(path)
|
|
if sha:
|
|
project.SetRevisionId(sha)
|
|
else:
|
|
projects_missing_shas.append(path)
|
|
if projects_missing_shas:
|
|
print('error: please file a bug using %s to report missing shas for: %s' %
|
|
(BUG_REPORT_URL, projects_missing_shas), file=sys.stderr)
|
|
return None
|
|
|
|
manifest_path = self._WriteManfiestFile(manifest)
|
|
return manifest_path
|