tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Show ETA only if it is smart status"

Browse source 
Revert submission 2853087

Reason for revert: not necessary

Reverted changes: /q/submissionid:2853087

Change-Id: I747948ce5bec656851bf9a50e136bf7e3aae8df6
This commit is contained in:
Jeongik Cha 2023-12-19 05:44:26 +00:00 committed by Gerrit Code Review
parent 0ba68e40bb
commit b6d5ff505d
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ui/terminal/format.go
View file

@ -25,7 +25,6 @@ import (
type formatter struct {
format string
quiet bool
smart bool
start time.Time
}
@ -33,11 +32,10 @@ type formatter struct {
// the terminal in a format similar to Ninja.
// format takes nearly all the same options as NINJA_STATUS.
// %c is currently unsupported.
func newFormatter(format string, quiet bool, smart bool) formatter {
func newFormatter(format string, quiet bool) formatter {
return formatter{
format: format,
quiet: quiet,
smart: smart,
start: time.Now(),
}
}
@ -63,9 +61,8 @@ func remainingTimeString(t time.Time) string {
func (s formatter) progress(counts status.Counts) string {
if s.format == "" {
output := fmt.Sprintf("[%3d%% %d/%d", 100*counts.FinishedActions/counts.TotalActions, counts.FinishedActions, counts.TotalActions)
// Not to break parsing logic in the build bot
// TODO(b/313981966): make buildbot more flexible for output format
if s.smart && !counts.EstimatedTime.IsZero() {
if !counts.EstimatedTime.IsZero() {
output += fmt.Sprintf(" %s remaining", remainingTimeString(counts.EstimatedTime))
}
output += "] "

5
ui/terminal/status.go
View file

@ -27,10 +27,9 @@ import (
// statusFormat takes nearly all the same options as NINJA_STATUS.
// %c is currently unsupported.
func NewStatusOutput(w io.Writer, statusFormat string, forceSimpleOutput, quietBuild, forceKeepANSI bool) status.StatusOutput {
useSmartStatus := !forceSimpleOutput && isSmartTerminal(w)
formatter := newFormatter(statusFormat, quietBuild, useSmartStatus)
formatter := newFormatter(statusFormat, quietBuild)
if useSmartStatus {
if !forceSimpleOutput && isSmartTerminal(w) {
return NewSmartStatusOutput(w, formatter)
} else {
return NewSimpleStatusOutput(w, formatter, forceKeepANSI)