Skip to content

Commit caa4dc4

Browse files
mcuadrosmcuadros
committed
update to go-billy.v4 and go-git-fixtures.v3
Signed-off-by: Máximo Cuadros <[email protected]>
1 parent d9518b5 commit caa4dc4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+84
-89
lines changed

‎blame_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package git
22

33
import (
4-
"github.com/src-d/go-git-fixtures"
54
"gopkg.in/src-d/go-git.v4/plumbing"
65

76
. "gopkg.in/check.v1"
7+
"gopkg.in/src-d/go-git-fixtures.v3"
88
)
99

1010
type BlameSuite struct {

‎common_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ package git
33
import (
44
"testing"
55

6-
billy "gopkg.in/src-d/go-billy.v3"
76
"gopkg.in/src-d/go-git.v4/plumbing"
87
"gopkg.in/src-d/go-git.v4/plumbing/format/packfile"
98
"gopkg.in/src-d/go-git.v4/plumbing/transport"
109
"gopkg.in/src-d/go-git.v4/storage/filesystem"
1110
"gopkg.in/src-d/go-git.v4/storage/memory"
1211

13-
"github.com/src-d/go-git-fixtures"
1412
. "gopkg.in/check.v1"
15-
"gopkg.in/src-d/go-billy.v3/memfs"
16-
"gopkg.in/src-d/go-billy.v3/util"
13+
"gopkg.in/src-d/go-billy.v4"
14+
"gopkg.in/src-d/go-billy.v4/memfs"
15+
"gopkg.in/src-d/go-billy.v4/util"
16+
"gopkg.in/src-d/go-git-fixtures.v3"
1717
)
1818

1919
func Test(t *testing.T) { TestingT(t) }

‎example_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"gopkg.in/src-d/go-git.v4/plumbing"
1414
"gopkg.in/src-d/go-git.v4/storage/memory"
1515

16-
"gopkg.in/src-d/go-billy.v3/memfs"
16+
"gopkg.in/src-d/go-billy.v4/memfs"
1717
)
1818

1919
func ExampleClone() {

‎plumbing/format/gitignore/dir.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"strings"
77

8-
"gopkg.in/src-d/go-billy.v3"
8+
"gopkg.in/src-d/go-billy.v4"
99
)
1010

1111
const (

‎plumbing/format/gitignore/dir_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ package gitignore
33
import (
44
"os"
55

6-
"gopkg.in/src-d/go-billy.v3"
7-
"gopkg.in/src-d/go-billy.v3/memfs"
8-
96
. "gopkg.in/check.v1"
7+
"gopkg.in/src-d/go-billy.v4"
8+
"gopkg.in/src-d/go-billy.v4/memfs"
109
)
1110

1211
type MatcherSuite struct {

‎plumbing/format/idxfile/decoder_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"fmt"
77
"testing"
88

9-
"github.com/src-d/go-git-fixtures"
109
. "gopkg.in/src-d/go-git.v4/plumbing/format/idxfile"
1110
"gopkg.in/src-d/go-git.v4/plumbing/format/packfile"
1211
"gopkg.in/src-d/go-git.v4/storage/memory"
1312

1413
. "gopkg.in/check.v1"
14+
"gopkg.in/src-d/go-git-fixtures.v3"
1515
)
1616

1717
func Test(t *testing.T) { TestingT(t) }

‎plumbing/format/idxfile/encoder_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"bytes"
55
"io/ioutil"
66

7-
"github.com/src-d/go-git-fixtures"
87
"gopkg.in/src-d/go-git.v4/plumbing"
98
. "gopkg.in/src-d/go-git.v4/plumbing/format/idxfile"
109

1110
. "gopkg.in/check.v1"
11+
"gopkg.in/src-d/go-git-fixtures.v3"
1212
)
1313

