From 5821bbd01db600b84b6c86cbf2ed5bc4cc85f42c Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Mon, 7 Dec 2015 16:04:42 -0800 Subject: [PATCH] Don't update lines on the terminal from a previous operation When we handle a message that isn't tracked in the "line" map (for example, one with no ID), clear the line map. This means we won't update lines that were part of a previous, completed set of operations when doing something like pull -a. It also has the beneficial side effect of avoiding terminal glitching in these types of situations, since messages that don't get tracked in the "line" map cause the count of the number of lines to get out of sync. Signed-off-by: Aaron Lehmann --- jsonmessage/jsonmessage.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/jsonmessage/jsonmessage.go b/jsonmessage/jsonmessage.go index 451c6a9..4f7a6fa 100644 --- a/jsonmessage/jsonmessage.go +++ b/jsonmessage/jsonmessage.go @@ -169,6 +169,12 @@ func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr, if jm.ID != "" && (jm.Progress != nil || jm.ProgressMessage != "") { line, ok := ids[jm.ID] if !ok { + // NOTE: This approach of using len(id) to + // figure out the number of lines of history + // only works as long as we clear the history + // when we output something that's not + // accounted for in the map, such as a line + // with no ID. line = len(ids) ids[jm.ID] = line if isTerminal { @@ -182,6 +188,13 @@ func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr, // [{diff}A = move cursor up diff rows fmt.Fprintf(out, "%c[%dA", 27, diff) } + } else { + // When outputting something that isn't progress + // output, clear the history of previous lines. We + // don't want progress entries from some previous + // operation to be updated (for example, pull -a + // with multiple tags). + ids = make(map[string]int) } err := jm.Display(out, isTerminal) if jm.ID != "" && isTerminal {