From 36f1ca9f409a7e3847833990a2968ce0b8f57abc Mon Sep 17 00:00:00 2001 From: Stefan Haubold Date: Wed, 29 Apr 2026 17:08:25 +0200 Subject: [PATCH 1/3] move package to root level Entire-Checkpoint: b9d4c8b588ea --- README.md | 8 ++++---- pkg/gitsync/client.go => client.go | 2 +- pkg/gitsync/client_test.go => client_test.go | 0 cmd/git-sync-bench/main.go | 4 ++-- cmd/git-sync-bench/main_test.go | 2 +- cmd/git-sync/main.go | 4 ++-- cmd/git-sync/main_test.go | 2 +- pkg/gitsync/doc.go => doc.go | 0 docs/architecture.md | 12 ++++++------ docs/embedding.md | 16 ++++++++-------- pkg/gitsync/example_test.go => example_test.go | 2 +- .../internalbridge => internalbridge}/config.go | 0 .../internalbridge => internalbridge}/model.go | 0 .../model_test.go | 0 pkg/gitsync/types.go => types.go | 2 +- {pkg/gitsync/unstable => unstable}/client.go | 4 ++-- .../gitsync/unstable => unstable}/client_test.go | 2 +- {pkg/gitsync/unstable => unstable}/doc.go | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) rename pkg/gitsync/client.go => client.go (99%) rename pkg/gitsync/client_test.go => client_test.go (100%) rename pkg/gitsync/doc.go => doc.go (100%) rename pkg/gitsync/example_test.go => example_test.go (94%) rename {pkg/gitsync/internalbridge => internalbridge}/config.go (100%) rename {pkg/gitsync/internalbridge => internalbridge}/model.go (100%) rename {pkg/gitsync/internalbridge => internalbridge}/model_test.go (100%) rename pkg/gitsync/types.go => types.go (98%) rename {pkg/gitsync/unstable => unstable}/client.go (98%) rename {pkg/gitsync/unstable => unstable}/client_test.go (98%) rename {pkg/gitsync/unstable => unstable}/doc.go (87%) diff --git a/README.md b/README.md index 514dd177..dca49cd7 100644 --- a/README.md +++ b/README.md @@ -65,17 +65,17 @@ The command surface is: `git-sync` now has a two-tier Go API: -- `pkg/gitsync` +- `gitsync` - stable embedding surface for queue workers and other external callers - typed `Probe`, `Plan`, `Sync`, and `Replicate` requests/results - injected auth and HTTP client support -- `pkg/gitsync/unstable` +- `unstable` - explicitly non-stable surface for first-party tooling and advanced controls - includes `Bootstrap`, `Fetch`, batching and measurement knobs, and CLI-oriented execution options -If you are embedding `git-sync` outside this repo, prefer `pkg/gitsync`. The CLI and benchmark command use `pkg/gitsync/unstable` because they still need direct access to advanced engine controls that are intentionally not part of the stable API. +If you are embedding `git-sync` outside this repo, prefer `gitsync`. The CLI and benchmark command use `unstable` because they still need direct access to advanced engine controls that are intentionally not part of the stable API. -The stable `pkg/gitsync` results are shaped for workers: +The stable `gitsync` results are shaped for workers: - `Refs` - per-ref outcomes diff --git a/pkg/gitsync/client.go b/client.go similarity index 99% rename from pkg/gitsync/client.go rename to client.go index d919cf39..579dc4ec 100644 --- a/pkg/gitsync/client.go +++ b/client.go @@ -7,7 +7,7 @@ import ( "net/http" "entire.io/entire/git-sync/internal/validation" - "entire.io/entire/git-sync/pkg/gitsync/internalbridge" + "entire.io/entire/git-sync/internalbridge" ) // Options configures a Client. It is intentionally small in the first public cut. diff --git a/pkg/gitsync/client_test.go b/client_test.go similarity index 100% rename from pkg/gitsync/client_test.go rename to client_test.go diff --git a/cmd/git-sync-bench/main.go b/cmd/git-sync-bench/main.go index c6931919..6ba80a84 100644 --- a/cmd/git-sync-bench/main.go +++ b/cmd/git-sync-bench/main.go @@ -16,8 +16,8 @@ import ( git "github.com/go-git/go-git/v6" "entire.io/entire/git-sync/internal/validation" - "entire.io/entire/git-sync/pkg/gitsync" - "entire.io/entire/git-sync/pkg/gitsync/unstable" + "entire.io/entire/git-sync" + "entire.io/entire/git-sync/unstable" ) type scenario string diff --git a/cmd/git-sync-bench/main_test.go b/cmd/git-sync-bench/main_test.go index 77e2dc32..28351cb0 100644 --- a/cmd/git-sync-bench/main_test.go +++ b/cmd/git-sync-bench/main_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "entire.io/entire/git-sync/pkg/gitsync/unstable" + "entire.io/entire/git-sync/unstable" ) func TestSummarizeRuns(t *testing.T) { diff --git a/cmd/git-sync/main.go b/cmd/git-sync/main.go index dac27cbe..e2a7f759 100644 --- a/cmd/git-sync/main.go +++ b/cmd/git-sync/main.go @@ -10,8 +10,8 @@ import ( "strings" "entire.io/entire/git-sync/internal/validation" - "entire.io/entire/git-sync/pkg/gitsync" - "entire.io/entire/git-sync/pkg/gitsync/unstable" + "entire.io/entire/git-sync" + "entire.io/entire/git-sync/unstable" "github.com/go-git/go-git/v6/plumbing" ) diff --git a/cmd/git-sync/main_test.go b/cmd/git-sync/main_test.go index c4e817fc..5b5fa5e0 100644 --- a/cmd/git-sync/main_test.go +++ b/cmd/git-sync/main_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "entire.io/entire/git-sync/pkg/gitsync/unstable" + "entire.io/entire/git-sync/unstable" billy "github.com/go-git/go-billy/v6" "github.com/go-git/go-billy/v6/memfs" git "github.com/go-git/go-git/v6" diff --git a/pkg/gitsync/doc.go b/doc.go similarity index 100% rename from pkg/gitsync/doc.go rename to doc.go diff --git a/docs/architecture.md b/docs/architecture.md index 125236ba..b00981bc 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -90,11 +90,11 @@ The current transfer modes are: ## Package Model -- `pkg/gitsync` +- `gitsync` - stable public embedding API - typed `Probe`, `Plan`, `Sync`, and `Replicate` requests/results - auth and HTTP client injection for worker-style callers -- `pkg/gitsync/unstable` +- `unstable` - explicitly non-stable first-party tooling surface - advanced controls, `Bootstrap`, `Fetch`, and CLI-oriented knobs - `internal/gitproto` @@ -120,9 +120,9 @@ The current transfer modes are: The project now separates embedding concerns from first-party tooling concerns: -- `pkg/gitsync` is the stable library boundary. +- `gitsync` is the stable library boundary. Callers express orchestration intent through typed probe, plan, sync, and replicate requests. Auth and transport are injected. Execution strategy remains internal. -- `pkg/gitsync/unstable` is the escape hatch for advanced controls. +- `unstable` is the escape hatch for advanced controls. It exists so the CLI and benchmark tool can use batching limits, memory measurement, verbose progress, bootstrap, and fetch without widening the stable API prematurely. The stable result contract is also intentionally worker-oriented: @@ -136,8 +136,8 @@ The stable result contract is also intentionally worker-oriented: That split is intentional: -- external embedders should depend on `pkg/gitsync` -- first-party tools inside this repo may use `pkg/gitsync/unstable` +- external embedders should depend on `gitsync` +- first-party tools inside this repo may use `unstable` - strategy selection, batching heuristics, and materialized fallback controls are not yet treated as stable product contracts ## Protocol Boundaries diff --git a/docs/embedding.md b/docs/embedding.md index 9cdc9ebb..26aa7e8c 100644 --- a/docs/embedding.md +++ b/docs/embedding.md @@ -4,12 +4,12 @@ For most embedders, there are two important rules: -- use `pkg/gitsync` -- avoid depending on `pkg/gitsync/unstable` unless you are acting like first-party tooling +- use `gitsync` +- avoid depending on `unstable` unless you are acting like first-party tooling ## Stable vs Unstable -Use `pkg/gitsync` when you want a durable worker-facing API: +Use `gitsync` when you want a durable worker-facing API: - `Probe` - `Plan` @@ -18,7 +18,7 @@ Use `pkg/gitsync` when you want a durable worker-facing API: - typed requests and results - injected auth and HTTP client support -Use `pkg/gitsync/unstable` only when you need controls that are intentionally not yet stable: +Use `unstable` only when you need controls that are intentionally not yet stable: - `Bootstrap` - `Fetch` @@ -27,7 +27,7 @@ Use `pkg/gitsync/unstable` only when you need controls that are intentionally no - verbose execution controls - other engine-adjacent tuning -The CLI and benchmark command use `pkg/gitsync/unstable` because they still need those controls. External workers should generally not. +The CLI and benchmark command use `unstable` because they still need those controls. External workers should generally not. ## Worker Shape @@ -49,7 +49,7 @@ import ( "context" "net/http" - "entire.io/entire/git-sync/pkg/gitsync" + "entire.io/entire/git-sync" ) func runSync(ctx context.Context) error { @@ -83,7 +83,7 @@ func runSync(ctx context.Context) error { ## Auth Injection -`pkg/gitsync` uses one auth ownership model: +`gitsync` uses one auth ownership model: - requests carry endpoint identity - `AuthProvider` resolves source and target auth @@ -161,4 +161,4 @@ If you want stability, do not build external worker logic around: - temp refs - exact relay strategy names beyond coarse execution summary -Those are implementation details or advanced controls that currently belong in `pkg/gitsync/unstable`, not the stable embedding contract. +Those are implementation details or advanced controls that currently belong in `unstable`, not the stable embedding contract. diff --git a/pkg/gitsync/example_test.go b/example_test.go similarity index 94% rename from pkg/gitsync/example_test.go rename to example_test.go index b142f4a4..d63bf300 100644 --- a/pkg/gitsync/example_test.go +++ b/example_test.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "entire.io/entire/git-sync/pkg/gitsync" + "entire.io/entire/git-sync" ) func ExampleClient_Sync() { diff --git a/pkg/gitsync/internalbridge/config.go b/internalbridge/config.go similarity index 100% rename from pkg/gitsync/internalbridge/config.go rename to internalbridge/config.go diff --git a/pkg/gitsync/internalbridge/model.go b/internalbridge/model.go similarity index 100% rename from pkg/gitsync/internalbridge/model.go rename to internalbridge/model.go diff --git a/pkg/gitsync/internalbridge/model_test.go b/internalbridge/model_test.go similarity index 100% rename from pkg/gitsync/internalbridge/model_test.go rename to internalbridge/model_test.go diff --git a/pkg/gitsync/types.go b/types.go similarity index 98% rename from pkg/gitsync/types.go rename to types.go index 601670c9..27bf24fa 100644 --- a/pkg/gitsync/types.go +++ b/types.go @@ -2,7 +2,7 @@ package gitsync import ( "context" - "entire.io/entire/git-sync/pkg/gitsync/internalbridge" + "entire.io/entire/git-sync/internalbridge" ) // ProtocolMode controls source-side protocol negotiation. diff --git a/pkg/gitsync/unstable/client.go b/unstable/client.go similarity index 98% rename from pkg/gitsync/unstable/client.go rename to unstable/client.go index 2cdcdf7d..dcc5ff43 100644 --- a/pkg/gitsync/unstable/client.go +++ b/unstable/client.go @@ -9,8 +9,8 @@ import ( "entire.io/entire/git-sync/internal/syncer" "entire.io/entire/git-sync/internal/validation" - "entire.io/entire/git-sync/pkg/gitsync" - "entire.io/entire/git-sync/pkg/gitsync/internalbridge" + "entire.io/entire/git-sync" + "entire.io/entire/git-sync/internalbridge" ) const DefaultMaterializedMaxObjects = syncer.DefaultMaterializedMaxObjects diff --git a/pkg/gitsync/unstable/client_test.go b/unstable/client_test.go similarity index 98% rename from pkg/gitsync/unstable/client_test.go rename to unstable/client_test.go index 31c437e8..863f6154 100644 --- a/pkg/gitsync/unstable/client_test.go +++ b/unstable/client_test.go @@ -7,7 +7,7 @@ import ( "github.com/go-git/go-git/v6/plumbing" - "entire.io/entire/git-sync/pkg/gitsync" + "entire.io/entire/git-sync" ) func TestBuildSyncConfigCarriesAdvancedOptions(t *testing.T) { diff --git a/pkg/gitsync/unstable/doc.go b/unstable/doc.go similarity index 87% rename from pkg/gitsync/unstable/doc.go rename to unstable/doc.go index 519374fc..ec6432a6 100644 --- a/pkg/gitsync/unstable/doc.go +++ b/unstable/doc.go @@ -1,5 +1,5 @@ // Package unstable exposes advanced git-sync controls and commands that are -// intentionally outside the stable pkg/gitsync surface. +// intentionally outside the stable gitsync surface. // // This package exists for first-party consumers such as the CLI and benchmark // tool that still need direct access to engine-adjacent controls like batch From 86605f78cda80fe09dec72c856ebcf34cf9818d1 Mon Sep 17 00:00:00 2001 From: Stefan Haubold Date: Wed, 29 Apr 2026 17:21:06 +0200 Subject: [PATCH 2/3] rename package fully to entire.io/entire/gitsync Entire-Checkpoint: a5350309c67e --- .golangci.yaml | 2 +- client.go | 4 ++-- client_test.go | 2 +- cmd/git-sync-bench/main.go | 6 +++--- cmd/git-sync-bench/main_test.go | 2 +- cmd/git-sync/main.go | 6 +++--- cmd/git-sync/main_test.go | 2 +- docs/embedding.md | 2 +- example_test.go | 2 +- go.mod | 2 +- internal/convert/convert.go | 4 ++-- internal/convert/convert_test.go | 4 ++-- internal/planner/planner.go | 2 +- internal/planner/planner_test.go | 2 +- internal/planner/types.go | 2 +- internal/strategy/bootstrap/bootstrap.go | 6 +++--- internal/strategy/bootstrap/bootstrap_test.go | 4 ++-- internal/strategy/incremental/incremental.go | 6 +++--- .../strategy/incremental/incremental_test.go | 6 +++--- internal/strategy/materialized/materialized.go | 6 +++--- .../strategy/materialized/materialized_test.go | 8 ++++---- internal/strategy/replicate/replicate.go | 6 +++--- internal/strategy/replicate/replicate_test.go | 4 ++-- internal/syncer/auth_test.go | 2 +- internal/syncer/benchmark_test.go | 2 +- internal/syncer/git_http_backend_test.go | 6 +++--- internal/syncer/integration_test.go | 8 ++++---- internal/syncer/stats.go | 2 +- internal/syncer/syncer.go | 18 +++++++++--------- internal/syncer/syncer_test.go | 2 +- internalbridge/config.go | 4 ++-- internalbridge/model.go | 4 ++-- internalbridge/model_test.go | 4 ++-- mise-tasks/lint/licenses | 2 +- types.go | 2 +- unstable/client.go | 8 ++++---- unstable/client_test.go | 2 +- 37 files changed, 78 insertions(+), 78 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index f7ade94e..3fd79b66 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -97,7 +97,7 @@ linters: - github.com/go-git/go-git/v6/storage.Storer - github.com/go-git/go-git/v6/plumbing/storer.EncodedObjectIter - github.com/go-git/go-billy/v6.Filesystem - - entire.io/entire/git-sync/internal/auth.Method + - entire.io/entire/gitsync/internal/auth.Method nolintlint: require-explanation: true require-specific: true diff --git a/client.go b/client.go index 579dc4ec..14d24dc8 100644 --- a/client.go +++ b/client.go @@ -6,8 +6,8 @@ import ( "fmt" "net/http" - "entire.io/entire/git-sync/internal/validation" - "entire.io/entire/git-sync/internalbridge" + "entire.io/entire/gitsync/internal/validation" + "entire.io/entire/gitsync/internalbridge" ) // Options configures a Client. It is intentionally small in the first public cut. diff --git a/client_test.go b/client_test.go index 8f11f1ce..2fe1136c 100644 --- a/client_test.go +++ b/client_test.go @@ -15,7 +15,7 @@ import ( "github.com/go-git/go-git/v6/plumbing/protocol/packp" "github.com/go-git/go-git/v6/plumbing/transport" - "entire.io/entire/git-sync/internal/syncertest" + "entire.io/entire/gitsync/internal/syncertest" ) type errAuthProvider struct{} diff --git a/cmd/git-sync-bench/main.go b/cmd/git-sync-bench/main.go index 6ba80a84..c03bb48f 100644 --- a/cmd/git-sync-bench/main.go +++ b/cmd/git-sync-bench/main.go @@ -15,9 +15,9 @@ import ( git "github.com/go-git/go-git/v6" - "entire.io/entire/git-sync/internal/validation" - "entire.io/entire/git-sync" - "entire.io/entire/git-sync/unstable" + "entire.io/entire/gitsync/internal/validation" + "entire.io/entire/gitsync" + "entire.io/entire/gitsync/unstable" ) type scenario string diff --git a/cmd/git-sync-bench/main_test.go b/cmd/git-sync-bench/main_test.go index 28351cb0..fb3a3005 100644 --- a/cmd/git-sync-bench/main_test.go +++ b/cmd/git-sync-bench/main_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "entire.io/entire/git-sync/unstable" + "entire.io/entire/gitsync/unstable" ) func TestSummarizeRuns(t *testing.T) { diff --git a/cmd/git-sync/main.go b/cmd/git-sync/main.go index e2a7f759..d7015d4f 100644 --- a/cmd/git-sync/main.go +++ b/cmd/git-sync/main.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "entire.io/entire/git-sync/internal/validation" - "entire.io/entire/git-sync" - "entire.io/entire/git-sync/unstable" + "entire.io/entire/gitsync/internal/validation" + "entire.io/entire/gitsync" + "entire.io/entire/gitsync/unstable" "github.com/go-git/go-git/v6/plumbing" ) diff --git a/cmd/git-sync/main_test.go b/cmd/git-sync/main_test.go index 5b5fa5e0..2b4b4453 100644 --- a/cmd/git-sync/main_test.go +++ b/cmd/git-sync/main_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "entire.io/entire/git-sync/unstable" + "entire.io/entire/gitsync/unstable" billy "github.com/go-git/go-billy/v6" "github.com/go-git/go-billy/v6/memfs" git "github.com/go-git/go-git/v6" diff --git a/docs/embedding.md b/docs/embedding.md index 26aa7e8c..66ffa946 100644 --- a/docs/embedding.md +++ b/docs/embedding.md @@ -49,7 +49,7 @@ import ( "context" "net/http" - "entire.io/entire/git-sync" + "entire.io/entire/gitsync" ) func runSync(ctx context.Context) error { diff --git a/example_test.go b/example_test.go index d63bf300..48210eed 100644 --- a/example_test.go +++ b/example_test.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "entire.io/entire/git-sync" + "entire.io/entire/gitsync" ) func ExampleClient_Sync() { diff --git a/go.mod b/go.mod index 588f80e2..c4b4dc1a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module entire.io/entire/git-sync +module entire.io/entire/gitsync go 1.26.2 diff --git a/internal/convert/convert.go b/internal/convert/convert.go index ac660793..9294db66 100644 --- a/internal/convert/convert.go +++ b/internal/convert/convert.go @@ -6,8 +6,8 @@ package convert import ( "github.com/go-git/go-git/v6/plumbing" - "entire.io/entire/git-sync/internal/gitproto" - "entire.io/entire/git-sync/internal/planner" + "entire.io/entire/gitsync/internal/gitproto" + "entire.io/entire/gitsync/internal/planner" ) // DesiredRefs converts planner desired refs to gitproto desired refs. diff --git a/internal/convert/convert_test.go b/internal/convert/convert_test.go index f70b5be1..6cca023f 100644 --- a/internal/convert/convert_test.go +++ b/internal/convert/convert_test.go @@ -5,8 +5,8 @@ import ( "github.com/go-git/go-git/v6/plumbing" - "entire.io/entire/git-sync/internal/gitproto" - "entire.io/entire/git-sync/internal/planner" + "entire.io/entire/gitsync/internal/gitproto" + "entire.io/entire/gitsync/internal/planner" ) func TestDesiredRefsForPlans(t *testing.T) { diff --git a/internal/planner/planner.go b/internal/planner/planner.go index 31f7a4a3..22574ef2 100644 --- a/internal/planner/planner.go +++ b/internal/planner/planner.go @@ -5,7 +5,7 @@ import ( "fmt" "sort" - "entire.io/entire/git-sync/internal/validation" + "entire.io/entire/gitsync/internal/validation" "github.com/go-git/go-git/v6/plumbing" "github.com/go-git/go-git/v6/plumbing/object" "github.com/go-git/go-git/v6/plumbing/storer" diff --git a/internal/planner/planner_test.go b/internal/planner/planner_test.go index 397e61d0..340a7c43 100644 --- a/internal/planner/planner_test.go +++ b/internal/planner/planner_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "entire.io/entire/git-sync/internal/validation" + "entire.io/entire/gitsync/internal/validation" git "github.com/go-git/go-git/v6" "github.com/go-git/go-git/v6/plumbing" "github.com/go-git/go-git/v6/plumbing/object" diff --git a/internal/planner/types.go b/internal/planner/types.go index 5892fb7c..87ec67db 100644 --- a/internal/planner/types.go +++ b/internal/planner/types.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "entire.io/entire/git-sync/internal/validation" + "entire.io/entire/gitsync/internal/validation" "github.com/go-git/go-git/v6/plumbing" ) diff --git a/internal/strategy/bootstrap/bootstrap.go b/internal/strategy/bootstrap/bootstrap.go index b97f5a72..50406bb7 100644 --- a/internal/strategy/bootstrap/bootstrap.go +++ b/internal/strategy/bootstrap/bootstrap.go @@ -23,9 +23,9 @@ import ( "github.com/go-git/go-git/v6/plumbing/storer" "github.com/go-git/go-git/v6/storage/memory" - "entire.io/entire/git-sync/internal/convert" - "entire.io/entire/git-sync/internal/gitproto" - "entire.io/entire/git-sync/internal/planner" + "entire.io/entire/gitsync/internal/convert" + "entire.io/entire/gitsync/internal/gitproto" + "entire.io/entire/gitsync/internal/planner" ) const ( diff --git a/internal/strategy/bootstrap/bootstrap_test.go b/internal/strategy/bootstrap/bootstrap_test.go index c0ee627e..6df97f91 100644 --- a/internal/strategy/bootstrap/bootstrap_test.go +++ b/internal/strategy/bootstrap/bootstrap_test.go @@ -18,8 +18,8 @@ import ( "github.com/go-git/go-git/v6/plumbing/transport" "github.com/go-git/go-git/v6/storage/memory" - "entire.io/entire/git-sync/internal/gitproto" - "entire.io/entire/git-sync/internal/planner" + "entire.io/entire/gitsync/internal/gitproto" + "entire.io/entire/gitsync/internal/planner" ) func TestIsTargetBodyLimitError(t *testing.T) { diff --git a/internal/strategy/incremental/incremental.go b/internal/strategy/incremental/incremental.go index bda2dff4..7447e394 100644 --- a/internal/strategy/incremental/incremental.go +++ b/internal/strategy/incremental/incremental.go @@ -12,9 +12,9 @@ import ( "github.com/go-git/go-git/v6/plumbing" - "entire.io/entire/git-sync/internal/convert" - "entire.io/entire/git-sync/internal/gitproto" - "entire.io/entire/git-sync/internal/planner" + "entire.io/entire/gitsync/internal/convert" + "entire.io/entire/gitsync/internal/gitproto" + "entire.io/entire/gitsync/internal/planner" ) // Params holds the inputs for an incremental relay execution. diff --git a/internal/strategy/incremental/incremental_test.go b/internal/strategy/incremental/incremental_test.go index 317cf0ee..1f87f4de 100644 --- a/internal/strategy/incremental/incremental_test.go +++ b/internal/strategy/incremental/incremental_test.go @@ -9,9 +9,9 @@ import ( "github.com/go-git/go-git/v6/plumbing" - "entire.io/entire/git-sync/internal/convert" - "entire.io/entire/git-sync/internal/gitproto" - "entire.io/entire/git-sync/internal/planner" + "entire.io/entire/gitsync/internal/convert" + "entire.io/entire/gitsync/internal/gitproto" + "entire.io/entire/gitsync/internal/planner" ) func TestPlansToPushPlans(t *testing.T) { diff --git a/internal/strategy/materialized/materialized.go b/internal/strategy/materialized/materialized.go index 4eb3b319..bdc27ad1 100644 --- a/internal/strategy/materialized/materialized.go +++ b/internal/strategy/materialized/materialized.go @@ -12,9 +12,9 @@ import ( "github.com/go-git/go-git/v6/plumbing" "github.com/go-git/go-git/v6/plumbing/storer" - "entire.io/entire/git-sync/internal/convert" - "entire.io/entire/git-sync/internal/gitproto" - "entire.io/entire/git-sync/internal/planner" + "entire.io/entire/gitsync/internal/convert" + "entire.io/entire/gitsync/internal/gitproto" + "entire.io/entire/gitsync/internal/planner" ) // Params holds the inputs for a materialized push. diff --git a/internal/strategy/materialized/materialized_test.go b/internal/strategy/materialized/materialized_test.go index 411a8e91..cde0b652 100644 --- a/internal/strategy/materialized/materialized_test.go +++ b/internal/strategy/materialized/materialized_test.go @@ -8,10 +8,10 @@ import ( "github.com/go-git/go-git/v6/plumbing/object" "github.com/go-git/go-git/v6/plumbing/storer" - "entire.io/entire/git-sync/internal/convert" - "entire.io/entire/git-sync/internal/gitproto" - "entire.io/entire/git-sync/internal/planner" - "entire.io/entire/git-sync/internal/syncertest" + "entire.io/entire/gitsync/internal/convert" + "entire.io/entire/gitsync/internal/gitproto" + "entire.io/entire/gitsync/internal/planner" + "entire.io/entire/gitsync/internal/syncertest" ) func TestPlansToPushPlans(t *testing.T) { diff --git a/internal/strategy/replicate/replicate.go b/internal/strategy/replicate/replicate.go index 385a3949..2c28c71d 100644 --- a/internal/strategy/replicate/replicate.go +++ b/internal/strategy/replicate/replicate.go @@ -10,9 +10,9 @@ import ( "github.com/go-git/go-git/v6/plumbing" - "entire.io/entire/git-sync/internal/convert" - "entire.io/entire/git-sync/internal/gitproto" - "entire.io/entire/git-sync/internal/planner" + "entire.io/entire/gitsync/internal/convert" + "entire.io/entire/gitsync/internal/gitproto" + "entire.io/entire/gitsync/internal/planner" ) // Params holds the inputs for a replication relay execution. diff --git a/internal/strategy/replicate/replicate_test.go b/internal/strategy/replicate/replicate_test.go index 5751aa7f..42c97fcd 100644 --- a/internal/strategy/replicate/replicate_test.go +++ b/internal/strategy/replicate/replicate_test.go @@ -8,8 +8,8 @@ import ( "github.com/go-git/go-git/v6/plumbing" - "entire.io/entire/git-sync/internal/gitproto" - "entire.io/entire/git-sync/internal/planner" + "entire.io/entire/gitsync/internal/gitproto" + "entire.io/entire/gitsync/internal/planner" ) type fakeSourceService struct { diff --git a/internal/syncer/auth_test.go b/internal/syncer/auth_test.go index 0c5be333..92cdc632 100644 --- a/internal/syncer/auth_test.go +++ b/internal/syncer/auth_test.go @@ -14,7 +14,7 @@ import ( "github.com/go-git/go-git/v6/plumbing/transport" transporthttp "github.com/go-git/go-git/v6/plumbing/transport/http" - "entire.io/entire/git-sync/internal/auth" + "entire.io/entire/gitsync/internal/auth" ) func TestResolveAuthMethodPrefersExplicitToken(t *testing.T) { diff --git a/internal/syncer/benchmark_test.go b/internal/syncer/benchmark_test.go index d5f38c3a..bbfe4bc6 100644 --- a/internal/syncer/benchmark_test.go +++ b/internal/syncer/benchmark_test.go @@ -2,7 +2,7 @@ package syncer import ( "context" - "entire.io/entire/git-sync/internal/syncertest" + "entire.io/entire/gitsync/internal/syncertest" git "github.com/go-git/go-git/v6" "github.com/go-git/go-git/v6/plumbing" "github.com/go-git/go-git/v6/plumbing/storer" diff --git a/internal/syncer/git_http_backend_test.go b/internal/syncer/git_http_backend_test.go index bd6357e2..22906a4e 100644 --- a/internal/syncer/git_http_backend_test.go +++ b/internal/syncer/git_http_backend_test.go @@ -15,9 +15,9 @@ import ( "sync" "testing" - "entire.io/entire/git-sync/internal/gitproto" - "entire.io/entire/git-sync/internal/planner" - bstrap "entire.io/entire/git-sync/internal/strategy/bootstrap" + "entire.io/entire/gitsync/internal/gitproto" + "entire.io/entire/gitsync/internal/planner" + bstrap "entire.io/entire/gitsync/internal/strategy/bootstrap" "github.com/go-git/go-git/v6/plumbing" ) diff --git a/internal/syncer/integration_test.go b/internal/syncer/integration_test.go index 3e4f0371..e0b785ee 100644 --- a/internal/syncer/integration_test.go +++ b/internal/syncer/integration_test.go @@ -14,10 +14,10 @@ import ( "testing" "time" - "entire.io/entire/git-sync/internal/auth" - "entire.io/entire/git-sync/internal/gitproto" - "entire.io/entire/git-sync/internal/planner" - "entire.io/entire/git-sync/internal/syncertest" + "entire.io/entire/gitsync/internal/auth" + "entire.io/entire/gitsync/internal/gitproto" + "entire.io/entire/gitsync/internal/planner" + "entire.io/entire/gitsync/internal/syncertest" billy "github.com/go-git/go-billy/v6" git "github.com/go-git/go-git/v6" "github.com/go-git/go-git/v6/plumbing" diff --git a/internal/syncer/stats.go b/internal/syncer/stats.go index 209e4974..9a901c5f 100644 --- a/internal/syncer/stats.go +++ b/internal/syncer/stats.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "entire.io/entire/git-sync/internal/gitproto" + "entire.io/entire/gitsync/internal/gitproto" ) // ServiceStats tracks transfer statistics for a single service. diff --git a/internal/syncer/syncer.go b/internal/syncer/syncer.go index 85da5b49..051ec12c 100644 --- a/internal/syncer/syncer.go +++ b/internal/syncer/syncer.go @@ -21,15 +21,15 @@ import ( "github.com/go-git/go-git/v6/plumbing/transport" "github.com/go-git/go-git/v6/storage/memory" - "entire.io/entire/git-sync/internal/auth" - "entire.io/entire/git-sync/internal/convert" - "entire.io/entire/git-sync/internal/gitproto" - "entire.io/entire/git-sync/internal/planner" - bstrap "entire.io/entire/git-sync/internal/strategy/bootstrap" - "entire.io/entire/git-sync/internal/strategy/incremental" - "entire.io/entire/git-sync/internal/strategy/materialized" - repstrat "entire.io/entire/git-sync/internal/strategy/replicate" - "entire.io/entire/git-sync/internal/validation" + "entire.io/entire/gitsync/internal/auth" + "entire.io/entire/gitsync/internal/convert" + "entire.io/entire/gitsync/internal/gitproto" + "entire.io/entire/gitsync/internal/planner" + bstrap "entire.io/entire/gitsync/internal/strategy/bootstrap" + "entire.io/entire/gitsync/internal/strategy/incremental" + "entire.io/entire/gitsync/internal/strategy/materialized" + repstrat "entire.io/entire/gitsync/internal/strategy/replicate" + "entire.io/entire/gitsync/internal/validation" ) const ( diff --git a/internal/syncer/syncer_test.go b/internal/syncer/syncer_test.go index 1accf940..99b014b3 100644 --- a/internal/syncer/syncer_test.go +++ b/internal/syncer/syncer_test.go @@ -3,7 +3,7 @@ package syncer import ( "testing" - bstrap "entire.io/entire/git-sync/internal/strategy/bootstrap" + bstrap "entire.io/entire/gitsync/internal/strategy/bootstrap" ) func TestGitHubOwnerRepo(t *testing.T) { diff --git a/internalbridge/config.go b/internalbridge/config.go index 4951c75d..52e49aaa 100644 --- a/internalbridge/config.go +++ b/internalbridge/config.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "entire.io/entire/git-sync/internal/syncer" - "entire.io/entire/git-sync/internal/validation" + "entire.io/entire/gitsync/internal/syncer" + "entire.io/entire/gitsync/internal/validation" ) type ProtocolMode string diff --git a/internalbridge/model.go b/internalbridge/model.go index 02755dfe..24afa84f 100644 --- a/internalbridge/model.go +++ b/internalbridge/model.go @@ -3,8 +3,8 @@ package internalbridge import ( "github.com/go-git/go-git/v6/plumbing" - "entire.io/entire/git-sync/internal/planner" - "entire.io/entire/git-sync/internal/syncer" + "entire.io/entire/gitsync/internal/planner" + "entire.io/entire/gitsync/internal/syncer" ) type RefKind string diff --git a/internalbridge/model_test.go b/internalbridge/model_test.go index 955f0053..08fc3b33 100644 --- a/internalbridge/model_test.go +++ b/internalbridge/model_test.go @@ -5,8 +5,8 @@ import ( "github.com/go-git/go-git/v6/plumbing" - "entire.io/entire/git-sync/internal/planner" - "entire.io/entire/git-sync/internal/syncer" + "entire.io/entire/gitsync/internal/planner" + "entire.io/entire/gitsync/internal/syncer" ) func TestHashStringZeroHashIsEmpty(t *testing.T) { diff --git a/mise-tasks/lint/licenses b/mise-tasks/lint/licenses index 1b2e28c9..9ecfaab5 100755 --- a/mise-tasks/lint/licenses +++ b/mise-tasks/lint/licenses @@ -46,7 +46,7 @@ go-licenses csv ./cmd/git-sync 2>/dev/null | sort | uniq > "$TEMP_FILE" VIOLATIONS=() while IFS=',' read -r package _url license; do # Skip internal packages - if [[ "$package" == entire.io/entire/git-sync/* ]]; then + if [[ "$package" == entire.io/entire/gitsync/* ]]; then continue fi diff --git a/types.go b/types.go index 27bf24fa..c18c31f7 100644 --- a/types.go +++ b/types.go @@ -2,7 +2,7 @@ package gitsync import ( "context" - "entire.io/entire/git-sync/internalbridge" + "entire.io/entire/gitsync/internalbridge" ) // ProtocolMode controls source-side protocol negotiation. diff --git a/unstable/client.go b/unstable/client.go index dcc5ff43..44e0b48b 100644 --- a/unstable/client.go +++ b/unstable/client.go @@ -7,10 +7,10 @@ import ( "github.com/go-git/go-git/v6/plumbing" - "entire.io/entire/git-sync/internal/syncer" - "entire.io/entire/git-sync/internal/validation" - "entire.io/entire/git-sync" - "entire.io/entire/git-sync/internalbridge" + "entire.io/entire/gitsync/internal/syncer" + "entire.io/entire/gitsync/internal/validation" + "entire.io/entire/gitsync" + "entire.io/entire/gitsync/internalbridge" ) const DefaultMaterializedMaxObjects = syncer.DefaultMaterializedMaxObjects diff --git a/unstable/client_test.go b/unstable/client_test.go index 863f6154..9e78d04d 100644 --- a/unstable/client_test.go +++ b/unstable/client_test.go @@ -7,7 +7,7 @@ import ( "github.com/go-git/go-git/v6/plumbing" - "entire.io/entire/git-sync" + "entire.io/entire/gitsync" ) func TestBuildSyncConfigCarriesAdvancedOptions(t *testing.T) { From 57b76f1722dc75eb9daeb3a37a46920ef9a6a635 Mon Sep 17 00:00:00 2001 From: Stefan Haubold Date: Wed, 29 Apr 2026 17:26:57 +0200 Subject: [PATCH 3/3] fmt --- cmd/git-sync-bench/main.go | 2 +- cmd/git-sync/main.go | 2 +- unstable/client.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/git-sync-bench/main.go b/cmd/git-sync-bench/main.go index c03bb48f..0b826ca4 100644 --- a/cmd/git-sync-bench/main.go +++ b/cmd/git-sync-bench/main.go @@ -15,8 +15,8 @@ import ( git "github.com/go-git/go-git/v6" - "entire.io/entire/gitsync/internal/validation" "entire.io/entire/gitsync" + "entire.io/entire/gitsync/internal/validation" "entire.io/entire/gitsync/unstable" ) diff --git a/cmd/git-sync/main.go b/cmd/git-sync/main.go index d7015d4f..4a0a1729 100644 --- a/cmd/git-sync/main.go +++ b/cmd/git-sync/main.go @@ -9,8 +9,8 @@ import ( "os" "strings" - "entire.io/entire/gitsync/internal/validation" "entire.io/entire/gitsync" + "entire.io/entire/gitsync/internal/validation" "entire.io/entire/gitsync/unstable" "github.com/go-git/go-git/v6/plumbing" ) diff --git a/unstable/client.go b/unstable/client.go index 44e0b48b..4787ab56 100644 --- a/unstable/client.go +++ b/unstable/client.go @@ -7,9 +7,9 @@ import ( "github.com/go-git/go-git/v6/plumbing" + "entire.io/entire/gitsync" "entire.io/entire/gitsync/internal/syncer" "entire.io/entire/gitsync/internal/validation" - "entire.io/entire/gitsync" "entire.io/entire/gitsync/internalbridge" )