1414
func (s *IdxfileSuite) TestEncode(c *C) {

‎plumbing/format/index/decoder_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"gopkg.in/src-d/go-git.v4/plumbing"
77
"gopkg.in/src-d/go-git.v4/plumbing/filemode"
88

9-
"github.com/src-d/go-git-fixtures"
9+
"gopkg.in/src-d/go-git-fixtures.v3"
1010
. "gopkg.in/check.v1"
1111
)
1212

‎plumbing/format/packfile/decoder_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ package packfile_test
33
import (
44
"io"
55

6-
"gopkg.in/src-d/go-billy.v3/memfs"
7-
8-
"github.com/src-d/go-git-fixtures"
96
"gopkg.in/src-d/go-git.v4/plumbing"
107
"gopkg.in/src-d/go-git.v4/plumbing/format/idxfile"
118
"gopkg.in/src-d/go-git.v4/plumbing/format/packfile"
@@ -14,6 +11,8 @@ import (
1411
"gopkg.in/src-d/go-git.v4/storage/memory"
1512

1613
. "gopkg.in/check.v1"
14+
"gopkg.in/src-d/go-billy.v4/memfs"
15+
"gopkg.in/src-d/go-git-fixtures.v3"
1716
)
1817

1918
type ReaderSuite struct {

‎plumbing/format/packfile/encoder_advanced_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"gopkg.in/src-d/go-git.v4/storage/filesystem"
1111
"gopkg.in/src-d/go-git.v4/storage/memory"
1212

13-
"github.com/src-d/go-git-fixtures"
13+
"gopkg.in/src-d/go-git-fixtures.v3"
1414
. "gopkg.in/check.v1"
1515
)
1616

‎plumbing/format/packfile/encoder_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package packfile
33
import (
44
"bytes"
55

6-
"github.com/src-d/go-git-fixtures"
76
"gopkg.in/src-d/go-git.v4/plumbing"
87
"gopkg.in/src-d/go-git.v4/storage/memory"
98

109
. "gopkg.in/check.v1"
10+
"gopkg.in/src-d/go-git-fixtures.v3"
1111
)
1212

1313
type EncoderSuite struct {

‎plumbing/format/packfile/scanner_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"gopkg.in/src-d/go-git.v4/plumbing"
88

9-
"github.com/src-d/go-git-fixtures"
9+
"gopkg.in/src-d/go-git-fixtures.v3"
1010
. "gopkg.in/check.v1"
1111
)
1212

‎plumbing/object/change_adaptor_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"gopkg.in/src-d/go-git.v4/utils/merkletrie"
1111
"gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
1212

13-
"github.com/src-d/go-git-fixtures"
13+
"gopkg.in/src-d/go-git-fixtures.v3"
1414
. "gopkg.in/check.v1"
1515
)
1616

‎plumbing/object/change_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"gopkg.in/src-d/go-git.v4/storage/filesystem"
1111
"gopkg.in/src-d/go-git.v4/utils/merkletrie"
1212

13-
fixtures "github.com/src-d/go-git-fixtures"
1413
. "gopkg.in/check.v1"
14+
"gopkg.in/src-d/go-git-fixtures.v3"
1515
)
1616

1717
type ChangeSuite struct {

‎plumbing/object/commit_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"strings"
77
"time"
88

9-
"github.com/src-d/go-git-fixtures"
109
"gopkg.in/src-d/go-git.v4/plumbing"
1110

1211
. "gopkg.in/check.v1"
12+
"gopkg.in/src-d/go-git-fixtures.v3"
1313
"gopkg.in/src-d/go-git.v4/storage/filesystem"
1414
)
1515

‎plumbing/object/difftree_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"gopkg.in/src-d/go-git.v4/storage/memory"
1212
"gopkg.in/src-d/go-git.v4/utils/merkletrie"
1313

14-
"github.com/src-d/go-git-fixtures"
14+
"gopkg.in/src-d/go-git-fixtures.v3"
1515
. "gopkg.in/check.v1"
1616
)
1717

‎plumbing/object/file_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"gopkg.in/src-d/go-git.v4/plumbing/storer"
99
"gopkg.in/src-d/go-git.v4/storage/filesystem"
1010

