mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
ae6cb08ae5
A common pattern in our subcommands is to verify the arguments & options before executing things. For some subcommands, that check stage is quite long which makes the execution function even bigger. Lets split that logic out of the execute phase so it's easier to manage these. This is most noticeable in the sync subcommand whose Execute func is quite large, and the option checking makes up ~15% of it. The manifest command's Execute can be simplified significantly as the optparse configuration always sets output_file to a string. Change-Id: I7097847ff040e831345e63de6b467ee17609990e Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/234834 Reviewed-by: David Pursehouse <dpursehouse@collab.net> Tested-by: Mike Frysinger <vapier@google.com>
120 lines
4.0 KiB
Python
120 lines
4.0 KiB
Python
# -*- coding:utf-8 -*-
|
|
#
|
|
# 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 IsImmutable
|
|
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 ValidateOptions(self, opt, args):
|
|
if not args:
|
|
self.Usage()
|
|
|
|
nb = args[0]
|
|
if not git.check_ref_format('heads/%s' % nb):
|
|
self.OptionParser.error("'%s' is not a valid name" % nb)
|
|
|
|
def Execute(self, opt, args):
|
|
nb = args[0]
|
|
err = []
|
|
projects = []
|
|
if not opt.all:
|
|
projects = args[1:]
|
|
if len(projects) < 1:
|
|
projects = ['.',] # start it in the local project by default
|
|
|
|
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.
|
|
if self.gitc_manifest:
|
|
gitc_projects = self.GetProjects(projects, manifest=self.gitc_manifest,
|
|
missing_ok=True)
|
|
for project in gitc_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)
|
|
|
|
# Make sure we have a valid CWD
|
|
if not os.path.exists(os.getcwd()):
|
|
os.chdir(self.manifest.topdir)
|
|
|
|
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 immutable, such as a SHA1, a tag or
|
|
# a change, then we can't push back to it. Substitute with
|
|
# dest_branch, if defined; or with manifest default revision instead.
|
|
branch_merge = ''
|
|
if IsImmutable(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)
|