shithub: furgit

Info  •  Files  •  Log  •  Branches

Revert "object/header: Rename from objectheader"

This reverts commit 85f1212724e037e6934203f04a3f6231ac609503.

--- a/object/blob_serialize.go

+++ b/object/blob_serialize.go

@@ -3,7 +3,7 @@

 import (

 	"errors"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

@@ -19,7 +19,7 @@

 		return nil, err

 	}

-	header, ok := header.Encode(objecttype.TypeBlob, int64(len(body)))

+	header, ok := objectheader.Encode(objecttype.TypeBlob, int64(len(body)))

 	if !ok {

 		return nil, errors.New("object: blob: failed to encode object header")

 	}

--- a/object/commit_serialize.go

+++ b/object/commit_serialize.go

@@ -5,7 +5,7 @@

 	"errors"

 	"fmt"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

@@ -71,7 +71,7 @@

 		return nil, err

 	}

-	header, ok := header.Encode(objecttype.TypeCommit, int64(len(body)))

+	header, ok := objectheader.Encode(objecttype.TypeCommit, int64(len(body)))

 	if !ok {

 		return nil, errors.New("object: commit: failed to encode object header")

 	}

--- a/object/header/append.go

+++ /dev/null

@@ -1,29 +1,0 @@

-package header

-

-import (

-	"strconv"

-

-	"codeberg.org/lindenii/furgit/objecttype"

-)

-

-// Append appends a canonical loose-object header ("type size\\x00") to dst.

-func Append(dst []byte, ty objecttype.Type, size int64) ([]byte, bool) {

-	if size < 0 {

-		return nil, false

-	}

-

-	tyName, ok := objecttype.Name(ty)

-	if !ok {

-		return nil, false

-	}

-

-	sizeStr := strconv.FormatInt(size, 10)

-	out := make([]byte, 0, len(dst)+len(tyName)+len(sizeStr)+2)

-	out = append(out, dst...)

-	out = append(out, tyName...)

-	out = append(out, ' ')

-	out = append(out, sizeStr...)

-	out = append(out, 0)

-

-	return out, true

-}

--- a/object/header/encode.go

+++ /dev/null

@@ -1,8 +1,0 @@

-package header

-

-import "codeberg.org/lindenii/furgit/objecttype"

-

-// Encode returns a canonical loose-object header ("type size\\x00").

-func Encode(ty objecttype.Type, size int64) ([]byte, bool) {

-	return Append(nil, ty, size)

-}

--- a/object/header/parse.go

+++ /dev/null

@@ -1,43 +1,0 @@

-// Package header parses and serializes object headers ("type size\0").

-package header

-

-import (

-	"bytes"

-	"strconv"

-

-	"codeberg.org/lindenii/furgit/objecttype"

-)

-

-// Parse parses a canonical loose-object header ("type size\\x00").

-// It returns the parsed type, size, bytes consumed (including trailing NUL),

-// and whether parsing succeeded.

-func Parse(data []byte) (objecttype.Type, int64, int, bool) {

-	space := bytes.IndexByte(data, ' ')

-	if space <= 0 {

-		return objecttype.TypeInvalid, 0, 0, false

-	}

-

-	nulRel := bytes.IndexByte(data[space+1:], 0)

-	if nulRel < 0 {

-		return objecttype.TypeInvalid, 0, 0, false

-	}

-

-	nul := space + 1 + nulRel

-

-	ty, ok := objecttype.ParseName(string(data[:space]))

-	if !ok {

-		return objecttype.TypeInvalid, 0, 0, false

-	}

-

-	sizeBytes := data[space+1 : nul]

-	if len(sizeBytes) == 0 {

-		return objecttype.TypeInvalid, 0, 0, false

-	}

-

-	size, err := strconv.ParseInt(string(sizeBytes), 10, 64)

-	if err != nil || size < 0 {

-		return objecttype.TypeInvalid, 0, 0, false

-	}

-

-	return ty, size, nul + 1, true

-}

--- a/object/parse.go

+++ b/object/parse.go

