diff options
Diffstat (limited to 'receivepack')
| -rw-r--r-- | receivepack/hook.go | 6 | ||||
| -rw-r--r-- | receivepack/hooks/reject_force_push.go | 2 | ||||
| -rw-r--r-- | receivepack/options.go | 4 | ||||
| -rw-r--r-- | receivepack/service/hook.go | 6 | ||||
| -rw-r--r-- | receivepack/service/options.go | 4 | ||||
| -rw-r--r-- | receivepack/service/quarantine_test.go | 2 | ||||
| -rw-r--r-- | receivepack/service/run_hook.go | 10 | ||||
| -rw-r--r-- | receivepack/service/service_test.go | 2 |
8 files changed, 18 insertions, 18 deletions
diff --git a/receivepack/hook.go b/receivepack/hook.go index e4dd4de4..2a87276a 100644 --- a/receivepack/hook.go +++ b/receivepack/hook.go @@ -5,7 +5,7 @@ import ( "io" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/object/store" + "codeberg.org/lindenii/furgit/object/storer" "codeberg.org/lindenii/furgit/receivepack/service" "codeberg.org/lindenii/furgit/ref/store" ) @@ -35,8 +35,8 @@ type UpdateDecision struct { // valid for the duration of the hook call. type HookRequest struct { Refs refstore.ReadingStore - ExistingObjects objectstore.Store - QuarantinedObjects objectstore.Store + ExistingObjects objectstorer.Store + QuarantinedObjects objectstorer.Store Updates []RefUpdate PushOptions []string IO HookIO diff --git a/receivepack/hooks/reject_force_push.go b/receivepack/hooks/reject_force_push.go index 5c7a8462..82f13644 100644 --- a/receivepack/hooks/reject_force_push.go +++ b/receivepack/hooks/reject_force_push.go @@ -7,7 +7,7 @@ import ( "codeberg.org/lindenii/furgit/commitquery" objectid "codeberg.org/lindenii/furgit/object/id" - objectmix "codeberg.org/lindenii/furgit/object/store/mix" + objectmix "codeberg.org/lindenii/furgit/object/storer/mix" receivepack "codeberg.org/lindenii/furgit/receivepack" "codeberg.org/lindenii/furgit/ref/store" ) diff --git a/receivepack/options.go b/receivepack/options.go index 0d01043a..8bbd8bbe 100644 --- a/receivepack/options.go +++ b/receivepack/options.go @@ -4,7 +4,7 @@ import ( "os" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/object/store" + "codeberg.org/lindenii/furgit/object/storer" "codeberg.org/lindenii/furgit/ref/store" ) @@ -25,7 +25,7 @@ type Options struct { Refs refstore.ReadWriteStore // ExistingObjects is the object store visible to the push before any newly // uploaded quarantined objects are promoted. - ExistingObjects objectstore.Store + ExistingObjects objectstorer.Store // ObjectsRoot is the permanent object storage root beneath which per-push // quarantine directories are derived. ObjectsRoot *os.Root diff --git a/receivepack/service/hook.go b/receivepack/service/hook.go index f0624233..5fb7d41f 100644 --- a/receivepack/service/hook.go +++ b/receivepack/service/hook.go @@ -5,7 +5,7 @@ import ( "io" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/object/store" + "codeberg.org/lindenii/furgit/object/storer" "codeberg.org/lindenii/furgit/ref/store" ) @@ -31,8 +31,8 @@ type UpdateDecision struct { // valid for the duration of the hook call. type HookRequest struct { Refs refstore.ReadingStore - ExistingObjects objectstore.Store - QuarantinedObjects objectstore.Store + ExistingObjects objectstorer.Store + QuarantinedObjects objectstorer.Store Updates []RefUpdate PushOptions []string IO HookIO diff --git a/receivepack/service/options.go b/receivepack/service/options.go index 9afcf521..f252bbc8 100644 --- a/receivepack/service/options.go +++ b/receivepack/service/options.go @@ -6,7 +6,7 @@ import ( "os" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/object/store" + "codeberg.org/lindenii/furgit/object/storer" "codeberg.org/lindenii/furgit/ref/store" ) @@ -26,7 +26,7 @@ type PromotedObjectPermissions struct { type Options struct { Algorithm objectid.Algorithm Refs refstore.ReadWriteStore - ExistingObjects objectstore.Store + ExistingObjects objectstorer.Store ObjectsRoot *os.Root Progress io.Writer ProgressFlush func() error diff --git a/receivepack/service/quarantine_test.go b/receivepack/service/quarantine_test.go index e0389472..86299be2 100644 --- a/receivepack/service/quarantine_test.go +++ b/receivepack/service/quarantine_test.go @@ -8,7 +8,7 @@ import ( "testing" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/object/store/memory" + "codeberg.org/lindenii/furgit/object/storer/memory" ) type quarantineFixture struct { diff --git a/receivepack/service/run_hook.go b/receivepack/service/run_hook.go index c62be022..fd8a83a2 100644 --- a/receivepack/service/run_hook.go +++ b/receivepack/service/run_hook.go @@ -5,10 +5,10 @@ import ( "os" "codeberg.org/lindenii/furgit/internal/utils" - "codeberg.org/lindenii/furgit/object/store" - "codeberg.org/lindenii/furgit/object/store/loose" - objectmix "codeberg.org/lindenii/furgit/object/store/mix" - "codeberg.org/lindenii/furgit/object/store/packed" + "codeberg.org/lindenii/furgit/object/storer" + "codeberg.org/lindenii/furgit/object/storer/loose" + objectmix "codeberg.org/lindenii/furgit/object/storer/mix" + "codeberg.org/lindenii/furgit/object/storer/packed" ) func (service *Service) runHook( @@ -40,7 +40,7 @@ func (service *Service) runHook( quarantinedObjects := service.opts.ExistingObjects var ( - quarantineObjectsStore objectstore.Store + quarantineObjectsStore objectstorer.Store quarantineLooseStore *loose.Store quarantinePackedStore *packed.Store quarantineLooseRoot *os.Root diff --git a/receivepack/service/service_test.go b/receivepack/service/service_test.go index 35743e49..74a242f8 100644 --- a/receivepack/service/service_test.go +++ b/receivepack/service/service_test.go @@ -9,7 +9,7 @@ import ( "codeberg.org/lindenii/furgit/internal/testgit" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/object/store/memory" + "codeberg.org/lindenii/furgit/object/storer/memory" "codeberg.org/lindenii/furgit/receivepack/service" ) |