Merge pull request #465 from jfontan/improvement/embed-git-repository

ajnavarro · web-flow · commit 0082a18f1125 · 2018-09-10T17:21:02.000+02:00
gitbase: embded git.Repository in gitbase.Repository
diff --git a/blobs.go b/blobs.go
@@ -175,7 +175,7 @@ type blobRowIter struct {
 
 func (i *blobRowIter) init() error {
 	var err error
-	i.iter, err = i.repo.Repo.BlobObjects()
+	i.iter, err = i.repo.BlobObjects()
 	return err
 }
 
@@ -193,7 +193,7 @@ func (i *blobRowIter) nextByHash() (sql.Row, error) {
 			return nil, io.EOF
 		}
 
-		blob, err := i.repo.Repo.BlobObject(i.hashes[i.pos])
+		blob, err := i.repo.BlobObject(i.hashes[i.pos])
 		i.pos++
 		if err != nil {
 			if err == plumbing.ErrObjectNotFound || i.skipGitErrors {
@@ -334,7 +334,7 @@ func newBlobsKeyValueIter(
 	repo *Repository,
 	columns []string,
 ) (sql.IndexKeyValueIter, error) {
-	blobs, err := repo.Repo.BlobObjects()
+	blobs, err := repo.BlobObjects()
 	if err != nil {
 		return nil, err
 	}
diff --git a/commit_blobs.go b/commit_blobs.go
@@ -215,7 +215,7 @@ func (i *commitBlobsRowIter) init() error {
 	if len(i.commits) > 0 {
 		i.iter, err = NewCommitsByHashIter(i.repo, i.commits)
 	} else {
-		i.iter, err = i.repo.Repo.CommitObjects()
+		i.iter, err = i.repo.CommitObjects()
 	}
 
 	return err
diff --git a/commit_files.go b/commit_files.go
@@ -184,7 +184,7 @@ func (i *commitFilesRowIter) init() error {
 	if len(i.commitHashes) > 0 {
 		i.commits, err = NewCommitsByHashIter(i.repo, i.commitHashes)
 	} else {
-		i.commits, err = i.repo.Repo.CommitObjects()
+		i.commits, err = i.repo.CommitObjects()
 	}
 
 	return err
@@ -417,7 +417,7 @@ func newCommitFilesKeyValueIter(
 		return nil, err
 	}
 
-	commits, err := repo.Repo.CommitObjects()
+	commits, err := repo.CommitObjects()
 	if err != nil {
 		return nil, err
 	}
diff --git a/commit_files_test.go b/commit_files_test.go
@@ -35,7 +35,7 @@ func TestCommitFilesTableRowIter(t *testing.T) {
 
 		require.NoError(err)
 
-		commits, err := repo.Repo.CommitObjects()
+		commits, err := repo.CommitObjects()
 		require.NoError(err)
 
 		for {
diff --git a/commit_trees.go b/commit_trees.go
@@ -211,7 +211,7 @@ func (i *commitTreesRowIter) init() error {
 	if len(i.commitHashes) > 0 {
 		i.commits, err = NewCommitsByHashIter(i.repo, i.commitHashes)
 	} else {
-		i.commits, err = i.repo.Repo.CommitObjects()
+		i.commits, err = i.repo.CommitObjects()
 	}
 
 	return err
diff --git a/commits.go b/commits.go
@@ -157,7 +157,7 @@ func (i *commitIter) init() error {
 	if len(i.hashes) > 0 {
 		i.iter, err = NewCommitsByHashIter(i.repo, i.hashes)
 	} else {
-		i.iter, err = i.repo.Repo.CommitObjects()
+		i.iter, err = i.repo.CommitObjects()
 	}
 
 	return err
@@ -237,7 +237,7 @@ func NewCommitsByHashIter(
 	var commitIter object.CommitIter
 	var err error
 	if len(hashes) == 0 {
-		commitIter, err = repo.Repo.CommitObjects()
+		commitIter, err = repo.CommitObjects()
 		if err != nil {
 			return nil, err
 		}
@@ -288,7 +288,7 @@ func (i *commitsByHashIter) nextList() (*object.Commit, error) {
 			return nil, io.EOF
 		}
 
-		commit, err := i.repo.Repo.CommitObject(i.hashes[i.pos])
+		commit, err := i.repo.CommitObject(i.hashes[i.pos])
 		i.pos++
 		if err == plumbing.ErrObjectNotFound {
 			continue
@@ -321,7 +321,7 @@ func newCommitsKeyValueIter(
 		return nil, err
 	}
 
-	commits, err := repo.Repo.CommitObjects()
+	commits, err := repo.CommitObjects()
 	if err != nil {
 		return nil, err
 	}
diff --git a/files.go b/files.go
@@ -186,7 +186,7 @@ type filesRowIter struct {
 func (i *filesRowIter) init() error {
 	var err error
 	i.seen = make(map[plumbing.Hash]struct{})
-	i.commits, err = i.repo.Repo.CommitObjects()
+	i.commits, err = i.repo.CommitObjects()
 	return err
 }
 
@@ -403,7 +403,7 @@ func newFilesKeyValueIter(pool *RepositoryPool, repo *Repository, columns []stri
 		return nil, err
 	}
 
-	commits, err := repo.Repo.CommitObjects()
+	commits, err := repo.CommitObjects()
 	if err != nil {
 		return nil, err
 	}
diff --git a/ref_commits.go b/ref_commits.go
@@ -5,7 +5,6 @@ import (
 	"io"
 	"strings"
 
-	git "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
@@ -262,7 +261,7 @@ func (i *refCommitsRowIter) next() (sql.Row, error) {
 	for {
 		var err error
 		if i.refs == nil {
-			i.refs, err = i.repo.Repo.References()
+			i.refs, err = i.repo.References()
 			if err != nil {
 				if i.skipGitErrors {
 					return nil, io.EOF
@@ -271,7 +270,7 @@ func (i *refCommitsRowIter) next() (sql.Row, error) {
 				return nil, err
 			}
 
-			i.head, err = i.repo.Repo.Head()
+			i.head, err = i.repo.Head()
 			if err != nil && err != plumbing.ErrReferenceNotFound {
 				if i.skipGitErrors {
 					continue
@@ -319,7 +318,7 @@ func (i *refCommitsRowIter) next() (sql.Row, error) {
 				return nil, err
 			}
 
-			i.commits = newIndexedCommitIter(i.skipGitErrors, i.repo.Repo, commit)
+			i.commits = newIndexedCommitIter(i.skipGitErrors, i.repo, commit)
 		}
 
 		commit, idx, err := i.commits.Next()
@@ -359,12 +358,16 @@ func (i *refCommitsRowIter) Close() error {
 
 type indexedCommitIter struct {
 	skipGitErrors bool
-	repo          *git.Repository
+	repo          *Repository
 	stack         []*stackFrame
 	seen          map[plumbing.Hash]struct{}
 }
 
-func newIndexedCommitIter(skipGitErrors bool, repo *git.Repository, start *object.Commit) *indexedCommitIter {
+func newIndexedCommitIter(
+	skipGitErrors bool,
+	repo *Repository,
+	start *object.Commit,
+) *indexedCommitIter {
 	return &indexedCommitIter{
 		skipGitErrors: skipGitErrors,
 		repo:          repo,
diff --git a/references.go b/references.go
@@ -216,12 +216,12 @@ func (i *refRowIter) Next() (sql.Row, error) {
 
 func (i *refRowIter) init() error {
 	var err error
-	i.iter, err = i.repo.Repo.References()
+	i.iter, err = i.repo.References()
 	if err != nil {
 		return err
 	}
 
-	i.head, err = i.repo.Repo.Head()
+	i.head, err = i.repo.Head()
 	if err != nil && err != plumbing.ErrReferenceNotFound {
 		return err
 	}
diff --git a/remotes.go b/remotes.go
@@ -80,7 +80,7 @@ func (r *remotesTable) PartitionRows(
 		r.filters,
 		r.handledColumns(),
 		func(selectors) (sql.RowIter, error) {
-			remotes, err := repo.Repo.Remotes()
+			remotes, err := repo.Remotes()
 			if err != nil {
 				return nil, err
 			}
@@ -229,7 +229,7 @@ func newRemotesKeyValueIter(
 	repo *Repository,
 	columns []string,
 ) (sql.IndexKeyValueIter, error) {
-	remotes, err := repo.Repo.Remotes()
+	remotes, err := repo.Remotes()
 	if err != nil {
 		return nil, err
 	}
diff --git a/remotes_test.go b/remotes_test.go
@@ -20,11 +20,9 @@ func TestRemotesTable(t *testing.T) {
 
 	session := ctx.Session.(*Session)
 	pool := session.Pool
-	repository, err := pool.GetPos(0)
+	repo, err := pool.GetPos(0)
 	require.NoError(err)
 
-	repo := repository.Repo
-
 	config := gitconfig.RemoteConfig{
 		Name: "my_remote",
 		URLs: []string{"url1", "url2"},
@@ -52,7 +50,7 @@ func TestRemotesTable(t *testing.T) {
 
 			num := urlstring[len(urlstring)-1:]
 
-			require.Equal(repository.ID, row[0])
+			require.Equal(repo.ID, row[0])
 
 			url := fmt.Sprintf("url%v", num)
 			require.Equal(url, row[2]) // push
diff --git a/repository_pool.go b/repository_pool.go
@@ -23,15 +23,15 @@ var (
 
 // Repository struct holds an initialized repository and its ID
 type Repository struct {
-	ID   string
-	Repo *git.Repository
+	*git.Repository
+	ID string
 }
 
 // NewRepository creates and initializes a new Repository structure
 func NewRepository(id string, repo *git.Repository) *Repository {
 	return &Repository{
-		ID:   id,
-		Repo: repo,
+		Repository: repo,
+		ID:         id,
 	}
 }
 
diff --git a/repository_pool_test.go b/repository_pool_test.go
@@ -21,12 +21,12 @@ func TestRepository(t *testing.T) {
 	repo := NewRepository("identifier", gitRepo)
 
 	require.Equal("identifier", repo.ID)
-	require.Equal(gitRepo, repo.Repo)
+	require.Equal(gitRepo, repo.Repository)
 
 	repo = NewRepository("/other/path", nil)
 
 	require.Equal("/other/path", repo.ID)
-	require.Nil(repo.Repo)
+	require.Nil(repo.Repository)
 }
 
 func TestRepositoryPoolBasic(t *testing.T) {
@@ -58,12 +58,12 @@ func TestRepositoryPoolBasic(t *testing.T) {
 	repo, err = pool.GetPos(1)
 	require.NoError(err)
 	require.Equal("1", repo.ID)
-	require.NotNil(repo.Repo)
+	require.NotNil(repo)
 
 	repo, err = pool.GetRepo("1")
 	require.NoError(err)
 	require.Equal("1", repo.ID)
-	require.NotNil(repo.Repo)
+	require.NotNil(repo)
 
 	err = pool.Add(gitRepo("1", path))
 	require.Error(err)
@@ -87,10 +87,10 @@ func TestRepositoryPoolGit(t *testing.T) {
 
 	repo, err := pool.GetPos(0)
 	require.Equal(path, repo.ID)
-	require.NotNil(repo.Repo)
+	require.NotNil(repo)
 	require.NoError(err)
 
-	iter, err := repo.Repo.CommitObjects()
+	iter, err := repo.CommitObjects()
 	require.NoError(err)
 
 	count := 0
@@ -174,7 +174,7 @@ func TestRepositoryPoolSiva(t *testing.T) {
 		repo, err := pool.GetPos(i)
 		require.NoError(err)
 
-		iter, err := repo.Repo.CommitObjects()
+		iter, err := repo.CommitObjects()
 		require.NoError(err)
 
 		require.NoError(iter.ForEach(func(c *object.Commit) error {
diff --git a/squash_iterator.go b/squash_iterator.go
diff --git a/tree_entries.go b/tree_entries.go

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ func (i *commitBlobsRowIter) init() error {`
`215`	`215`	`if len(i.commits) > 0 {`
`216`	`216`	`i.iter, err = NewCommitsByHashIter(i.repo, i.commits)`
`217`	`217`	`} else {`
`218`		`- i.iter, err = i.repo.Repo.CommitObjects()`
	`218`	`+ i.iter, err = i.repo.CommitObjects()`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func (i *commitFilesRowIter) init() error {`
`184`	`184`	`if len(i.commitHashes) > 0 {`
`185`	`185`	`i.commits, err = NewCommitsByHashIter(i.repo, i.commitHashes)`
`186`	`186`	`} else {`
`187`		`- i.commits, err = i.repo.Repo.CommitObjects()`
	`187`	`+ i.commits, err = i.repo.CommitObjects()`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`return err`
`@@ -417,7 +417,7 @@ func newCommitFilesKeyValueIter(`
`417`	`417`	`return nil, err`
`418`	`418`	`}`
`419`	`419`
`420`		`- commits, err := repo.Repo.CommitObjects()`
	`420`	`+ commits, err := repo.CommitObjects()`
`421`	`421`	`if err != nil {`
`422`	`422`	`return nil, err`
`423`	`423`	`}`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ func (i *commitTreesRowIter) init() error {`
`211`	`211`	`if len(i.commitHashes) > 0 {`
`212`	`212`	`i.commits, err = NewCommitsByHashIter(i.repo, i.commitHashes)`
`213`	`213`	`} else {`
`214`		`- i.commits, err = i.repo.Repo.CommitObjects()`
	`214`	`+ i.commits, err = i.repo.CommitObjects()`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ type filesRowIter struct {`
`186`	`186`	`func (i *filesRowIter) init() error {`
`187`	`187`	`var err error`
`188`	`188`	`i.seen = make(map[plumbing.Hash]struct{})`
`189`		`- i.commits, err = i.repo.Repo.CommitObjects()`
	`189`	`+ i.commits, err = i.repo.CommitObjects()`
`190`	`190`	`return err`
`191`	`191`	`}`
`192`	`192`
`@@ -403,7 +403,7 @@ func newFilesKeyValueIter(pool RepositoryPool, repo Repository, columns []stri`
`403`	`403`	`return nil, err`
`404`	`404`	`}`
`405`	`405`
`406`		`- commits, err := repo.Repo.CommitObjects()`
	`406`	`+ commits, err := repo.CommitObjects()`
`407`	`407`	`if err != nil {`
`408`	`408`	`return nil, err`
`409`	`409`	`}`
Original file line number	Diff line number	Diff line change
`@@ -216,12 +216,12 @@ func (i *refRowIter) Next() (sql.Row, error) {`
`216`	`216`
`217`	`217`	`func (i *refRowIter) init() error {`
`218`	`218`	`var err error`
`219`		`- i.iter, err = i.repo.Repo.References()`
	`219`	`+ i.iter, err = i.repo.References()`
`220`	`220`	`if err != nil {`
`221`	`221`	`return err`
`222`	`222`	`}`
`223`	`223`
`224`		`- i.head, err = i.repo.Repo.Head()`
	`224`	`+ i.head, err = i.repo.Head()`
`225`	`225`	`if err != nil && err != plumbing.ErrReferenceNotFound {`
`226`	`226`	`return err`
`227`	`227`	`}`