adb: don't spew push/pull progress to dumb terminals.
Bug: http://b/113070277 Test: adb push 100mb /data/local/tmp | cat Test: adb sync | cat Change-Id: I252bdbdbde825bba903f43bd892262786a58c4e4
This commit is contained in:
parent
22c1eefb0d
commit
7e7ab56e8e
|
@ -67,7 +67,11 @@ static void Out(const std::string& s) {
|
|||
|
||||
void LinePrinter::Print(string to_print, LineType type) {
|
||||
if (!smart_terminal_) {
|
||||
Out(to_print + "\n");
|
||||
if (type == LineType::INFO) {
|
||||
info_line_ = to_print + "\n";
|
||||
} else {
|
||||
Out(to_print + "\n");
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -123,6 +127,11 @@ void LinePrinter::Print(string to_print, LineType type) {
|
|||
}
|
||||
|
||||
void LinePrinter::KeepInfoLine() {
|
||||
if (!have_blank_line_) Out("\n");
|
||||
have_blank_line_ = true;
|
||||
if (smart_terminal_) {
|
||||
if (!have_blank_line_) Out("\n");
|
||||
have_blank_line_ = true;
|
||||
} else {
|
||||
Out(info_line_);
|
||||
info_line_.clear();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,6 +42,9 @@ struct LinePrinter {
|
|||
/// Whether the caret is at the beginning of a blank line.
|
||||
bool have_blank_line_;
|
||||
|
||||
/// The last printed info line when printing to a dumb terminal.
|
||||
std::string info_line_;
|
||||
|
||||
#ifdef _WIN32
|
||||
void* console_;
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue