Merge branch 'pks-gitaly-package' into 'master'

Move Gitaly-specific business logic into `internal/gitaly`

See merge request gitlab-org/gitaly!2560

24 files changed, 9 insertions, 9 deletions

diff --git a/internal/archive/match_walker.go b/internal/gitaly/archive/match_walker.go
index 1d3ae5cf8..1d3ae5cf8 100644
--- a/internal/archive/match_walker.go
+++ b/internal/gitaly/archive/match_walker.go
diff --git a/internal/archive/tar_builder.go b/internal/gitaly/archive/tar_builder.go
index 2ae1a0b32..2ae1a0b32 100644
--- a/internal/archive/tar_builder.go
+++ b/internal/gitaly/archive/tar_builder.go
diff --git a/internal/archive/tar_entries.go b/internal/gitaly/archive/tar_entries.go
index f43ee4080..f43ee4080 100644
--- a/internal/archive/tar_entries.go
+++ b/internal/gitaly/archive/tar_entries.go
diff --git a/internal/diff/diff.go b/internal/gitaly/diff/diff.go
index a1d53b0d0..a1d53b0d0 100644
--- a/internal/diff/diff.go
+++ b/internal/gitaly/diff/diff.go
diff --git a/internal/diff/diff_test.go b/internal/gitaly/diff/diff_test.go
index d0a1837e4..d0a1837e4 100644
--- a/internal/diff/diff_test.go
+++ b/internal/gitaly/diff/diff_test.go
diff --git a/internal/diff/numstat.go b/internal/gitaly/diff/numstat.go
index ddb9f9ed8..ddb9f9ed8 100644
--- a/internal/diff/numstat.go
+++ b/internal/gitaly/diff/numstat.go
diff --git a/internal/diff/numstat_test.go b/internal/gitaly/diff/numstat_test.go
index 5f35a234a..5f35a234a 100644
--- a/internal/diff/numstat_test.go
+++ b/internal/gitaly/diff/numstat_test.go
diff --git a/internal/diff/testdata/z-numstat.txt b/internal/gitaly/diff/testdata/z-numstat.txt
index 8ae09ad47..8ae09ad47 100644
--- a/internal/diff/testdata/z-numstat.txt
+++ b/internal/gitaly/diff/testdata/z-numstat.txt
diff --git a/internal/linguist/linguist.go b/internal/gitaly/linguist/linguist.go
index dcd02f473..dcd02f473 100644
--- a/internal/linguist/linguist.go
+++ b/internal/gitaly/linguist/linguist.go
diff --git a/internal/linguist/linguist_test.go b/internal/gitaly/linguist/linguist_test.go
index e428aefd2..e428aefd2 100644
--- a/internal/linguist/linguist_test.go
+++ b/internal/gitaly/linguist/linguist_test.go
diff --git a/internal/linguist/testdata/fake-languages.json b/internal/gitaly/linguist/testdata/fake-languages.json
index 83f7687f8..83f7687f8 100644
--- a/internal/linguist/testdata/fake-languages.json
+++ b/internal/gitaly/linguist/testdata/fake-languages.json
diff --git a/internal/maintenance/daily.go b/internal/gitaly/maintenance/daily.go
index dc45c1906..dc45c1906 100644
--- a/internal/maintenance/daily.go
+++ b/internal/gitaly/maintenance/daily.go
diff --git a/internal/maintenance/daily_test.go b/internal/gitaly/maintenance/daily_test.go
index 7f00b0553..7f00b0553 100644
--- a/internal/maintenance/daily_test.go
+++ b/internal/gitaly/maintenance/daily_test.go
diff --git a/internal/maintenance/optimize.go b/internal/gitaly/maintenance/optimize.go
index 3cbb4692e..3cbb4692e 100644
--- a/internal/maintenance/optimize.go
+++ b/internal/gitaly/maintenance/optimize.go
diff --git a/internal/maintenance/optimize_test.go b/internal/gitaly/maintenance/optimize_test.go
index 281c5efcd..281c5efcd 100644
--- a/internal/maintenance/optimize_test.go
+++ b/internal/gitaly/maintenance/optimize_test.go
diff --git a/internal/gitaly/server/server_factory.go b/internal/gitaly/server/server_factory.go
index c441a7a87..92a2d4516 100644
--- a/internal/gitaly/server/server_factory.go
+++ b/internal/gitaly/server/server_factory.go
@@ -12,8 +12,8 @@ import (
 	"gitlab.com/gitlab-org/gitaly/client"
 	"gitlab.com/gitlab-org/gitaly/internal/gitaly/config"
 	"gitlab.com/gitlab-org/gitaly/internal/gitaly/hook"
+	"gitlab.com/gitlab-org/gitaly/internal/gitaly/maintenance"
 	"gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver"
-	"gitlab.com/gitlab-org/gitaly/internal/maintenance"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc"
 )
diff --git a/internal/gitaly/service/commit/languages.go b/internal/gitaly/service/commit/languages.go
index 6af7937be..ce08b0534 100644
--- a/internal/gitaly/service/commit/languages.go
+++ b/internal/gitaly/service/commit/languages.go
@@ -11,10 +11,10 @@ import (
 
 	"gitlab.com/gitlab-org/gitaly/internal/git"
 	"gitlab.com/gitlab-org/gitaly/internal/git/alternates"
+	"gitlab.com/gitlab-org/gitaly/internal/gitaly/linguist"
 	"gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref"
 	"gitlab.com/gitlab-org/gitaly/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/internal/helper/text"
-	"gitlab.com/gitlab-org/gitaly/internal/linguist"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/internal/gitaly/service/diff/commit.go b/internal/gitaly/service/diff/commit.go
index 654fe4db6..590177d89 100644
--- a/internal/gitaly/service/diff/commit.go
+++ b/internal/gitaly/service/diff/commit.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
 	log "github.com/sirupsen/logrus"
-	"gitlab.com/gitlab-org/gitaly/internal/diff"
 	"gitlab.com/gitlab-org/gitaly/internal/git"
+	"gitlab.com/gitlab-org/gitaly/internal/gitaly/diff"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/internal/gitaly/service/diff/commit_test.go b/internal/gitaly/service/diff/commit_test.go
index a4e760faf..1c814cea7 100644
--- a/internal/gitaly/service/diff/commit_test.go
+++ b/internal/gitaly/service/diff/commit_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/internal/diff"
+	"gitlab.com/gitlab-org/gitaly/internal/gitaly/diff"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc/codes"
diff --git a/internal/gitaly/service/diff/numstat.go b/internal/gitaly/service/diff/numstat.go
index 06cccd0db..5a7d66d5f 100644
--- a/internal/gitaly/service/diff/numstat.go
+++ b/internal/gitaly/service/diff/numstat.go
@@ -3,8 +3,8 @@ package diff
 import (
 	"io"
 
-	"gitlab.com/gitlab-org/gitaly/internal/diff"
 	"gitlab.com/gitlab-org/gitaly/internal/git"
+	"gitlab.com/gitlab-org/gitaly/internal/gitaly/diff"
 	"gitlab.com/gitlab-org/gitaly/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc/codes"
diff --git a/internal/gitaly/service/diff/numstat_test.go b/internal/gitaly/service/diff/numstat_test.go
index 160794c21..13f843210 100644
--- a/internal/gitaly/service/diff/numstat_test.go
+++ b/internal/gitaly/service/diff/numstat_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/internal/diff"
+	"gitlab.com/gitlab-org/gitaly/internal/gitaly/diff"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc/codes"
diff --git a/internal/gitaly/service/repository/create_from_snapshot_test.go b/internal/gitaly/service/repository/create_from_snapshot_test.go
index f91f04638..0cfb79f54 100644
--- a/internal/gitaly/service/repository/create_from_snapshot_test.go
+++ b/internal/gitaly/service/repository/create_from_snapshot_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/internal/archive"
+	"gitlab.com/gitlab-org/gitaly/internal/gitaly/archive"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"google.golang.org/grpc/codes"
diff --git a/internal/gitaly/service/repository/snapshot.go b/internal/gitaly/service/repository/snapshot.go
index 2a10f6b73..55e77be85 100644
--- a/internal/gitaly/service/repository/snapshot.go
+++ b/internal/gitaly/service/repository/snapshot.go
@@ -8,8 +8,8 @@ import (
 	"regexp"
 
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
-	"gitlab.com/gitlab-org/gitaly/internal/archive"
 	"gitlab.com/gitlab-org/gitaly/internal/git"
+	"gitlab.com/gitlab-org/gitaly/internal/gitaly/archive"
 	"gitlab.com/gitlab-org/gitaly/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitaly/streamio"
diff --git a/internal/gitaly/service/repository/snapshot_test.go b/internal/gitaly/service/repository/snapshot_test.go
index 4802100fc..b7374568e 100644
--- a/internal/gitaly/service/repository/snapshot_test.go
+++ b/internal/gitaly/service/repository/snapshot_test.go
@@ -15,10 +15,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/internal/archive"
 	"gitlab.com/gitlab-org/gitaly/internal/command"
 	"gitlab.com/gitlab-org/gitaly/internal/git"
 	"gitlab.com/gitlab-org/gitaly/internal/git/catfile"
+	"gitlab.com/gitlab-org/gitaly/internal/gitaly/archive"
 	"gitlab.com/gitlab-org/gitaly/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"