11-
"github.com/src-d/go-git-fixtures"
11+
"gopkg.in/src-d/go-git-fixtures.v3"
1212
. "gopkg.in/check.v1"
1313
)
1414

‎plumbing/object/object_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"gopkg.in/src-d/go-git.v4/plumbing/storer"
1212
"gopkg.in/src-d/go-git.v4/storage/filesystem"
1313

14-
"github.com/src-d/go-git-fixtures"
14+
"gopkg.in/src-d/go-git-fixtures.v3"
1515
. "gopkg.in/check.v1"
1616
)
1717

‎plumbing/object/tag_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"strings"
77
"time"
88

9-
"github.com/src-d/go-git-fixtures"
109
"gopkg.in/src-d/go-git.v4/plumbing"
1110
"gopkg.in/src-d/go-git.v4/storage/filesystem"
1211
"gopkg.in/src-d/go-git.v4/storage/memory"
1312

1413
. "gopkg.in/check.v1"
14+
"gopkg.in/src-d/go-git-fixtures.v3"
1515
)
1616

1717
type TagSuite struct {

‎plumbing/object/tree_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"gopkg.in/src-d/go-git.v4/plumbing/storer"
1010
"gopkg.in/src-d/go-git.v4/storage/filesystem"
1111

12-
fixtures "github.com/src-d/go-git-fixtures"
1312
. "gopkg.in/check.v1"
13+
"gopkg.in/src-d/go-git-fixtures.v3"
1414
)
1515

1616
type TreeSuite struct {

‎plumbing/revlist/revlist_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"gopkg.in/src-d/go-git.v4/plumbing/storer"
99
"gopkg.in/src-d/go-git.v4/storage/filesystem"
1010

11-
"github.com/src-d/go-git-fixtures"
11+
"gopkg.in/src-d/go-git-fixtures.v3"
1212
. "gopkg.in/check.v1"
1313
)
1414

‎plumbing/transport/file/common_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ import (
66
"os/exec"
77
"path/filepath"
88

9-
"github.com/src-d/go-git-fixtures"
10-
119
. "gopkg.in/check.v1"
10+
"gopkg.in/src-d/go-git-fixtures.v3"
1211
)
1312

