android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "status: lose dependence on StringIO"

Browse Source
This commit is contained in:
Conley Owens 2015-04-08 17:58:33 +00:00 committed by Gerrit Code Review
commit 44859d0267
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
subcmds/status.py
View File

@ -22,15 +22,8 @@ except ImportError:
import glob import glob
from pyversion import is_python3
if is_python3():
import io
else:
import StringIO as io
import itertools import itertools
import os import os
import sys
from color import Coloring from color import Coloring
@ -97,7 +90,7 @@ the following meanings:
dest='orphans', action='store_true', dest='orphans', action='store_true',
help="include objects in working directory outside of repo projects") help="include objects in working directory outside of repo projects")
def _StatusHelper(self, project, clean_counter, sem, output): def _StatusHelper(self, project, clean_counter, sem):
"""Obtains the status for a specific project. """Obtains the status for a specific project.
Obtains the status for a project, redirecting the output to Obtains the status for a project, redirecting the output to
@ -111,7 +104,7 @@ the following meanings:
output: Where to output the status. output: Where to output the status.
""" """
try: try:
state = project.PrintWorkTreeStatus(output) state = project.PrintWorkTreeStatus()
if state == 'CLEAN': if state == 'CLEAN':
next(clean_counter) next(clean_counter)
finally: finally:
@ -122,16 +115,16 @@ the following meanings:
status_header = ' --\t' status_header = ' --\t'
for item in dirs: for item in dirs:
if not os.path.isdir(item): if not os.path.isdir(item):
outstring.write(''.join([status_header, item])) outstring.append(''.join([status_header, item]))
continue continue
if item in proj_dirs: if item in proj_dirs:
continue continue
if item in proj_dirs_parents: if item in proj_dirs_parents:
self._FindOrphans(glob.glob('%s/.*' % item) + \ self._FindOrphans(glob.glob('%s/.*' % item) +
glob.glob('%s/*' % item), \ glob.glob('%s/*' % item),
proj_dirs, proj_dirs_parents, outstring) proj_dirs, proj_dirs_parents, outstring)
continue continue
outstring.write(''.join([status_header, item, '/'])) outstring.append(''.join([status_header, item, '/']))
def Execute(self, opt, args): def Execute(self, opt, args):
all_projects = self.GetProjects(args) all_projects = self.GetProjects(args)
@ -144,26 +137,17 @@ the following meanings:
next(counter) next(counter)
else: else:
sem = _threading.Semaphore(opt.jobs) sem = _threading.Semaphore(opt.jobs)
threads_and_output = [] threads = []
for project in all_projects: for project in all_projects:
sem.acquire() sem.acquire()
class BufList(io.StringIO):
def dump(self, ostream):
for entry in self.buflist:
ostream.write(entry)
output = BufList()
t = _threading.Thread(target=self._StatusHelper, t = _threading.Thread(target=self._StatusHelper,
args=(project, counter, sem, output)) args=(project, counter, sem))
threads_and_output.append((t, output)) threads.append(t)
t.daemon = True t.daemon = True
t.start() t.start()
for (t, output) in threads_and_output: for t in threads:
t.join() t.join()
output.dump(sys.stdout)
output.close()
if len(all_projects) == next(counter): if len(all_projects) == next(counter):
print('nothing to commit (working directory clean)') print('nothing to commit (working directory clean)')
@ -188,23 +172,21 @@ the following meanings:
try: try:
os.chdir(self.manifest.topdir) os.chdir(self.manifest.topdir)
outstring = io.StringIO() outstring = []
self._FindOrphans(glob.glob('.*') + \ self._FindOrphans(glob.glob('.*') +
glob.glob('*'), \ glob.glob('*'),
proj_dirs, proj_dirs_parents, outstring) proj_dirs, proj_dirs_parents, outstring)
if outstring.buflist: if outstring:
output = StatusColoring(self.manifest.globalConfig) output = StatusColoring(self.manifest.globalConfig)
output.project('Objects not within a project (orphans)') output.project('Objects not within a project (orphans)')
output.nl() output.nl()
for entry in outstring.buflist: for entry in outstring:
output.untracked(entry) output.untracked(entry)
output.nl() output.nl()
else: else:
print('No orphan files or directories') print('No orphan files or directories')
outstring.close()
finally: finally:
# Restore CWD. # Restore CWD.
os.chdir(orig_path) os.chdir(orig_path)