Merge pull request #2180 from tonistiigi/vt100-unfork

vendor: update vt100 to fork and remove replace rule
moby · Jun 16, 2021 · 2ccc0e2 · 2ccc0e2
2 parents 9f254e1 + b97d0f7
commit 2ccc0e2
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 62 deletions.
diff --git a/go.mod b/go.mod
@@ -35,7 +35,6 @@ require (
 	github.com/hashicorp/golang-lru v0.5.3
 	github.com/hashicorp/uuid v0.0.0-20160311170451-ebb0a03e909c // indirect
 	github.com/ishidawataru/sctp v0.0.0-20210226210310-f2269e66cdee // indirect
-	github.com/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea
 	github.com/mitchellh/hashstructure v1.0.0
 	github.com/moby/locker v1.0.1
 	github.com/moby/sys/mount v0.2.0 // indirect
@@ -55,6 +54,7 @@ require (
 	github.com/stretchr/testify v1.7.0
 	github.com/tonistiigi/fsutil v0.0.0-20210609172227-d72af97c0eaf
 	github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea
+	github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f
 	github.com/uber/jaeger-client-go v2.25.0+incompatible
 	github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
 	github.com/urfave/cli v1.22.2
@@ -75,7 +75,6 @@ replace (
 	// protobuf: corresponds to containerd
 	github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
 	github.com/hashicorp/go-immutable-radix => github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe
-	github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
 	// genproto: corresponds to containerd
 	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
 	// grpc: corresponds to protobuf

diff --git a/go.sum b/go.sum
@@ -634,8 +634,8 @@ github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe h1:p
 github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe/go.mod h1:/+MCh11CJf2oz0BXmlmqyopK/ad1rKkcOXPoYuPCJYU=
 github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea h1:SXhTLE6pb6eld/v/cCndK0AMpt1wiVFb/YYmqB3/QG0=
 github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea/go.mod h1:WPnis/6cRcDZSUvVmezrxJPkiO87ThFYsoUiMwWNDJk=
-github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305 h1:y/1cL5AL2oRcfzz8CAHHhR6kDDfIOT0WEyH5k40sccM=
-github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305/go.mod h1:gXOLibKqQTRAVuVZ9gX7G9Ykky8ll8yb4slxsEMoY0c=
+github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f h1:DLpt6B5oaaS8jyXHa9VA4rrZloBVPVXeCtrOsrFauxc=
+github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f/go.mod h1:ulncasL3N9uLrVann0m+CDlJKWsIAP34MPcOJF6VRvc=
 github.com/uber/jaeger-client-go v2.25.0+incompatible h1:IxcNZ7WRY1Y3G4poYlx24szfsn/3LvK9QHCq9oQw8+U=
 github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw=

diff --git a/util/progress/progressui/display.go b/util/progress/progressui/display.go
@@ -12,11 +12,11 @@ import (
 	"time"
 
 	"github.com/containerd/console"
-	"github.com/jaguilar/vt100"
 	"github.com/moby/buildkit/client"
 	"github.com/morikuni/aec"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/tonistiigi/units"
+	"github.com/tonistiigi/vt100"
 	"golang.org/x/time/rate"
 )
 

diff --git a/vendor/github.com/jaguilar/vt100/README.md b/vendor/github.com/jaguilar/vt100/README.md
diff --git a/vendor/github.com/jaguilar/vt100/.travis.yml → ...r/github.com/tonistiigi/vt100/.travis.yml b/vendor/github.com/jaguilar/vt100/.travis.yml → ...r/github.com/tonistiigi/vt100/.travis.yml
diff --git a/vendor/github.com/jaguilar/vt100/LICENSE → vendor/github.com/tonistiigi/vt100/LICENSE b/vendor/github.com/jaguilar/vt100/LICENSE → vendor/github.com/tonistiigi/vt100/LICENSE
diff --git a/vendor/github.com/tonistiigi/vt100/README.md b/vendor/github.com/tonistiigi/vt100/README.md
diff --git a/vendor/github.com/jaguilar/vt100/command.go → ...or/github.com/tonistiigi/vt100/command.go b/vendor/github.com/jaguilar/vt100/command.go → ...or/github.com/tonistiigi/vt100/command.go
diff --git a/vendor/github.com/jaguilar/vt100/go.mod → vendor/github.com/tonistiigi/vt100/go.mod b/vendor/github.com/jaguilar/vt100/go.mod → vendor/github.com/tonistiigi/vt100/go.mod
diff --git a/vendor/github.com/jaguilar/vt100/go.sum → vendor/github.com/tonistiigi/vt100/go.sum b/vendor/github.com/jaguilar/vt100/go.sum → vendor/github.com/tonistiigi/vt100/go.sum
diff --git a/vendor/github.com/jaguilar/vt100/scanner.go → ...or/github.com/tonistiigi/vt100/scanner.go b/vendor/github.com/jaguilar/vt100/scanner.go → ...or/github.com/tonistiigi/vt100/scanner.go
diff --git a/vendor/github.com/jaguilar/vt100/vt100.go → vendor/github.com/tonistiigi/vt100/vt100.go b/vendor/github.com/jaguilar/vt100/vt100.go → vendor/github.com/tonistiigi/vt100/vt100.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -283,8 +283,6 @@ github.com/hashicorp/go-multierror
 github.com/hashicorp/golang-lru/simplelru
 # github.com/ishidawataru/sctp v0.0.0-20210226210310-f2269e66cdee
 github.com/ishidawataru/sctp
-# github.com/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
-github.com/jaguilar/vt100
 # github.com/klauspost/compress v1.12.3
 github.com/klauspost/compress/fse
 github.com/klauspost/compress/huff0
@@ -363,6 +361,8 @@ github.com/tonistiigi/fsutil/prefix
 github.com/tonistiigi/fsutil/types
 # github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea
 github.com/tonistiigi/units
+# github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f
+github.com/tonistiigi/vt100
 # github.com/uber/jaeger-client-go v2.25.0+incompatible
 github.com/uber/jaeger-client-go
 github.com/uber/jaeger-client-go/internal/baggage