1413
type CommonSuite struct {

‎plumbing/transport/file/receive_pack_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package file
33
import (
44
"os"
55

6-
"github.com/src-d/go-git-fixtures"
76
"gopkg.in/src-d/go-git.v4/plumbing/transport/test"
87

98
. "gopkg.in/check.v1"
9+
"gopkg.in/src-d/go-git-fixtures.v3"
1010
)
1111

1212
type ReceivePackSuite struct {

‎plumbing/transport/file/server_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ import (
44
"os"
55
"os/exec"
66

7-
"github.com/src-d/go-git-fixtures"
8-
97
. "gopkg.in/check.v1"
8+
"gopkg.in/src-d/go-git-fixtures.v3"
109
)
1110

1211
type ServerSuite struct {

‎plumbing/transport/file/upload_pack_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"os"
55
"path/filepath"
66

7-
"github.com/src-d/go-git-fixtures"
87
"gopkg.in/src-d/go-git.v4/plumbing/transport"
98
"gopkg.in/src-d/go-git.v4/plumbing/transport/test"
109

1110
. "gopkg.in/check.v1"
11+
"gopkg.in/src-d/go-git-fixtures.v3"
1212
)
1313

1414
type UploadPackSuite struct {

‎plumbing/transport/git/common_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ import (
1111
"testing"
1212
"time"
1313

14-
"github.com/src-d/go-git-fixtures"
15-
. "gopkg.in/check.v1"
1614
"gopkg.in/src-d/go-git.v4/plumbing/transport"
15+
16+
. "gopkg.in/check.v1"
17+
"gopkg.in/src-d/go-git-fixtures.v3"
1718
)
1819

1920
func Test(t *testing.T) { TestingT(t) }

‎plumbing/transport/git/receive_pack_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package git
22

33
import (
4-
"github.com/src-d/go-git-fixtures"
54
"gopkg.in/src-d/go-git.v4/plumbing/transport/test"
65

76
. "gopkg.in/check.v1"
7+
"gopkg.in/src-d/go-git-fixtures.v3"
88
)
99

1010
type ReceivePackSuite struct {

‎plumbing/transport/git/upload_pack_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package git
22

33
import (
4-
"github.com/src-d/go-git-fixtures"
54
"gopkg.in/src-d/go-git.v4/plumbing/transport/test"
65

76
. "gopkg.in/check.v1"
7+
"gopkg.in/src-d/go-git-fixtures.v3"
88
)
99

1010
type UploadPackSuite struct {

‎plumbing/transport/http/common_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ import (
1414
"strings"
1515
"testing"
1616

17-
fixtures "github.com/src-d/go-git-fixtures"
18-
1917
"gopkg.in/src-d/go-git.v4/plumbing/transport"
2018

2119
. "gopkg.in/check.v1"
20+
"gopkg.in/src-d/go-git-fixtures.v3"
2221
)
2322

2423
func Test(t *testing.T) { TestingT(t) }

‎plumbing/transport/http/receive_pack_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package http
33
import (
44
"gopkg.in/src-d/go-git.v4/plumbing/transport/test"
55

6-
"github.com/src-d/go-git-fixtures"
6+
"gopkg.in/src-d/go-git-fixtures.v3"
77
. "gopkg.in/check.v1"
88
)
99

‎plumbing/transport/http/upload_pack_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ import (
66
"os"
77
"path/filepath"
88

9-
fixtures "github.com/src-d/go-git-fixtures"
10-
119
"gopkg.in/src-d/go-git.v4/plumbing"
1210
"gopkg.in/src-d/go-git.v4/plumbing/protocol/packp"
1311
"gopkg.in/src-d/go-git.v4/plumbing/transport"
1412
"gopkg.in/src-d/go-git.v4/plumbing/transport/test"
1513

1614
. "gopkg.in/check.v1"
15+
"gopkg.in/src-d/go-git-fixtures.v3"
1716
)
1817

1918
type UploadPackSuite struct {

‎plumbing/transport/server/loader.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"gopkg.in/src-d/go-git.v4/plumbing/transport"
66
"gopkg.in/src-d/go-git.v4/storage/filesystem"
77

8-
"gopkg.in/src-d/go-billy.v3"
9-
"gopkg.in/src-d/go-billy.v3/osfs"
8+
"gopkg.in/src-d/go-billy.v4"
9+
"gopkg.in/src-d/go-billy.v4/osfs"
1010
)
1111

1212
// DefaultLoader is a filesystem loader ignoring host and resolving paths to /.

‎plumbing/transport/server/server_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package server_test
33
import (
44
"testing"
55

6-
"github.com/src-d/go-git-fixtures"
76
"gopkg.in/src-d/go-git.v4/plumbing/transport"
87
"gopkg.in/src-d/go-git.v4/plumbing/transport/client"
98
"gopkg.in/src-d/go-git.v4/plumbing/transport/server"
@@ -12,6 +11,7 @@ import (
1211
"gopkg.in/src-d/go-git.v4/storage/memory"
1312

1413
. "gopkg.in/check.v1"
14+
"gopkg.in/src-d/go-git-fixtures.v3"
1515
)
1616

1717
func Test(t *testing.T) { TestingT(t) }

‎plumbing/transport/ssh/upload_pack_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"gopkg.in/src-d/go-git.v4/plumbing/transport/test"
1616

1717
"github.com/gliderlabs/ssh"
18-
"github.com/src-d/go-git-fixtures"
18+
"gopkg.in/src-d/go-git-fixtures.v3"
1919
stdssh "golang.org/x/crypto/ssh"
2020
. "gopkg.in/check.v1"
2121
)

0 commit comments

Comments
 (0)