From 7d9c128ce04875f970c78673500c0a492000398f Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Wed, 25 Mar 2026 14:21:09 +0000 Subject: *: objecttype, objectheader -> object/type, object/header --- packfile/entry.go | 2 +- packfile/entry_header.go | 2 +- packfile/ingest/cache.go | 2 +- packfile/ingest/drain.go | 4 ++-- packfile/ingest/entry.go | 2 +- packfile/ingest/entry_header.go | 2 +- packfile/ingest/entry_prefix.go | 2 +- packfile/ingest/hash.go | 4 ++-- packfile/ingest/record_content.go | 2 +- packfile/ingest/record_delta.go | 2 +- packfile/ingest/record_resolve.go | 2 +- packfile/ingest/records.go | 2 +- packfile/ingest/thin_append.go | 2 +- packfile/ingest/thin_unresolved.go | 2 +- packfile/object_type.go | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) (limited to 'packfile') diff --git a/packfile/entry.go b/packfile/entry.go index 158cf9ce..0f9c7c8d 100644 --- a/packfile/entry.go +++ b/packfile/entry.go @@ -3,7 +3,7 @@ package packfile import ( "fmt" - "codeberg.org/lindenii/furgit/objecttype" + objecttype "codeberg.org/lindenii/furgit/object/type" ) // Entry is one parsed pack entry prefix, including any delta base reference diff --git a/packfile/entry_header.go b/packfile/entry_header.go index b7f8e79c..05664268 100644 --- a/packfile/entry_header.go +++ b/packfile/entry_header.go @@ -3,7 +3,7 @@ package packfile import ( "fmt" - "codeberg.org/lindenii/furgit/objecttype" + objecttype "codeberg.org/lindenii/furgit/object/type" ) // EntryHeader is one parsed pack entry header prefix. diff --git a/packfile/ingest/cache.go b/packfile/ingest/cache.go index 3b4bf31a..9a15f55f 100644 --- a/packfile/ingest/cache.go +++ b/packfile/ingest/cache.go @@ -2,7 +2,7 @@ package ingest import ( "codeberg.org/lindenii/furgit/internal/lru" - "codeberg.org/lindenii/furgit/objecttype" + objecttype "codeberg.org/lindenii/furgit/object/type" ) // deltaBaseCacheKey identifies one resolved base by record index. diff --git a/packfile/ingest/drain.go b/packfile/ingest/drain.go index ce04fcb4..d37c714e 100644 --- a/packfile/ingest/drain.go +++ b/packfile/ingest/drain.go @@ -5,9 +5,9 @@ import ( "io" "codeberg.org/lindenii/furgit/internal/compress/zlib" - "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/packfile/ingest/entry.go b/packfile/ingest/entry.go index 01be318d..da063e68 100644 --- a/packfile/ingest/entry.go +++ b/packfile/ingest/entry.go @@ -3,7 +3,7 @@ package ingest import ( "fmt" - "codeberg.org/lindenii/furgit/objecttype" + objecttype "codeberg.org/lindenii/furgit/object/type" packfmt "codeberg.org/lindenii/furgit/packfile" ) diff --git a/packfile/ingest/entry_header.go b/packfile/ingest/entry_header.go index 54f63fac..c74fdc16 100644 --- a/packfile/ingest/entry_header.go +++ b/packfile/ingest/entry_header.go @@ -2,7 +2,7 @@ package ingest import ( "codeberg.org/lindenii/furgit/internal/intconv" - "codeberg.org/lindenii/furgit/objecttype" + objecttype "codeberg.org/lindenii/furgit/object/type" ) // encodePackEntryHeader encodes one non-delta packed entry header. diff --git a/packfile/ingest/entry_prefix.go b/packfile/ingest/entry_prefix.go index 85493798..f2da8c9c 100644 --- a/packfile/ingest/entry_prefix.go +++ b/packfile/ingest/entry_prefix.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" ) // parseEntryPrefix parses one entry prefix from stream. diff --git a/packfile/ingest/hash.go b/packfile/ingest/hash.go index 83df55c5..bb8fd2b4 100644 --- a/packfile/ingest/hash.go +++ b/packfile/ingest/hash.go @@ -3,9 +3,9 @@ package ingest 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" ) // hashCanonicalObject hashes canonical object bytes (header+content). diff --git a/packfile/ingest/record_content.go b/packfile/ingest/record_content.go index 05972b22..4109bc01 100644 --- a/packfile/ingest/record_content.go +++ b/packfile/ingest/record_content.go @@ -3,7 +3,7 @@ package ingest import ( "fmt" - "codeberg.org/lindenii/furgit/objecttype" + objecttype "codeberg.org/lindenii/furgit/object/type" packfmt "codeberg.org/lindenii/furgit/packfile" ) diff --git a/packfile/ingest/record_delta.go b/packfile/ingest/record_delta.go index a28fcabc..f1637f5c 100644 --- a/packfile/ingest/record_delta.go +++ b/packfile/ingest/record_delta.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" ) // applyDeltaRecord applies one delta record onto base content. diff --git a/packfile/ingest/record_resolve.go b/packfile/ingest/record_resolve.go index 1eec1858..5bff18ab 100644 --- a/packfile/ingest/record_resolve.go +++ b/packfile/ingest/record_resolve.go @@ -3,7 +3,7 @@ package ingest import ( "fmt" - "codeberg.org/lindenii/furgit/objecttype" + objecttype "codeberg.org/lindenii/furgit/object/type" packfmt "codeberg.org/lindenii/furgit/packfile" ) diff --git a/packfile/ingest/records.go b/packfile/ingest/records.go index 06b7f708..27150af6 100644 --- a/packfile/ingest/records.go +++ b/packfile/ingest/records.go @@ -2,7 +2,7 @@ package ingest import ( "codeberg.org/lindenii/furgit/objectid" - "codeberg.org/lindenii/furgit/objecttype" + objecttype "codeberg.org/lindenii/furgit/object/type" ) // objectRecord stores metadata for one packed object entry. diff --git a/packfile/ingest/thin_append.go b/packfile/ingest/thin_append.go index 161f00a9..c0883d81 100644 --- a/packfile/ingest/thin_append.go +++ b/packfile/ingest/thin_append.go @@ -7,7 +7,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" ) // appendBaseObject appends one base object as a new packed non-delta entry. diff --git a/packfile/ingest/thin_unresolved.go b/packfile/ingest/thin_unresolved.go index 347f3f29..72433878 100644 --- a/packfile/ingest/thin_unresolved.go +++ b/packfile/ingest/thin_unresolved.go @@ -5,7 +5,7 @@ import ( "slices" "codeberg.org/lindenii/furgit/objectid" - "codeberg.org/lindenii/furgit/objecttype" + objecttype "codeberg.org/lindenii/furgit/object/type" ) // unresolvedThinBaseIDs returns sorted unique unresolved ref base IDs. diff --git a/packfile/object_type.go b/packfile/object_type.go index 559222ba..8382baa9 100644 --- a/packfile/object_type.go +++ b/packfile/object_type.go @@ -1,6 +1,6 @@ package packfile -import "codeberg.org/lindenii/furgit/objecttype" +import objecttype "codeberg.org/lindenii/furgit/object/type" // IsBaseObjectType reports whether ty is one of the four canonical object // types encoded directly in pack entries. -- cgit v1.3.1-10-gc9f91