*: objecttype, objectheader -> object/type, object/header

35 files changed, 44 insertions, 44 deletions

diff --git a/objectstore/chain/bytes.go b/objectstore/chain/bytes.go
index 64771608..f5e5ac6d 100644
--- a/objectstore/chain/bytes.go
+++ b/objectstore/chain/bytes.go
@@ -6,7 +6,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // ReadBytesFull reads a full serialized object from the first backend that has it.
diff --git a/objectstore/chain/header.go b/objectstore/chain/header.go
index 59f6bba6..6937d6f3 100644
--- a/objectstore/chain/header.go
+++ b/objectstore/chain/header.go
@@ -6,7 +6,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // ReadHeader reads object header data from the first backend that has it.
diff --git a/objectstore/chain/reader.go b/objectstore/chain/reader.go
index 41060a5b..2a19c6fb 100644
--- a/objectstore/chain/reader.go
+++ b/objectstore/chain/reader.go
@@ -7,7 +7,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // ReadReaderFull reads a full serialized object stream from the first backend that has it.
diff --git a/objectstore/loose/helpers_test.go b/objectstore/loose/helpers_test.go
index ab88c107..46e6d453 100644
--- a/objectstore/loose/helpers_test.go
+++ b/objectstore/loose/helpers_test.go
@@ -6,10 +6,10 @@ import (
 	"testing"
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
-	"codeberg.org/lindenii/furgit/objectheader"
+	objectheader "codeberg.org/lindenii/furgit/object/header"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore/loose"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 func openLooseStore(t *testing.T, testRepo *testgit.TestRepo, algo objectid.Algorithm) *loose.Store {
diff --git a/objectstore/loose/parse.go b/objectstore/loose/parse.go
index 2a41e359..dfb420ba 100644
--- a/objectstore/loose/parse.go
+++ b/objectstore/loose/parse.go
@@ -7,8 +7,8 @@ import (
 	"os"
 
 	"codeberg.org/lindenii/furgit/internal/compress/zlib"
-	"codeberg.org/lindenii/furgit/objectheader"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objectheader "codeberg.org/lindenii/furgit/object/header"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // decodeAll inflates the full loose object payload from file.
diff --git a/objectstore/loose/read_bytes.go b/objectstore/loose/read_bytes.go
index 78e1009e..bff22e48 100644
--- a/objectstore/loose/read_bytes.go
+++ b/objectstore/loose/read_bytes.go
@@ -2,7 +2,7 @@ package loose
 
 import (
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // readBytesParsed reads, inflates, and parses a loose object in one pass.
diff --git a/objectstore/loose/read_header.go b/objectstore/loose/read_header.go
index 0cd3273d..3d3d6b87 100644
--- a/objectstore/loose/read_header.go
+++ b/objectstore/loose/read_header.go
@@ -5,7 +5,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/internal/compress/zlib"
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // ReadHeader reads an object's type and declared content length.
diff --git a/objectstore/loose/read_reader.go b/objectstore/loose/read_reader.go
index e6e130a5..c0a64fe7 100644
--- a/objectstore/loose/read_reader.go
+++ b/objectstore/loose/read_reader.go
@@ -10,7 +10,7 @@ import (
 	"codeberg.org/lindenii/furgit/internal/compress/zlib"
 	"codeberg.org/lindenii/furgit/internal/iolimit"
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 type objectReader struct {
diff --git a/objectstore/loose/read_test.go b/objectstore/loose/read_test.go
index 45392ddd..c1180f44 100644
--- a/objectstore/loose/read_test.go
+++ b/objectstore/loose/read_test.go
@@ -11,7 +11,7 @@ import (
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore"
 	"codeberg.org/lindenii/furgit/objectstore/loose"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 func TestLooseStoreReadAgainstGit(t *testing.T) {
diff --git a/objectstore/loose/write_bytes.go b/objectstore/loose/write_bytes.go
index 247173fb..4853ffb1 100644
--- a/objectstore/loose/write_bytes.go
+++ b/objectstore/loose/write_bytes.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // WriteBytesFull writes a full serialized object as "type size\0content".
diff --git a/objectstore/loose/write_reader.go b/objectstore/loose/write_reader.go
index 9dbf3818..f1a7d801 100644
--- a/objectstore/loose/write_reader.go
+++ b/objectstore/loose/write_reader.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"io"
 
-	"codeberg.org/lindenii/furgit/objectheader"
+	objectheader "codeberg.org/lindenii/furgit/object/header"
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // WriteReaderContent writes one loose object from typed content bytes read from src.
diff --git a/objectstore/loose/write_test.go b/objectstore/loose/write_test.go
index a7b12622..90cedbd6 100644
--- a/objectstore/loose/write_test.go
+++ b/objectstore/loose/write_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
-	"codeberg.org/lindenii/furgit/objectheader"
+	objectheader "codeberg.org/lindenii/furgit/object/header"
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 func TestLooseStoreWriteReaderContentAgainstGit(t *testing.T) {
diff --git a/objectstore/loose/write_writer_accept.go b/objectstore/loose/write_writer_accept.go
index 707232ba..bf55966a 100644
--- a/objectstore/loose/write_writer_accept.go
+++ b/objectstore/loose/write_writer_accept.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"errors"
 
-	"codeberg.org/lindenii/furgit/objectheader"
+	objectheader "codeberg.org/lindenii/furgit/object/header"
 )
 
 // acceptFull validates and accounts raw full-object input.
diff --git a/objectstore/memory/add.go b/objectstore/memory/add.go
index 80d0022f..12781d7d 100644
--- a/objectstore/memory/add.go
+++ b/objectstore/memory/add.go
@@ -1,9 +1,9 @@
 package memory
 
 import (
-	"codeberg.org/lindenii/furgit/objectheader"
+	objectheader "codeberg.org/lindenii/furgit/object/header"
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // AddObject stores one object body and returns its object ID.
diff --git a/objectstore/memory/object.go b/objectstore/memory/object.go
index 940af328..a85175c7 100644
--- a/objectstore/memory/object.go
+++ b/objectstore/memory/object.go
@@ -1,6 +1,6 @@
 package memory
 
-import "codeberg.org/lindenii/furgit/objecttype"
+import objecttype "codeberg.org/lindenii/furgit/object/type"
 
 // storedObject is one in-memory object entry.
 type storedObject struct {
diff --git a/objectstore/memory/read_bytes.go b/objectstore/memory/read_bytes.go
index 31c5b3d1..15680a74 100644
--- a/objectstore/memory/read_bytes.go
+++ b/objectstore/memory/read_bytes.go
@@ -1,10 +1,10 @@
 package memory
 
 import (
-	"codeberg.org/lindenii/furgit/objectheader"
+	objectheader "codeberg.org/lindenii/furgit/object/header"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // ReadBytesFull reads one full object, including the object header.
diff --git a/objectstore/memory/read_header.go b/objectstore/memory/read_header.go
index 1d0aff15..07019654 100644
--- a/objectstore/memory/read_header.go
+++ b/objectstore/memory/read_header.go
@@ -3,7 +3,7 @@ package memory
 import (
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // ReadHeader reads one object header.
diff --git a/objectstore/memory/read_reader.go b/objectstore/memory/read_reader.go
index 2e3feda1..ad59246e 100644
--- a/objectstore/memory/read_reader.go
+++ b/objectstore/memory/read_reader.go
@@ -5,7 +5,7 @@ import (
 	"io"
 
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // ReadReaderFull reads one full object through a reader.
diff --git a/objectstore/mix/bytes.go b/objectstore/mix/bytes.go
index a251b892..d312eecd 100644
--- a/objectstore/mix/bytes.go
+++ b/objectstore/mix/bytes.go
@@ -6,7 +6,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // ReadBytesFull reads a full serialized object from one backend that has it.
diff --git a/objectstore/mix/header.go b/objectstore/mix/header.go
index 00b3ead7..d86c6733 100644
--- a/objectstore/mix/header.go
+++ b/objectstore/mix/header.go
@@ -6,7 +6,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // ReadHeader reads object header data from one backend that has it.
diff --git a/objectstore/mix/reader.go b/objectstore/mix/reader.go
index 33811611..b9227bb5 100644
--- a/objectstore/mix/reader.go
+++ b/objectstore/mix/reader.go
@@ -7,7 +7,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // ReadReaderFull reads a full serialized object stream from one backend that
diff --git a/objectstore/objectstore.go b/objectstore/objectstore.go
index c3de12a5..056669dc 100644
--- a/objectstore/objectstore.go
+++ b/objectstore/objectstore.go
@@ -6,7 +6,7 @@ import (
 	"io"
 
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // ErrObjectNotFound indicates that an object does not exist in a backend.
diff --git a/objectstore/packed/delta_build_chain.go b/objectstore/packed/delta_build_chain.go
index ece8018d..4f24b284 100644
--- a/objectstore/packed/delta_build_chain.go
+++ b/objectstore/packed/delta_build_chain.go
@@ -3,7 +3,7 @@ package packed
 import (
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 	packfmt "codeberg.org/lindenii/furgit/packfile"
 )
 
diff --git a/objectstore/packed/delta_cache.go b/objectstore/packed/delta_cache.go
index 08040620..3bf3a035 100644
--- a/objectstore/packed/delta_cache.go
+++ b/objectstore/packed/delta_cache.go
@@ -2,7 +2,7 @@ package packed
 
 import (
 	"codeberg.org/lindenii/furgit/internal/lru"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 const defaultDeltaCacheMaxBytes = 32 << 20
diff --git a/objectstore/packed/delta_chain.go b/objectstore/packed/delta_chain.go
index d473a25c..372e89cd 100644
--- a/objectstore/packed/delta_chain.go
+++ b/objectstore/packed/delta_chain.go
@@ -1,6 +1,6 @@
 package packed
 
-import "codeberg.org/lindenii/furgit/objecttype"
+import objecttype "codeberg.org/lindenii/furgit/object/type"
 
 // deltaChain describes how to reconstruct one requested object.
 type deltaChain struct {
diff --git a/objectstore/packed/delta_resolve_chain.go b/objectstore/packed/delta_resolve_chain.go
index 04dca82e..f988a9fb 100644
--- a/objectstore/packed/delta_resolve_chain.go
+++ b/objectstore/packed/delta_resolve_chain.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	deltaapply "codeberg.org/lindenii/furgit/delta/apply"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // deltaResolveChain resolves one object chain into content bytes.
diff --git a/objectstore/packed/delta_resolve_chain_start.go b/objectstore/packed/delta_resolve_chain_start.go
index ce4ec0a1..08e2bf48 100644
--- a/objectstore/packed/delta_resolve_chain_start.go
+++ b/objectstore/packed/delta_resolve_chain_start.go
@@ -3,7 +3,7 @@ package packed
 import (
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 	packfmt "codeberg.org/lindenii/furgit/packfile"
 )
 
diff --git a/objectstore/packed/delta_resolve_content.go b/objectstore/packed/delta_resolve_content.go
index ec4d7475..06fc4226 100644
--- a/objectstore/packed/delta_resolve_content.go
+++ b/objectstore/packed/delta_resolve_content.go
@@ -1,7 +1,7 @@
 package packed
 
 import (
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 	packfmt "codeberg.org/lindenii/furgit/packfile"
 )
 
diff --git a/objectstore/packed/entry_parse.go b/objectstore/packed/entry_parse.go
index f89bc2a2..93451ee0 100644
--- a/objectstore/packed/entry_parse.go
+++ b/objectstore/packed/entry_parse.go
@@ -5,7 +5,7 @@ import (
 
 	"codeberg.org/lindenii/furgit/internal/intconv"
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 	packfmt "codeberg.org/lindenii/furgit/packfile"
 )
 
diff --git a/objectstore/packed/helpers_test.go b/objectstore/packed/helpers_test.go
index f07ff4e3..72c68d01 100644
--- a/objectstore/packed/helpers_test.go
+++ b/objectstore/packed/helpers_test.go
@@ -8,10 +8,10 @@ import (
 	"testing"
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
-	"codeberg.org/lindenii/furgit/objectheader"
+	objectheader "codeberg.org/lindenii/furgit/object/header"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore/packed"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 func openPackedStore(t *testing.T, testRepo *testgit.TestRepo, algo objectid.Algorithm) *packed.Store {
diff --git a/objectstore/packed/read_bytes.go b/objectstore/packed/read_bytes.go
index e272b626..03ee3dae 100644
--- a/objectstore/packed/read_bytes.go
+++ b/objectstore/packed/read_bytes.go
@@ -3,9 +3,9 @@ package packed
 import (
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objectheader"
+	objectheader "codeberg.org/lindenii/furgit/object/header"
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // ReadBytesContent reads an object's type and content bytes.
diff --git a/objectstore/packed/read_header.go b/objectstore/packed/read_header.go
index 5070c98b..b0a84f23 100644
--- a/objectstore/packed/read_header.go
+++ b/objectstore/packed/read_header.go
@@ -2,7 +2,7 @@ package packed
 
 import (
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 // ReadHeader reads an object's type and declared content size.
diff --git a/objectstore/packed/read_header_resolve.go b/objectstore/packed/read_header_resolve.go
index 1e660e62..6fee720a 100644
--- a/objectstore/packed/read_header_resolve.go
+++ b/objectstore/packed/read_header_resolve.go
@@ -3,7 +3,7 @@ package packed
 import (
 	"fmt"
 
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 	packfmt "codeberg.org/lindenii/furgit/packfile"
 )
 
diff --git a/objectstore/packed/read_reader.go b/objectstore/packed/read_reader.go
index 5c9ac8f4..8d990433 100644
--- a/objectstore/packed/read_reader.go
+++ b/objectstore/packed/read_reader.go
@@ -6,9 +6,9 @@ import (
 	"io"
 
 	"codeberg.org/lindenii/furgit/internal/iolimit"
-	"codeberg.org/lindenii/furgit/objectheader"
+	objectheader "codeberg.org/lindenii/furgit/object/header"
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 	packfmt "codeberg.org/lindenii/furgit/packfile"
 )
 
diff --git a/objectstore/packed/read_size.go b/objectstore/packed/read_size.go
index 4afa6fed..334d3ebf 100644
--- a/objectstore/packed/read_size.go
+++ b/objectstore/packed/read_size.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objecttype"
+	objecttype "codeberg.org/lindenii/furgit/object/type"
 	packfmt "codeberg.org/lindenii/furgit/packfile"
 )