mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-23 07:16:21 +00:00
7c871163c8
The status command runs a bunch of jobs in parallel, and each one is responsible for writing to stdout directly. When running many noisy jobs in parallel, output can get intermingled. Pass down a StringIO buffer for writing to so we can return the entire output as a string so the main job can handle displaying it. This fixes interleaved output as well as making the output stable: we always display results in the same project order now. By switching from map to imap, this ends up not really adding any overhead. Bug: https://crbug.com/gerrit/12231 Change-Id: Ic18b07c8074c046ff36e306eb8d392fb34fb6eca Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/297242 Tested-by: Mike Frysinger <vapier@google.com> Reviewed-by: Chris Mcdonald <cjmcdonald@google.com>
183 lines
6.3 KiB
Python
183 lines
6.3 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.
|
|
|
|
import functools
|
|
import glob
|
|
import io
|
|
import multiprocessing
|
|
import os
|
|
|
|
from command import DEFAULT_LOCAL_JOBS, PagedCommand, WORKER_BATCH_SIZE
|
|
|
|
from color import Coloring
|
|
import platform_utils
|
|
|
|
|
|
class Status(PagedCommand):
|
|
common = True
|
|
helpSummary = "Show the working tree status"
|
|
helpUsage = """
|
|
%prog [<project>...]
|
|
"""
|
|
helpDescription = """
|
|
'%prog' compares the working tree to the staging area (aka index),
|
|
and the most recent commit on this branch (HEAD), in each project
|
|
specified. A summary is displayed, one line per file where there
|
|
is a difference between these three states.
|
|
|
|
The -j/--jobs option can be used to run multiple status queries
|
|
in parallel.
|
|
|
|
The -o/--orphans option can be used to show objects that are in
|
|
the working directory, but not associated with a repo project.
|
|
This includes unmanaged top-level files and directories, but also
|
|
includes deeper items. For example, if dir/subdir/proj1 and
|
|
dir/subdir/proj2 are repo projects, dir/subdir/proj3 will be shown
|
|
if it is not known to repo.
|
|
|
|
# Status Display
|
|
|
|
The status display is organized into three columns of information,
|
|
for example if the file 'subcmds/status.py' is modified in the
|
|
project 'repo' on branch 'devwork':
|
|
|
|
project repo/ branch devwork
|
|
-m subcmds/status.py
|
|
|
|
The first column explains how the staging area (index) differs from
|
|
the last commit (HEAD). Its values are always displayed in upper
|
|
case and have the following meanings:
|
|
|
|
-: no difference
|
|
A: added (not in HEAD, in index )
|
|
M: modified ( in HEAD, in index, different content )
|
|
D: deleted ( in HEAD, not in index )
|
|
R: renamed (not in HEAD, in index, path changed )
|
|
C: copied (not in HEAD, in index, copied from another)
|
|
T: mode changed ( in HEAD, in index, same content )
|
|
U: unmerged; conflict resolution required
|
|
|
|
The second column explains how the working directory differs from
|
|
the index. Its values are always displayed in lower case and have
|
|
the following meanings:
|
|
|
|
-: new / unknown (not in index, in work tree )
|
|
m: modified ( in index, in work tree, modified )
|
|
d: deleted ( in index, not in work tree )
|
|
|
|
"""
|
|
PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
|
|
|
|
def _Options(self, p):
|
|
super()._Options(p)
|
|
p.add_option('-o', '--orphans',
|
|
dest='orphans', action='store_true',
|
|
help="include objects in working directory outside of repo projects")
|
|
p.add_option('-q', '--quiet', action='store_true',
|
|
help="only print the name of modified projects")
|
|
|
|
def _StatusHelper(self, quiet, project):
|
|
"""Obtains the status for a specific project.
|
|
|
|
Obtains the status for a project, redirecting the output to
|
|
the specified object.
|
|
|
|
Args:
|
|
quiet: Where to output the status.
|
|
project: Project to get status of.
|
|
|
|
Returns:
|
|
The status of the project.
|
|
"""
|
|
buf = io.StringIO()
|
|
ret = project.PrintWorkTreeStatus(quiet=quiet, output_redir=buf)
|
|
return (ret, buf.getvalue())
|
|
|
|
def _FindOrphans(self, dirs, proj_dirs, proj_dirs_parents, outstring):
|
|
"""find 'dirs' that are present in 'proj_dirs_parents' but not in 'proj_dirs'"""
|
|
status_header = ' --\t'
|
|
for item in dirs:
|
|
if not platform_utils.isdir(item):
|
|
outstring.append(''.join([status_header, item]))
|
|
continue
|
|
if item in proj_dirs:
|
|
continue
|
|
if item in proj_dirs_parents:
|
|
self._FindOrphans(glob.glob('%s/.*' % item) +
|
|
glob.glob('%s/*' % item),
|
|
proj_dirs, proj_dirs_parents, outstring)
|
|
continue
|
|
outstring.append(''.join([status_header, item, '/']))
|
|
|
|
def Execute(self, opt, args):
|
|
all_projects = self.GetProjects(args)
|
|
counter = 0
|
|
|
|
if opt.jobs == 1:
|
|
for project in all_projects:
|
|
state = project.PrintWorkTreeStatus(quiet=opt.quiet)
|
|
if state == 'CLEAN':
|
|
counter += 1
|
|
else:
|
|
with multiprocessing.Pool(opt.jobs) as pool:
|
|
states = pool.imap(functools.partial(self._StatusHelper, opt.quiet),
|
|
all_projects, chunksize=WORKER_BATCH_SIZE)
|
|
for (state, output) in states:
|
|
if output:
|
|
print(output, end='')
|
|
if state == 'CLEAN':
|
|
counter += 1
|
|
if not opt.quiet and len(all_projects) == counter:
|
|
print('nothing to commit (working directory clean)')
|
|
|
|
if opt.orphans:
|
|
proj_dirs = set()
|
|
proj_dirs_parents = set()
|
|
for project in self.GetProjects(None, missing_ok=True):
|
|
proj_dirs.add(project.relpath)
|
|
(head, _tail) = os.path.split(project.relpath)
|
|
while head != "":
|
|
proj_dirs_parents.add(head)
|
|
(head, _tail) = os.path.split(head)
|
|
proj_dirs.add('.repo')
|
|
|
|
class StatusColoring(Coloring):
|
|
def __init__(self, config):
|
|
Coloring.__init__(self, config, 'status')
|
|
self.project = self.printer('header', attr='bold')
|
|
self.untracked = self.printer('untracked', fg='red')
|
|
|
|
orig_path = os.getcwd()
|
|
try:
|
|
os.chdir(self.manifest.topdir)
|
|
|
|
outstring = []
|
|
self._FindOrphans(glob.glob('.*') +
|
|
glob.glob('*'),
|
|
proj_dirs, proj_dirs_parents, outstring)
|
|
|
|
if outstring:
|
|
output = StatusColoring(self.client.globalConfig)
|
|
output.project('Objects not within a project (orphans)')
|
|
output.nl()
|
|
for entry in outstring:
|
|
output.untracked(entry)
|
|
output.nl()
|
|
else:
|
|
print('No orphan files or directories')
|
|
|
|
finally:
|
|
# Restore CWD.
|
|
os.chdir(orig_path)
|