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.
|
|
|
|
|
2012-11-02 05:59:27 +00:00
|
|
|
from __future__ import print_function
|
2015-08-20 19:19:28 +00:00
|
|
|
import os
|
2008-10-21 14:00:00 +00:00
|
|
|
import sys
|
2015-08-20 19:19:28 +00:00
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
from command import Command
|
2012-06-14 23:53:40 +00:00
|
|
|
from git_config import IsId
|
2008-10-21 14:00:00 +00:00
|
|
|
from git_command import git
|
2015-08-20 19:19:28 +00:00
|
|
|
import gitc_utils
|
2009-04-18 21:53:39 +00:00
|
|
|
from progress import Progress
|
2015-08-20 19:19:28 +00:00
|
|
|
from project import SyncBuffer
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
class Start(Command):
|
|
|
|
common = True
|
|
|
|
helpSummary = "Start a new branch for development"
|
|
|
|
helpUsage = """
|
2009-04-23 00:27:12 +00:00
|
|
|
%prog <newbranchname> [--all | <project>...]
|
2009-04-18 18:19:01 +00:00
|
|
|
"""
|
|
|
|
helpDescription = """
|
|
|
|
'%prog' begins a new branch of development, starting from the
|
|
|
|
revision specified in the manifest.
|
2008-10-21 14:00:00 +00:00
|
|
|
"""
|
|
|
|
|
2009-04-23 00:27:12 +00:00
|
|
|
def _Options(self, p):
|
|
|
|
p.add_option('--all',
|
|
|
|
dest='all', action='store_true',
|
|
|
|
help='begin branch in all projects')
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
def Execute(self, opt, args):
|
|
|
|
if not args:
|
|
|
|
self.Usage()
|
|
|
|
|
|
|
|
nb = args[0]
|
|
|
|
if not git.check_ref_format('heads/%s' % nb):
|
2012-11-02 05:59:27 +00:00
|
|
|
print("error: '%s' is not a valid name" % nb, file=sys.stderr)
|
2008-10-21 14:00:00 +00:00
|
|
|
sys.exit(1)
|
|
|
|
|
2009-04-10 23:21:18 +00:00
|
|
|
err = []
|
2009-04-23 00:27:12 +00:00
|
|
|
projects = []
|
|
|
|
if not opt.all:
|
|
|
|
projects = args[1:]
|
|
|
|
if len(projects) < 1:
|
2014-09-05 17:26:31 +00:00
|
|
|
projects = ['.',] # start it in the local project by default
|
2009-04-23 00:27:12 +00:00
|
|
|
|
2015-10-07 23:53:10 +00:00
|
|
|
all_projects = self.GetProjects(projects,
|
|
|
|
missing_ok=bool(self.gitc_manifest))
|
|
|
|
|
|
|
|
# This must happen after we find all_projects, since GetProjects may need
|
|
|
|
# the local directory, which will disappear once we save the GITC manifest.
|
2015-08-20 19:19:28 +00:00
|
|
|
if self.gitc_manifest:
|
2015-10-07 23:53:10 +00:00
|
|
|
gitc_projects = self.GetProjects(projects, manifest=self.gitc_manifest,
|
|
|
|
missing_ok=True)
|
|
|
|
for project in gitc_projects:
|
2015-08-20 19:19:28 +00:00
|
|
|
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)
|
2009-04-18 21:53:39 +00:00
|
|
|
|
2015-10-07 23:53:10 +00:00
|
|
|
# Make sure we have a valid CWD
|
|
|
|
if not os.path.exists(os.getcwd()):
|
|
|
|
os.chdir(self.manifest.topdir)
|
|
|
|
|
2012-09-24 03:15:13 +00:00
|
|
|
pm = Progress('Starting %s' % nb, len(all_projects))
|
|
|
|
for project in all_projects:
|
2009-04-18 21:53:39 +00:00
|
|
|
pm.update()
|
2015-09-08 20:27:20 +00:00
|
|
|
|
2015-08-20 19:19:28 +00:00
|
|
|
if self.gitc_manifest:
|
2015-09-08 20:27:20 +00:00
|
|
|
gitc_project = self.gitc_manifest.paths[project.relpath]
|
|
|
|
# Sync projects that have not been opened.
|
2015-08-20 19:19:28 +00:00
|
|
|
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)
|
2015-09-08 20:27:20 +00:00
|
|
|
project.revisionId = gitc_project.old_revision
|
2015-08-20 19:19:28 +00:00
|
|
|
|
2012-06-14 23:53:40 +00:00
|
|
|
# If the current revision is a specific SHA1 then we can't push back
|
2014-06-23 06:48:16 +00:00
|
|
|
# to it; so substitute with dest_branch if defined, or with manifest
|
|
|
|
# default revision instead.
|
2015-08-20 19:19:28 +00:00
|
|
|
branch_merge = ''
|
2012-06-14 23:53:40 +00:00
|
|
|
if IsId(project.revisionExpr):
|
2014-06-23 06:48:16 +00:00
|
|
|
if project.dest_branch:
|
2015-08-20 19:19:28 +00:00
|
|
|
branch_merge = project.dest_branch
|
2014-06-23 06:48:16 +00:00
|
|
|
else:
|
2015-08-20 19:19:28 +00:00
|
|
|
branch_merge = self.manifest.default.revisionExpr
|
2015-09-08 20:27:20 +00:00
|
|
|
|
2015-08-20 19:19:28 +00:00
|
|
|
if not project.StartBranch(nb, branch_merge=branch_merge):
|
2009-04-10 23:21:18 +00:00
|
|
|
err.append(project)
|
2009-04-18 21:53:39 +00:00
|
|
|
pm.end()
|
2009-04-10 23:21:18 +00:00
|
|
|
|
|
|
|
if err:
|
|
|
|
for p in err:
|
2012-11-02 05:59:27 +00:00
|
|
|
print("error: %s/: cannot start %s" % (p.relpath, nb),
|
|
|
|
file=sys.stderr)
|
2009-04-10 23:21:18 +00:00
|
|
|
sys.exit(1)
|