@@ -3,7 +3,7 @@

 import (

 	"fmt"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objectid"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

@@ -12,7 +12,7 @@

 //

 //nolint:ireturn

 func ParseObjectWithHeader(raw []byte, algo objectid.Algorithm) (Object, error) {

-	ty, size, headerLen, ok := header.Parse(raw)

+	ty, size, headerLen, ok := objectheader.Parse(raw)

 	if !ok {

 		return nil, fmt.Errorf("object: malformed object header")

 	}

--- a/object/tag_serialize.go

+++ b/object/tag_serialize.go

@@ -5,7 +5,7 @@

 	"errors"

 	"fmt"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

@@ -55,7 +55,7 @@

 		return nil, err

 	}

-	header, ok := header.Encode(objecttype.TypeTag, int64(len(body)))

+	header, ok := objectheader.Encode(objecttype.TypeTag, int64(len(body)))

 	if !ok {

 		return nil, errors.New("object: tag: failed to encode object header")

 	}

--- a/object/tree_serialize.go

+++ b/object/tree_serialize.go

@@ -4,7 +4,7 @@

 	"errors"

 	"strconv"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

@@ -42,7 +42,7 @@

 		return nil, err

 	}

-	header, ok := header.Encode(objecttype.TypeTree, int64(len(body)))

+	header, ok := objectheader.Encode(objecttype.TypeTree, int64(len(body)))

 	if !ok {

 		return nil, errors.New("object: tree: failed to encode object header")

 	}

--- /dev/null

+++ b/objectheader/append.go

@@ -1,0 +1,29 @@

+package objectheader

+

+import (

+	"strconv"

+

+	"codeberg.org/lindenii/furgit/objecttype"

+)

+

+// Append appends a canonical loose-object header ("type size\\x00") to dst.

+func Append(dst []byte, ty objecttype.Type, size int64) ([]byte, bool) {

+	if size < 0 {

+		return nil, false

+	}

+

+	tyName, ok := objecttype.Name(ty)

+	if !ok {

+		return nil, false

+	}

+

+	sizeStr := strconv.FormatInt(size, 10)

+	out := make([]byte, 0, len(dst)+len(tyName)+len(sizeStr)+2)

+	out = append(out, dst...)

+	out = append(out, tyName...)

+	out = append(out, ' ')

+	out = append(out, sizeStr...)

+	out = append(out, 0)

+

+	return out, true

+}

--- /dev/null

+++ b/objectheader/encode.go

@@ -1,0 +1,8 @@

+package objectheader

+

+import "codeberg.org/lindenii/furgit/objecttype"

+

+// Encode returns a canonical loose-object header ("type size\\x00").

+func Encode(ty objecttype.Type, size int64) ([]byte, bool) {

+	return Append(nil, ty, size)

+}

--- /dev/null

+++ b/objectheader/parse.go

@@ -1,0 +1,43 @@

+// Package objectheader parses and serializes object headers ("type size\0").

+package objectheader

+

+import (

+	"bytes"

+	"strconv"

+

+	"codeberg.org/lindenii/furgit/objecttype"

+)

+

+// Parse parses a canonical loose-object header ("type size\\x00").

+// It returns the parsed type, size, bytes consumed (including trailing NUL),

+// and whether parsing succeeded.

+func Parse(data []byte) (objecttype.Type, int64, int, bool) {

+	space := bytes.IndexByte(data, ' ')

+	if space <= 0 {

+		return objecttype.TypeInvalid, 0, 0, false

+	}

+

+	nulRel := bytes.IndexByte(data[space+1:], 0)

+	if nulRel < 0 {

+		return objecttype.TypeInvalid, 0, 0, false

+	}

+

+	nul := space + 1 + nulRel

+

+	ty, ok := objecttype.ParseName(string(data[:space]))

+	if !ok {

+		return objecttype.TypeInvalid, 0, 0, false

+	}

+

+	sizeBytes := data[space+1 : nul]

+	if len(sizeBytes) == 0 {

+		return objecttype.TypeInvalid, 0, 0, false

+	}

+

+	size, err := strconv.ParseInt(string(sizeBytes), 10, 64)

+	if err != nil || size < 0 {

+		return objecttype.TypeInvalid, 0, 0, false

+	}

+

+	return ty, size, nul + 1, true

+}

--- a/objectstore/loose/helpers_test.go

+++ b/objectstore/loose/helpers_test.go

@@ -5,7 +5,7 @@

 	"testing"

 	"codeberg.org/lindenii/furgit/internal/testgit"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objectid"

 	"codeberg.org/lindenii/furgit/objectstore/loose"

 	"codeberg.org/lindenii/furgit/objecttype"

