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 "Add a newline after "Fetching projects" progress output"

Browse Source
This commit is contained in:
David Pursehouse 2017-06-28 04:24:03 +00:00 committed by Gerrit Code Review
commit 259f16520a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
progress.py
View File

@ -21,7 +21,7 @@ from trace import IsTrace
_NOT_TTY = not os.isatty(2) _NOT_TTY = not os.isatty(2)
class Progress(object): class Progress(object):
def __init__(self, title, total=0, units=''): def __init__(self, title, total=0, units='', print_newline=False):
self._title = title self._title = title
self._total = total self._total = total
self._done = 0 self._done = 0
@ -29,6 +29,7 @@ class Progress(object):
self._start = time() self._start = time()
self._show = False self._show = False
self._units = units self._units = units
self._print_newline = print_newline
def update(self, inc=1): def update(self, inc=1):
self._done += inc self._done += inc
@ -52,11 +53,12 @@ class Progress(object):
if self._lastp != p: if self._lastp != p:
self._lastp = p self._lastp = p
sys.stderr.write('\r%s: %3d%% (%d%s/%d%s) ' % ( sys.stderr.write('\r%s: %3d%% (%d%s/%d%s)%s' % (
self._title, self._title,
p, p,
self._done, self._units, self._done, self._units,
self._total, self._units)) self._total, self._units,
"\n" if self._print_newline else ""))
sys.stderr.flush() sys.stderr.flush()
def end(self): def end(self):

3
subcmds/sync.py
View File

@ -356,7 +356,8 @@ later is required to fix a server side protocol bug.
def _Fetch(self, projects, opt): def _Fetch(self, projects, opt):
fetched = set() fetched = set()
lock = _threading.Lock() lock = _threading.Lock()
pm = Progress('Fetching projects', len(projects)) pm = Progress('Fetching projects', len(projects),
print_newline=not(opt.quiet))
objdir_project_map = dict() objdir_project_map = dict()
for project in projects: for project in projects: