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

trace: restore Progress indicator.

Browse Source 
If we are not tracing to stderr, then we should still have progress
indication.

Change-Id: Ifc9678e1fccbd92251e972fcf25aad6369d60e15
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/351195
Reviewed-by: Sam Saccone <samccone@google.com>
Tested-by: LaMont Jones <lamontjones@google.com>
Reviewed-by: Xin Li <delphij@google.com>
This commit is contained in:
LaMont Jones 2022-11-10 00:11:51 +00:00
parent 5ed8c63942
commit 47020ba249
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
progress.py
View File

@ -15,7 +15,7 @@
import os import os
import sys import sys
from time import time from time import time
from repo_trace import IsTrace from repo_trace import IsTraceToStderr
_NOT_TTY = not os.isatty(2) _NOT_TTY = not os.isatty(2)
@ -80,7 +80,7 @@ class Progress(object):
def update(self, inc=1, msg=''): def update(self, inc=1, msg=''):
self._done += inc self._done += inc
if _NOT_TTY or IsTrace(): if _NOT_TTY or IsTraceToStderr():
return return
if not self._show: if not self._show:
@ -113,7 +113,7 @@ class Progress(object):
sys.stderr.flush() sys.stderr.flush()
def end(self): def end(self):
if _NOT_TTY or IsTrace() or not self._show: if _NOT_TTY or IsTraceToStderr() or not self._show:
return return
duration = duration_str(time() - self._start) duration = duration_str(time() - self._start)

11
repo_trace.py
View File

@ -32,19 +32,14 @@ REPO_TRACE = 'REPO_TRACE'
# Temporarily set tracing to always on unless user expicitly sets to 0. # Temporarily set tracing to always on unless user expicitly sets to 0.
_TRACE = os.environ.get(REPO_TRACE) != '0' _TRACE = os.environ.get(REPO_TRACE) != '0'
_TRACE_TO_STDERR = False _TRACE_TO_STDERR = False
_TRACE_FILE = None _TRACE_FILE = None
_TRACE_FILE_NAME = 'TRACE_FILE' _TRACE_FILE_NAME = 'TRACE_FILE'
_MAX_SIZE = 70 # in mb _MAX_SIZE = 70 # in mb
_NEW_COMMAND_SEP = '+++++++++++++++NEW COMMAND+++++++++++++++++++' _NEW_COMMAND_SEP = '+++++++++++++++NEW COMMAND+++++++++++++++++++'
def IsStraceToStderr(): def IsTraceToStderr():
return _TRACE_TO_STDERR return _TRACE_TO_STDERR
@ -90,7 +85,7 @@ class Trace(ContextDecorator):
if not IsTrace(): if not IsTrace():
return self return self
print_msg = f"PID: {os.getpid()} START: {self._time()} :" + self._trace_msg + '\n' print_msg = f'PID: {os.getpid()} START: {self._time()} :' + self._trace_msg + '\n'
with open(_TRACE_FILE, 'a') as f: with open(_TRACE_FILE, 'a') as f:
print(print_msg, file=f) print(print_msg, file=f)
@ -104,7 +99,7 @@ class Trace(ContextDecorator):
if not IsTrace(): if not IsTrace():
return False return False
print_msg = f"PID: {os.getpid()} END: {self._time()} :" + self._trace_msg + '\n' print_msg = f'PID: {os.getpid()} END: {self._time()} :' + self._trace_msg + '\n'
with open(_TRACE_FILE, 'a') as f: with open(_TRACE_FILE, 'a') as f:
print(print_msg, file=f) print(print_msg, file=f)