Merge branch 'master' into doc-724

Author: ajnavarro

.travis.yml

@@ -11,6 +11,8 @@ addons:
     packages:
     - gcc-6
     - g++-6
+    - libonig-dev
+
 
 before_install:
   - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90
@@ -36,8 +38,7 @@ jobs:
       services: [docker]
 
       before_deploy:
-        - make packages
-        - echo "${TRAVIS_TAG}" > version.txt
+        - make static-package
         - make docker-push-latest-release
 
       deploy:
@@ -61,6 +62,7 @@ jobs:
 
       script:
         - brew update
+        - brew install oniguruma
         - make packages || echo "" # will fail because of docker being missing
         - if [ ! -f "build/gitbase_darwin_amd64/gitbase" ]; then echo "gitbase binary not generated" && exit 1; fi
         - cd build

Dockerfile

@@ -6,11 +6,14 @@ FROM golang:1.11-alpine as builder
 ENV GITBASE_REPO=github.com/src-d/gitbase
 ENV GITBASE_PATH=$GOPATH/src/$GITBASE_REPO
 
-RUN apk add --no-cache git
+RUN apk add --update --no-cache libxml2-dev git make bash gcc g++ curl oniguruma-dev oniguruma
 
 COPY . $GITBASE_PATH
 WORKDIR $GITBASE_PATH
-RUN go build -ldflags="-X main.version=$(cat version.txt || echo "undefined") -X main.build=$(date +"%m-%d-%Y_%H_%M_%S") -X main.commit=$(git rev-parse --short HEAD) -s -w" -o /bin/gitbase ./cmd/gitbase
+
+ENV GO_BUILD_ARGS="-o /bin/gitbase"
+ENV GO_BUILD_PATH="./cmd/gitbase"
+RUN make static-build
 
 #=================================
 # Stage 2: Start Gitbase Server

Gopkg.lock

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-mysql-server.v0"
-  revision = "v0.5.1"
+  revision = "b32d2fdea095e2743d13f3ab4da5ae83aef55bc7"
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"
@@ -50,7 +50,7 @@
 
 [[constraint]]
   name = "gopkg.in/src-d/enry.v1"
-  version = "1.7.1"
+  version = "1.7.2"
 
 [[constraint]]
   name = "gopkg.in/bblfsh/client-go.v3"

Gopkg.toml

@@ -7,7 +7,7 @@ pipeline {
       nodeSelector 'srcd.host/type=jenkins-worker'
       containerTemplate {
         name 'regression-gitbase'
-        image 'srcd/regression-gitbase:v0.2.0'
+        image 'srcd/regression-gitbase:v0.2.1'
         ttyEnabled true
         command 'cat'
       }

Jenkinsfile

@@ -30,11 +30,12 @@ static-package:
 	docker rm gitbase-temp
 
 # target used in the Dockerfile to build the static binary
-static-build: VERSION = $(shell git describe --exact-match --tags 2>/dev/null || dev-$(git rev-parse --short HEAD)$(test -n "`git status --porcelain`" && echo "-dirty" || true))
-static-build: LD_FLAGS += -linkmode external -extldflags '-static -lz'
+static-build: VERSION ?= $(shell git describe --exact-match --tags 2>/dev/null || "dev-$(git rev-parse --short HEAD)$(test -n "`git status --porcelain`" && echo "-dirty" || true)")
+static-build: LD_FLAGS += -linkmode external -extldflags '-static -lz' -s -w
 static-build: GO_BUILD_ARGS += -tags oniguruma
+static-build: GO_BUILD_PATH ?= github.com/src-d/gitbase/...
 static-build:
-	go install -v $(GO_BUILD_ARGS) github.com/src-d/gitbase/...
+	go build -ldflags="$(LD_FLAGS)" -v $(GO_BUILD_ARGS) $(GO_BUILD_PATH)
 
 ci-e2e: packages
 	go test ./e2e -gitbase-version="$(TRAVIS_TAG)" \

Makefile

@@ -309,6 +309,9 @@ func (c *Server) addMatch(match string) error {
 	initDepth := strings.Count(root, string(os.PathSeparator))
 	return filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
+			if os.IsPermission(err) {
+				return filepath.SkipDir
+			}
 			return err
 		}
 

_testdata/not-permission/.gitkeep

@@ -1,6 +1,7 @@
 package command
 
 import (
+	"os"
 	"testing"
 
 	"github.com/src-d/gitbase"
@@ -10,12 +11,22 @@ import (
 func TestAddMatch(t *testing.T) {
 	require := require.New(t)
 
+	notPermissionDir := "../../../_testdata/not-permission/"
+	fi, err := os.Stat(notPermissionDir)
+	require.NoError(err)
+
+	require.NoError(os.Chmod(notPermissionDir, 0))
+	defer func() {
+		require.NoError(os.Chmod(notPermissionDir, fi.Mode()))
+	}()
+
 	expected := []struct {
 		path string
 		err  func(error, ...interface{})
 	}{
 		{"../../../_testdata/repositories/", require.NoError},
 		{"../../../_testdata/repositories-link/", require.NoError},
+		{notPermissionDir, require.NoError},
 		{"../../../_testdata/repositories-not-exist/", require.Error},
 	}
 	c := &Server{pool: gitbase.NewRepositoryPool(0)}

cmd/gitbase/command/server.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"io"
 
-	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"
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
@@ -103,6 +102,7 @@ func (t *commitBlobsTable) PartitionRows(
 			return &commitBlobsRowIter{
 				repo:          repo,
 				commits:       stringsToHashes(commits),
+				iter:          nil,
 				index:         indexValues,
 				skipGitErrors: shouldSkipErrors(ctx),
 			}, nil
@@ -216,16 +216,18 @@ func (i *commitBlobsRowIter) Next() (sql.Row, error) {
 }
 
 func (i *commitBlobsRowIter) init() error {
-	var err error
 	if len(i.commits) > 0 {
-		i.iter, err = NewCommitsByHashIter(i.repo, i.commits)
+		i.iter = newCommitsByHashIter(i.repo, i.commits)
 	} else {
-		i.iter, err = i.repo.Log(&git.LogOptions{
-			All: true,
-		})
+		iter, err := newCommitIter(i.repo, i.skipGitErrors)
+		if err != nil {
+			return err
+		}
+
+		i.iter = iter
 	}
 
-	return err
+	return nil
 }
 
 var commitBlobsCommitIdx = CommitBlobsSchema.IndexOf("commit_hash", CommitBlobsTableName)