Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

*: update to go-billy.v4 and go-git-fixtures.v3 #655

Merged
merged 1 commit into from
Nov 24, 2017
Merged

*: update to go-billy.v4 and go-git-fixtures.v3 #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion blame_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package git

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

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

type BlameSuite struct {
Expand Down
8 changes: 4 additions & 4 deletions common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ package git
import (
"testing"

billy "gopkg.in/src-d/go-billy.v3"
"gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/src-d/go-git.v4/plumbing/format/packfile"
"gopkg.in/src-d/go-git.v4/plumbing/transport"
"gopkg.in/src-d/go-git.v4/storage/filesystem"
"gopkg.in/src-d/go-git.v4/storage/memory"

"github.com/src-d/go-git-fixtures"
. "gopkg.in/check.v1"
"gopkg.in/src-d/go-billy.v3/memfs"
"gopkg.in/src-d/go-billy.v3/util"
"gopkg.in/src-d/go-billy.v4"
"gopkg.in/src-d/go-billy.v4/memfs"
"gopkg.in/src-d/go-billy.v4/util"
"gopkg.in/src-d/go-git-fixtures.v3"
)

func Test(t *testing.T) { TestingT(t) }
Expand Down
2 changes: 1 addition & 1 deletion example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/src-d/go-git.v4/storage/memory"

"gopkg.in/src-d/go-billy.v3/memfs"
"gopkg.in/src-d/go-billy.v4/memfs"
)

func ExampleClone() {
Expand Down
2 changes: 1 addition & 1 deletion plumbing/format/gitignore/dir.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"strings"

"gopkg.in/src-d/go-billy.v3"
"gopkg.in/src-d/go-billy.v4"
)