@@ -54,9 +54,9 @@

 	body := testRepo.CatFile(t, typeName, id)

-	header, ok := header.Encode(ty, int64(len(body)))

+	header, ok := objectheader.Encode(ty, int64(len(body)))

 	if !ok {

-		t.Fatalf("header.Encode failed")

+		t.Fatalf("objectheader.Encode failed")

 	}

 	raw := make([]byte, len(header)+len(body))

--- a/objectstore/loose/parse.go

+++ b/objectstore/loose/parse.go

@@ -7,7 +7,7 @@

 	"os"

 	"codeberg.org/lindenii/furgit/internal/compress/zlib"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

@@ -25,7 +25,7 @@

 // parseRaw parses a loose object payload in "type size\0content" format.

 func parseRaw(raw []byte) (objecttype.Type, []byte, error) {

-	ty, size, headerLen, ok := header.Parse(raw)

+	ty, size, headerLen, ok := objectheader.Parse(raw)

 	if !ok {

 		return objecttype.TypeInvalid, nil, errors.New("objectstore/loose: malformed object header")

 	}

@@ -41,15 +41,15 @@

 // readHeader reads and parses a loose object header from br, and returns

 // the raw header bytes including the trailing NUL.

 func readHeader(br *bufio.Reader) ([]byte, objecttype.Type, int64, error) {

-	h, err := br.ReadSlice(0)

+	header, err := br.ReadSlice(0)

 	if err != nil {

 		return nil, objecttype.TypeInvalid, 0, err

 	}

-	ty, size, _, ok := header.Parse(h)

+	ty, size, _, ok := objectheader.Parse(header)

 	if !ok {

 		return nil, objecttype.TypeInvalid, 0, errors.New("objectstore/loose: malformed object header")

 	}

-	return h, ty, size, nil

+	return header, ty, size, nil

 }

--- a/objectstore/loose/write_reader.go

+++ b/objectstore/loose/write_reader.go

@@ -4,7 +4,7 @@

 	"fmt"

 	"io"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objectid"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

@@ -18,7 +18,7 @@

 		return objectid.ObjectID{}, fmt.Errorf("objectstore/loose: negative content size: %d", size)

 	}

-	header, ok := header.Encode(ty, size)

+	header, ok := objectheader.Encode(ty, size)

 	if !ok {

 		return objectid.ObjectID{}, fmt.Errorf("objectstore/loose: failed to encode object header for type %v", ty)

 	}

--- a/objectstore/loose/write_test.go

+++ b/objectstore/loose/write_test.go

@@ -5,7 +5,7 @@

 	"testing"

 	"codeberg.org/lindenii/furgit/internal/testgit"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objectid"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

@@ -58,9 +58,9 @@

 		body := []byte("full-reader-body\n")

-		header, ok := header.Encode(objecttype.TypeBlob, int64(len(body)))

+		header, ok := objectheader.Encode(objecttype.TypeBlob, int64(len(body)))

 		if !ok {

-			t.Fatalf("header.Encode failed")

+			t.Fatalf("objectheader.Encode failed")

 		}

 		raw := make([]byte, len(header)+len(body))

--- a/objectstore/loose/write_writer_accept.go

+++ b/objectstore/loose/write_writer_accept.go

@@ -4,7 +4,7 @@

 	"bytes"

 	"errors"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 )

 // acceptFull validates and accounts raw full-object input.

@@ -15,7 +15,7 @@

 			headerChunkLen := nul + 1

 			writer.headerBuf = append(writer.headerBuf, src[:headerChunkLen]...)

-			_, size, _, ok := header.Parse(writer.headerBuf)

+			_, size, _, ok := objectheader.Parse(writer.headerBuf)

 			if !ok {

 				return errors.New("objectstore/loose: malformed object header")

 			}

--- a/objectstore/memory/add.go

+++ b/objectstore/memory/add.go

