mirror of
https://chromium.googlesource.com/chromium/tools/depot_tools.git
synced 2026-01-11 18:51:29 +00:00
switch to 4 space indent
Leave the recipes/ code at 2 space to match the rest of the recipes
project in other repos.
Reformatted using:
files=( $(
git ls-tree -r --name-only HEAD | \
grep -Ev -e '^(third_party|recipes)/' | \
grep '\.py$';
git grep -l '#!/usr/bin/env.*python' | grep -v '\.py$'
) )
parallel ./yapf -i -- "${files[@]}"
~/chromiumos/chromite/contrib/reflow_overlong_comments "${files[@]}"
The files that still had strings that were too long were manually
reformatted because they were easy and only a few issues.
autoninja.py
clang_format.py
download_from_google_storage.py
fix_encoding.py
gclient_utils.py
git_cache.py
git_common.py
git_map_branches.py
git_reparent_branch.py
gn.py
my_activity.py
owners_finder.py
presubmit_canned_checks.py
reclient_helper.py
reclientreport.py
roll_dep.py
rustfmt.py
siso.py
split_cl.py
subcommand.py
subprocess2.py
swift_format.py
upload_to_google_storage.py
These files still had lines (strings) that were too long, so the pylint
warnings were suppressed with a TODO.
auth.py
gclient.py
gclient_eval.py
gclient_paths.py
gclient_scm.py
gerrit_util.py
git_cl.py
presubmit_canned_checks.py
presubmit_support.py
scm.py
Change-Id: Ia6535c4f2c48d46b589ec1e791dde6c6b2ea858f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4836379
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
This commit is contained in:
Mike Frysinger
@@ -39,92 +39,92 @@ ALLOWLISTED_CONFIGS = ('symbol_level', 'use_goma', 'is_debug',
|
||||
|
||||
|
||||
def IsGoogler():
|
||||
"""Check whether this user is Googler or not."""
|
||||
p = subprocess.run('goma_auth info',
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
universal_newlines=True,
|
||||
shell=True)
|
||||
if p.returncode != 0:
|
||||
return False
|
||||
lines = p.stdout.splitlines()
|
||||
if len(lines) == 0:
|
||||
return False
|
||||
l = lines[0]
|
||||
# |l| will be like 'Login as <user>@google.com' for googler using goma.
|
||||
return l.startswith('Login as ') and l.endswith('@google.com')
|
||||
"""Check whether this user is Googler or not."""
|
||||
p = subprocess.run('goma_auth info',
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
universal_newlines=True,
|
||||
shell=True)
|
||||
if p.returncode != 0:
|
||||
return False
|
||||
lines = p.stdout.splitlines()
|
||||
if len(lines) == 0:
|
||||
return False
|
||||
l = lines[0]
|
||||
# |l| will be like 'Login as <user>@google.com' for googler using goma.
|
||||
return l.startswith('Login as ') and l.endswith('@google.com')
|
||||
|
||||
|
||||
def ParseGNArgs(gn_args):
|
||||
"""Parse gn_args as json and return config dictionary."""
|
||||
configs = json.loads(gn_args)
|
||||
build_configs = {}
|
||||
"""Parse gn_args as json and return config dictionary."""
|
||||
configs = json.loads(gn_args)
|
||||
build_configs = {}
|
||||
|
||||
for config in configs:
|
||||
key = config["name"]
|
||||
if key not in ALLOWLISTED_CONFIGS:
|
||||
continue
|
||||
if 'current' in config:
|
||||
build_configs[key] = config['current']['value']
|
||||
else:
|
||||
build_configs[key] = config['default']['value']
|
||||
for config in configs:
|
||||
key = config["name"]
|
||||
if key not in ALLOWLISTED_CONFIGS:
|
||||
continue
|
||||
if 'current' in config:
|
||||
build_configs[key] = config['current']['value']
|
||||
else:
|
||||
build_configs[key] = config['default']['value']
|
||||
|
||||
return build_configs
|
||||
return build_configs
|
||||
|
||||
|
||||
def GetBuildTargetFromCommandLine(cmdline):
|
||||
"""Get build targets from commandline."""
|
||||
"""Get build targets from commandline."""
|
||||
|
||||
# Skip argv0, argv1: ['/path/to/python3', '/path/to/depot_tools/ninja.py']
|
||||
idx = 2
|
||||
# Skip argv0, argv1: ['/path/to/python3', '/path/to/depot_tools/ninja.py']
|
||||
idx = 2
|
||||
|
||||
# Skipping all args that involve these flags, and taking all remaining args
|
||||
# as targets.
|
||||
onearg_flags = ('-C', '-d', '-f', '-j', '-k', '-l', '-p', '-t', '-w')
|
||||
zeroarg_flags = ('--version', '-n', '-v')
|
||||
# Skipping all args that involve these flags, and taking all remaining args
|
||||
# as targets.
|
||||
onearg_flags = ('-C', '-d', '-f', '-j', '-k', '-l', '-p', '-t', '-w')
|
||||
zeroarg_flags = ('--version', '-n', '-v')
|
||||
|
||||
targets = []
|
||||
targets = []
|
||||
|
||||
while idx < len(cmdline):
|
||||
arg = cmdline[idx]
|
||||
if arg in onearg_flags:
|
||||
idx += 2
|
||||
continue
|
||||
while idx < len(cmdline):
|
||||
arg = cmdline[idx]
|
||||
if arg in onearg_flags:
|
||||
idx += 2
|
||||
continue
|
||||
|
||||
if (arg[:2] in onearg_flags or arg in zeroarg_flags):
|
||||
idx += 1
|
||||
continue
|
||||
if (arg[:2] in onearg_flags or arg in zeroarg_flags):
|
||||
idx += 1
|
||||
continue
|
||||
|
||||
# A target doesn't start with '-'.
|
||||
if arg.startswith('-'):
|
||||
idx += 1
|
||||
continue
|
||||
# A target doesn't start with '-'.
|
||||
if arg.startswith('-'):
|
||||
idx += 1
|
||||
continue
|
||||
|
||||
# Avoid uploading absolute paths accidentally. e.g. b/270907050
|
||||
if os.path.isabs(arg):
|
||||
idx += 1
|
||||
continue
|
||||
# Avoid uploading absolute paths accidentally. e.g. b/270907050
|
||||
if os.path.isabs(arg):
|
||||
idx += 1
|
||||
continue
|
||||
|
||||
targets.append(arg)
|
||||
idx += 1
|
||||
targets.append(arg)
|
||||
idx += 1
|
||||
|
||||
return targets
|
||||
return targets
|
||||
|
||||
|
||||
def GetJflag(cmdline):
|
||||
"""Parse cmdline to get flag value for -j"""
|
||||
"""Parse cmdline to get flag value for -j"""
|
||||
|
||||
for i in range(len(cmdline)):
|
||||
if (cmdline[i] == '-j' and i + 1 < len(cmdline)
|
||||
and cmdline[i + 1].isdigit()):
|
||||
return int(cmdline[i + 1])
|
||||
for i in range(len(cmdline)):
|
||||
if (cmdline[i] == '-j' and i + 1 < len(cmdline)
|
||||
and cmdline[i + 1].isdigit()):
|
||||
return int(cmdline[i + 1])
|
||||
|
||||
if (cmdline[i].startswith('-j') and cmdline[i][len('-j'):].isdigit()):
|
||||
return int(cmdline[i][len('-j'):])
|
||||
if (cmdline[i].startswith('-j') and cmdline[i][len('-j'):].isdigit()):
|
||||
return int(cmdline[i][len('-j'):])
|
||||
|
||||
|
||||
def GetMetadata(cmdline, ninjalog):
|
||||
"""Get metadata for uploaded ninjalog.
|
||||
"""Get metadata for uploaded ninjalog.
|
||||
|
||||
Returned metadata has schema defined in
|
||||
https://cs.chromium.org?q="type+Metadata+struct+%7B"+file:%5Einfra/go/src/infra/appengine/chromium_build_stats/ninjalog/
|
||||
@@ -132,120 +132,120 @@ def GetMetadata(cmdline, ninjalog):
|
||||
TODO(tikuta): Collect GOMA_* env var.
|
||||
"""
|
||||
|
||||
build_dir = os.path.dirname(ninjalog)
|
||||
build_dir = os.path.dirname(ninjalog)
|
||||
|
||||
build_configs = {}
|
||||
|
||||
try:
|
||||
args = ['gn', 'args', build_dir, '--list', '--short', '--json']
|
||||
if sys.platform == 'win32':
|
||||
# gn in PATH is bat file in windows environment (except cygwin).
|
||||
args = ['cmd', '/c'] + args
|
||||
|
||||
gn_args = subprocess.check_output(args)
|
||||
build_configs = ParseGNArgs(gn_args)
|
||||
except subprocess.CalledProcessError as e:
|
||||
logging.error("Failed to call gn %s", e)
|
||||
build_configs = {}
|
||||
|
||||
# Stringify config.
|
||||
for k in build_configs:
|
||||
build_configs[k] = str(build_configs[k])
|
||||
try:
|
||||
args = ['gn', 'args', build_dir, '--list', '--short', '--json']
|
||||
if sys.platform == 'win32':
|
||||
# gn in PATH is bat file in windows environment (except cygwin).
|
||||
args = ['cmd', '/c'] + args
|
||||
|
||||
metadata = {
|
||||
'platform': platform.system(),
|
||||
'cpu_core': multiprocessing.cpu_count(),
|
||||
'build_configs': build_configs,
|
||||
'targets': GetBuildTargetFromCommandLine(cmdline),
|
||||
}
|
||||
gn_args = subprocess.check_output(args)
|
||||
build_configs = ParseGNArgs(gn_args)
|
||||
except subprocess.CalledProcessError as e:
|
||||
logging.error("Failed to call gn %s", e)
|
||||
build_configs = {}
|
||||
|
||||
jflag = GetJflag(cmdline)
|
||||
if jflag is not None:
|
||||
metadata['jobs'] = jflag
|
||||
# Stringify config.
|
||||
for k in build_configs:
|
||||
build_configs[k] = str(build_configs[k])
|
||||
|
||||
return metadata
|
||||
metadata = {
|
||||
'platform': platform.system(),
|
||||
'cpu_core': multiprocessing.cpu_count(),
|
||||
'build_configs': build_configs,
|
||||
'targets': GetBuildTargetFromCommandLine(cmdline),
|
||||
}
|
||||
|
||||
jflag = GetJflag(cmdline)
|
||||
if jflag is not None:
|
||||
metadata['jobs'] = jflag
|
||||
|
||||
return metadata
|
||||
|
||||
|
||||
def GetNinjalog(cmdline):
|
||||
"""GetNinjalog returns the path to ninjalog from cmdline."""
|
||||
# ninjalog is in current working directory by default.
|
||||
ninjalog_dir = '.'
|
||||
"""GetNinjalog returns the path to ninjalog from cmdline."""
|
||||
# ninjalog is in current working directory by default.
|
||||
ninjalog_dir = '.'
|
||||
|
||||
i = 0
|
||||
while i < len(cmdline):
|
||||
cmd = cmdline[i]
|
||||
i += 1
|
||||
if cmd == '-C' and i < len(cmdline):
|
||||
ninjalog_dir = cmdline[i]
|
||||
i += 1
|
||||
continue
|
||||
i = 0
|
||||
while i < len(cmdline):
|
||||
cmd = cmdline[i]
|
||||
i += 1
|
||||
if cmd == '-C' and i < len(cmdline):
|
||||
ninjalog_dir = cmdline[i]
|
||||
i += 1
|
||||
continue
|
||||
|
||||
if cmd.startswith('-C') and len(cmd) > len('-C'):
|
||||
ninjalog_dir = cmd[len('-C'):]
|
||||
if cmd.startswith('-C') and len(cmd) > len('-C'):
|
||||
ninjalog_dir = cmd[len('-C'):]
|
||||
|
||||
return os.path.join(ninjalog_dir, '.ninja_log')
|
||||
return os.path.join(ninjalog_dir, '.ninja_log')
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('--server',
|
||||
default='chromium-build-stats.appspot.com',
|
||||
help='server to upload ninjalog file.')
|
||||
parser.add_argument('--ninjalog', help='ninjalog file to upload.')
|
||||
parser.add_argument('--verbose',
|
||||
action='store_true',
|
||||
help='Enable verbose logging.')
|
||||
parser.add_argument('--cmdline',
|
||||
required=True,
|
||||
nargs=argparse.REMAINDER,
|
||||
help='command line args passed to ninja.')
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('--server',
|
||||
default='chromium-build-stats.appspot.com',
|
||||
help='server to upload ninjalog file.')
|
||||
parser.add_argument('--ninjalog', help='ninjalog file to upload.')
|
||||
parser.add_argument('--verbose',
|
||||
action='store_true',
|
||||
help='Enable verbose logging.')
|
||||
parser.add_argument('--cmdline',
|
||||
required=True,
|
||||
nargs=argparse.REMAINDER,
|
||||
help='command line args passed to ninja.')
|
||||
|
||||
args = parser.parse_args()
|
||||
args = parser.parse_args()
|
||||
|
||||
if args.verbose:
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
else:
|
||||
# Disable logging.
|
||||
logging.disable(logging.CRITICAL)
|
||||
if args.verbose:
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
else:
|
||||
# Disable logging.
|
||||
logging.disable(logging.CRITICAL)
|
||||
|
||||
if not IsGoogler():
|
||||
if not IsGoogler():
|
||||
return 0
|
||||
|
||||
ninjalog = args.ninjalog or GetNinjalog(args.cmdline)
|
||||
if not os.path.isfile(ninjalog):
|
||||
logging.warning("ninjalog is not found in %s", ninjalog)
|
||||
return 1
|
||||
|
||||
# We assume that each ninja invocation interval takes at least 2 seconds.
|
||||
# This is not to have duplicate entry in server when current build is no-op.
|
||||
if os.stat(ninjalog).st_mtime < time.time() - 2:
|
||||
logging.info("ninjalog is not updated recently %s", ninjalog)
|
||||
return 0
|
||||
|
||||
output = io.BytesIO()
|
||||
|
||||
with open(ninjalog) as f:
|
||||
with gzip.GzipFile(fileobj=output, mode='wb') as g:
|
||||
g.write(f.read().encode())
|
||||
g.write(b'# end of ninja log\n')
|
||||
|
||||
metadata = GetMetadata(args.cmdline, ninjalog)
|
||||
logging.info('send metadata: %s', json.dumps(metadata))
|
||||
g.write(json.dumps(metadata).encode())
|
||||
|
||||
resp = request.urlopen(
|
||||
request.Request('https://' + args.server + '/upload_ninja_log/',
|
||||
data=output.getvalue(),
|
||||
headers={'Content-Encoding': 'gzip'}))
|
||||
|
||||
if resp.status != 200:
|
||||
logging.warning("unexpected status code for response: %s", resp.status)
|
||||
return 1
|
||||
|
||||
logging.info('response header: %s', resp.headers)
|
||||
logging.info('response content: %s', resp.read())
|
||||
return 0
|
||||
|
||||
ninjalog = args.ninjalog or GetNinjalog(args.cmdline)
|
||||
if not os.path.isfile(ninjalog):
|
||||
logging.warning("ninjalog is not found in %s", ninjalog)
|
||||
return 1
|
||||
|
||||
# We assume that each ninja invocation interval takes at least 2 seconds.
|
||||
# This is not to have duplicate entry in server when current build is no-op.
|
||||
if os.stat(ninjalog).st_mtime < time.time() - 2:
|
||||
logging.info("ninjalog is not updated recently %s", ninjalog)
|
||||
return 0
|
||||
|
||||
output = io.BytesIO()
|
||||
|
||||
with open(ninjalog) as f:
|
||||
with gzip.GzipFile(fileobj=output, mode='wb') as g:
|
||||
g.write(f.read().encode())
|
||||
g.write(b'# end of ninja log\n')
|
||||
|
||||
metadata = GetMetadata(args.cmdline, ninjalog)
|
||||
logging.info('send metadata: %s', json.dumps(metadata))
|
||||
g.write(json.dumps(metadata).encode())
|
||||
|
||||
resp = request.urlopen(
|
||||
request.Request('https://' + args.server + '/upload_ninja_log/',
|
||||
data=output.getvalue(),
|
||||
headers={'Content-Encoding': 'gzip'}))
|
||||
|
||||
if resp.status != 200:
|
||||
logging.warning("unexpected status code for response: %s", resp.status)
|
||||
return 1
|
||||
|
||||
logging.info('response header: %s', resp.headers)
|
||||
logging.info('response content: %s', resp.read())
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
||||
sys.exit(main())
|
||||
|
||||
Reference in New Issue
Block a user