const (
Expand Down
5 changes: 2 additions & 3 deletions plumbing/format/gitignore/dir_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ package gitignore
import (
"os"

"gopkg.in/src-d/go-billy.v3"
"gopkg.in/src-d/go-billy.v3/memfs"

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-billy.v4"
"gopkg.in/src-d/go-billy.v4/memfs"
)

type MatcherSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion plumbing/format/idxfile/decoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"fmt"
"testing"

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

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

func Test(t *testing.T) { TestingT(t) }
Expand Down
2 changes: 1 addition & 1 deletion plumbing/format/idxfile/encoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"bytes"
"io/ioutil"

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

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

func (s *IdxfileSuite) TestEncode(c *C) {
Expand Down
2 changes: 1 addition & 1 deletion plumbing/format/index/decoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/src-d/go-git.v4/plumbing/filemode"

"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git-fixtures.v3"
. "gopkg.in/check.v1"
)

Expand Down
5 changes: 2 additions & 3 deletions plumbing/format/packfile/decoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ package packfile_test
import (
"io"

"gopkg.in/src-d/go-billy.v3/memfs"

"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/src-d/go-git.v4/plumbing/format/idxfile"
"gopkg.in/src-d/go-git.v4/plumbing/format/packfile"
Expand All @@ -14,6 +11,8 @@ import (
"gopkg.in/src-d/go-git.v4/storage/memory"

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-billy.v4/memfs"
"gopkg.in/src-d/go-git-fixtures.v3"
)

type ReaderSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion plumbing/format/packfile/encoder_advanced_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"gopkg.in/src-d/go-git.v4/storage/filesystem"
"gopkg.in/src-d/go-git.v4/storage/memory"

"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git-fixtures.v3"
. "gopkg.in/check.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion plumbing/format/packfile/encoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package packfile
import (
"bytes"

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

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

type EncoderSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion plumbing/format/packfile/scanner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

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

"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git-fixtures.v3"
. "gopkg.in/check.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion plumbing/object/change_adaptor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"gopkg.in/src-d/go-git.v4/utils/merkletrie"
"gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"

"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git-fixtures.v3"
. "gopkg.in/check.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion plumbing/object/change_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"gopkg.in/src-d/go-git.v4/storage/filesystem"
"gopkg.in/src-d/go-git.v4/utils/merkletrie"

fixtures "github.com/src-d/go-git-fixtures"
. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

type ChangeSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion plumbing/object/commit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"strings"
"time"

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

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
"gopkg.in/src-d/go-git.v4/storage/filesystem"
)

Expand Down
2 changes: 1 addition & 1 deletion plumbing/object/difftree_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"gopkg.in/src-d/go-git.v4/storage/memory"
"gopkg.in/src-d/go-git.v4/utils/merkletrie"

"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git-fixtures.v3"
. "gopkg.in/check.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion plumbing/object/file_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing/storer"
"gopkg.in/src-d/go-git.v4/storage/filesystem"

"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git-fixtures.v3"
. "gopkg.in/check.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion plumbing/object/object_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing/storer"
"gopkg.in/src-d/go-git.v4/storage/filesystem"

"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git-fixtures.v3"
. "gopkg.in/check.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion plumbing/object/tag_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"strings"
"time"

"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/src-d/go-git.v4/storage/filesystem"
"gopkg.in/src-d/go-git.v4/storage/memory"

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

type TagSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion plumbing/object/tree_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing/storer"
"gopkg.in/src-d/go-git.v4/storage/filesystem"

fixtures "github.com/src-d/go-git-fixtures"
. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

type TreeSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion plumbing/revlist/revlist_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing/storer"
"gopkg.in/src-d/go-git.v4/storage/filesystem"

"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git-fixtures.v3"
. "gopkg.in/check.v1"
)

Expand Down
3 changes: 1 addition & 2 deletions plumbing/transport/file/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import (
"os/exec"
"path/filepath"

"github.com/src-d/go-git-fixtures"

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

type CommonSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion plumbing/transport/file/receive_pack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package file
import (
"os"

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

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

type ReceivePackSuite struct {
Expand Down
3 changes: 1 addition & 2 deletions plumbing/transport/file/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ import (
"os"
"os/exec"

"github.com/src-d/go-git-fixtures"

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

type ServerSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion plumbing/transport/file/upload_pack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"os"
"path/filepath"

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

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

type UploadPackSuite struct {
Expand Down
5 changes: 3 additions & 2 deletions plumbing/transport/git/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ import (
"testing"
"time"

"github.com/src-d/go-git-fixtures"
. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git.v4/plumbing/transport"

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

func Test(t *testing.T) { TestingT(t) }
Expand Down
2 changes: 1 addition & 1 deletion plumbing/transport/git/receive_pack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package git

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

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

type ReceivePackSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion plumbing/transport/git/upload_pack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package git

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

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

type UploadPackSuite struct {
Expand Down
3 changes: 1 addition & 2 deletions plumbing/transport/http/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ import (
"strings"
"testing"

fixtures "github.com/src-d/go-git-fixtures"

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

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

func Test(t *testing.T) { TestingT(t) }
Expand Down
2 changes: 1 addition & 1 deletion plumbing/transport/http/receive_pack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package http
import (
"gopkg.in/src-d/go-git.v4/plumbing/transport/test"

"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git-fixtures.v3"
. "gopkg.in/check.v1"
)

Expand Down
3 changes: 1 addition & 2 deletions plumbing/transport/http/upload_pack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ import (
"os"
"path/filepath"

fixtures "github.com/src-d/go-git-fixtures"

"gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/src-d/go-git.v4/plumbing/protocol/packp"
"gopkg.in/src-d/go-git.v4/plumbing/transport"
"gopkg.in/src-d/go-git.v4/plumbing/transport/test"

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

type UploadPackSuite struct {
Expand Down
4 changes: 2 additions & 2 deletions plumbing/transport/server/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing/transport"
"gopkg.in/src-d/go-git.v4/storage/filesystem"

"gopkg.in/src-d/go-billy.v3"
"gopkg.in/src-d/go-billy.v3/osfs"
"gopkg.in/src-d/go-billy.v4"
"gopkg.in/src-d/go-billy.v4/osfs"
)

// DefaultLoader is a filesystem loader ignoring host and resolving paths to /.
Expand Down
2 changes: 1 addition & 1 deletion plumbing/transport/server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package server_test
import (
"testing"

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

. "gopkg.in/check.v1"
"gopkg.in/src-d/go-git-fixtures.v3"
)

func Test(t *testing.T) { TestingT(t) }
Expand Down
2 changes: 1 addition & 1 deletion plumbing/transport/ssh/upload_pack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing/transport/test"

"github.com/gliderlabs/ssh"
"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git-fixtures.v3"
stdssh "golang.org/x/crypto/ssh"
. "gopkg.in/check.v1"
)
Expand Down
Loading