@@ -1,7 +1,7 @@

 package memory

 import (

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objectid"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

@@ -8,7 +8,7 @@

 // AddObject stores one object body and returns its object ID.

 func (store *Store) AddObject(ty objecttype.Type, body []byte) objectid.ObjectID {

-	header, ok := header.Encode(ty, int64(len(body)))

+	header, ok := objectheader.Encode(ty, int64(len(body)))

 	if !ok {

 		panic("failed to encode object header")

 	}

--- a/objectstore/memory/read_bytes.go

+++ b/objectstore/memory/read_bytes.go

@@ -1,7 +1,7 @@

 package memory

 import (

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objectid"

 	"codeberg.org/lindenii/furgit/objectstore"

 	"codeberg.org/lindenii/furgit/objecttype"

@@ -14,7 +14,7 @@

 		return nil, objectstore.ErrObjectNotFound

 	}

-	header, ok := header.Encode(obj.ty, int64(len(obj.content)))

+	header, ok := objectheader.Encode(obj.ty, int64(len(obj.content)))

 	if !ok {

 		panic("failed to encode object header")

 	}

--- a/objectstore/packed/helpers_test.go

+++ b/objectstore/packed/helpers_test.go

@@ -8,7 +8,7 @@

 	"testing"

 	"codeberg.org/lindenii/furgit/internal/testgit"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objectid"

 	"codeberg.org/lindenii/furgit/objectstore/packed"

 	"codeberg.org/lindenii/furgit/objecttype"

@@ -57,9 +57,9 @@

 	body := testRepo.CatFile(t, typeName, id)

-	header, ok := header.Encode(ty, int64(len(body)))

+	header, ok := objectheader.Encode(ty, int64(len(body)))

 	if !ok {

-		t.Fatalf("header.Encode failed")

+		t.Fatalf("objectheader.Encode failed")

 	}

 	raw := make([]byte, len(header)+len(body))

--- a/objectstore/packed/read_bytes.go

+++ b/objectstore/packed/read_bytes.go

@@ -3,7 +3,7 @@

 import (

 	"fmt"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objectid"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

@@ -25,7 +25,7 @@

 		return nil, err

 	}

-	header, ok := header.Encode(ty, int64(len(content)))

+	header, ok := objectheader.Encode(ty, int64(len(content)))

 	if !ok {

 		return nil, fmt.Errorf("objectstore/packed: failed to encode object header for type %d", ty)

 	}

--- a/objectstore/packed/read_reader.go

+++ b/objectstore/packed/read_reader.go

@@ -6,7 +6,7 @@

 	"io"

 	"codeberg.org/lindenii/furgit/internal/iolimit"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objectid"

 	"codeberg.org/lindenii/furgit/objecttype"

 	packfmt "codeberg.org/lindenii/furgit/packfile"

@@ -61,7 +61,7 @@

 	}

 	if packfmt.IsBaseObjectType(meta.ty) {

-		header, ok := header.Encode(meta.ty, meta.size)

+		header, ok := objectheader.Encode(meta.ty, meta.size)

 		if !ok {

 			return nil, fmt.Errorf("objectstore/packed: failed to encode object header for type %d", meta.ty)

 		}

--- a/packfile/ingest/drain.go

+++ b/packfile/ingest/drain.go

@@ -5,7 +5,7 @@

 	"io"

 	"codeberg.org/lindenii/furgit/internal/compress/zlib"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objectid"

 	"codeberg.org/lindenii/furgit/objecttype"

 	packfmt "codeberg.org/lindenii/furgit/packfile"

@@ -26,7 +26,7 @@

 	var total int64

 	if packfmt.IsBaseObjectType(record.packedType) {

-		header, ok := header.Encode(record.packedType, record.declaredSize)

+		header, ok := objectheader.Encode(record.packedType, record.declaredSize)

 		if !ok {

 			return 0, zero, &MalformedPackEntryError{Offset: record.offset, Reason: "encode object header"}

 		}

--- a/packfile/ingest/hash.go

+++ b/packfile/ingest/hash.go

@@ -3,7 +3,7 @@

 import (

 	"fmt"

-	"codeberg.org/lindenii/furgit/object/header"

+	"codeberg.org/lindenii/furgit/objectheader"

 	"codeberg.org/lindenii/furgit/objectid"

 	"codeberg.org/lindenii/furgit/objecttype"

 )

@@ -10,7 +10,7 @@

 // hashCanonicalObject hashes canonical object bytes (header+content).

 func hashCanonicalObject(algo objectid.Algorithm, ty objecttype.Type, content []byte) (objectid.ObjectID, error) {

-	header, ok := header.Encode(ty, int64(len(content)))

+	header, ok := objectheader.Encode(ty, int64(len(content)))

 	if !ok {

 		return objectid.ObjectID{}, fmt.Errorf("packfile/ingest: encode object header for type %d", ty)

 	}

-- 

⑨