mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
5ea32d1359
This way any changes made to the main manifest are reflected in the gitc manifest. It's also necessary to use both manifests to sync since the information required to update the gitc manifest is actually in the repo manifest. This also fixes a few issues that came up when testing. notdefault groups weren't being saved to the gitc manifest in a method that matched 'sync'. The merge branch wasn't always being set to the correct value either. Change-Id: I435235cb5622a048ffad0059affd32ecf71f1f5b
112 lines
3.6 KiB
Python
112 lines
3.6 KiB
Python
#
|
|
# 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.
|
|
|
|
from __future__ import print_function
|
|
import os
|
|
import sys
|
|
|
|
from command import Command
|
|
from git_config import IsId
|
|
from git_command import git
|
|
import gitc_utils
|
|
from progress import Progress
|
|
from project import SyncBuffer
|
|
|
|
class Start(Command):
|
|
common = True
|
|
helpSummary = "Start a new branch for development"
|
|
helpUsage = """
|
|
%prog <newbranchname> [--all | <project>...]
|
|
"""
|
|
helpDescription = """
|
|
'%prog' begins a new branch of development, starting from the
|
|
revision specified in the manifest.
|
|
"""
|
|
|
|
def _Options(self, p):
|
|
p.add_option('--all',
|
|
dest='all', action='store_true',
|
|
help='begin branch in all projects')
|
|
|
|
def Execute(self, opt, args):
|
|
if not args:
|
|
self.Usage()
|
|
|
|
nb = args[0]
|
|
if not git.check_ref_format('heads/%s' % nb):
|
|
print("error: '%s' is not a valid name" % nb, file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
err = []
|
|
projects = []
|
|
if not opt.all:
|
|
projects = args[1:]
|
|
if len(projects) < 1:
|
|
print("error: at least one project must be specified", file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
if self.gitc_manifest:
|
|
all_projects = self.GetProjects(projects, manifest=self.gitc_manifest,
|
|
missing_ok=True)
|
|
for project in all_projects:
|
|
if project.old_revision:
|
|
project.already_synced = True
|
|
else:
|
|
project.already_synced = False
|
|
project.old_revision = project.revisionExpr
|
|
project.revisionExpr = None
|
|
# Save the GITC manifest.
|
|
gitc_utils.save_manifest(self.gitc_manifest)
|
|
|
|
all_projects = self.GetProjects(projects,
|
|
missing_ok=bool(self.gitc_manifest))
|
|
pm = Progress('Starting %s' % nb, len(all_projects))
|
|
for project in all_projects:
|
|
pm.update()
|
|
|
|
if self.gitc_manifest:
|
|
gitc_project = self.gitc_manifest.paths[project.relpath]
|
|
# Sync projects that have not been opened.
|
|
if not gitc_project.already_synced:
|
|
proj_localdir = os.path.join(self.gitc_manifest.gitc_client_dir,
|
|
project.relpath)
|
|
project.worktree = proj_localdir
|
|
if not os.path.exists(proj_localdir):
|
|
os.makedirs(proj_localdir)
|
|
project.Sync_NetworkHalf()
|
|
sync_buf = SyncBuffer(self.manifest.manifestProject.config)
|
|
project.Sync_LocalHalf(sync_buf)
|
|
project.revisionId = gitc_project.old_revision
|
|
|
|
# If the current revision is a specific SHA1 then we can't push back
|
|
# to it; so substitute with dest_branch if defined, or with manifest
|
|
# default revision instead.
|
|
branch_merge = ''
|
|
if IsId(project.revisionExpr):
|
|
if project.dest_branch:
|
|
branch_merge = project.dest_branch
|
|
else:
|
|
branch_merge = self.manifest.default.revisionExpr
|
|
|
|
if not project.StartBranch(nb, branch_merge=branch_merge):
|
|
err.append(project)
|
|
pm.end()
|
|
|
|
if err:
|
|
for p in err:
|
|
print("error: %s/: cannot start %s" % (p.relpath, nb),
|
|
file=sys.stderr)
|
|
sys.exit(1)
|