From ded805020da7aa309dc07a51c9d219deb29e83f5 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Wed, 25 Mar 2026 14:22:09 +0000 Subject: *: Resort import order --- cmd/show-object/main.go | 2 +- commitquery/ancestor_unit_test.go | 2 +- commitquery/mergebase_unit_test.go | 2 +- commitquery/oid.go | 2 +- diff/trees/diff_test.go | 2 +- internal/peel/peel.go | 2 +- object/resolve/exact_blob.go | 2 +- object/resolve/exact_commit.go | 2 +- object/resolve/exact_object.go | 2 +- object/resolve/exact_tag.go | 2 +- object/resolve/exact_tree.go | 2 +- object/resolve/peel_to_blob.go | 2 +- object/resolve/peel_to_commit.go | 2 +- object/resolve/peel_to_tag.go | 2 +- object/resolve/peel_to_tree.go | 2 +- object/resolve/treefs_test.go | 2 +- objectstore/chain/bytes.go | 2 +- objectstore/chain/header.go | 2 +- objectstore/chain/reader.go | 2 +- objectstore/loose/helpers_test.go | 2 +- objectstore/loose/read_test.go | 2 +- objectstore/memory/read_bytes.go | 2 +- objectstore/memory/read_header.go | 2 +- objectstore/mix/bytes.go | 2 +- objectstore/mix/header.go | 2 +- objectstore/mix/reader.go | 2 +- objectstore/packed/helpers_test.go | 2 +- reachability/helpers.go | 2 +- reachability/unit_test.go | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cmd/show-object/main.go b/cmd/show-object/main.go index d181bfca..e5340aa4 100644 --- a/cmd/show-object/main.go +++ b/cmd/show-object/main.go @@ -9,8 +9,8 @@ import ( "strings" "codeberg.org/lindenii/furgit/object" - "codeberg.org/lindenii/furgit/object/stored" objectid "codeberg.org/lindenii/furgit/object/id" + "codeberg.org/lindenii/furgit/object/stored" objecttype "codeberg.org/lindenii/furgit/object/type" "codeberg.org/lindenii/furgit/repository" ) diff --git a/commitquery/ancestor_unit_test.go b/commitquery/ancestor_unit_test.go index 20a81313..6cad71aa 100644 --- a/commitquery/ancestor_unit_test.go +++ b/commitquery/ancestor_unit_test.go @@ -9,8 +9,8 @@ import ( "codeberg.org/lindenii/furgit/internal/testgit" "codeberg.org/lindenii/furgit/object" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore/memory" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore/memory" "codeberg.org/lindenii/furgit/commitquery" ) diff --git a/commitquery/mergebase_unit_test.go b/commitquery/mergebase_unit_test.go index bedd936d..9ae8dae2 100644 --- a/commitquery/mergebase_unit_test.go +++ b/commitquery/mergebase_unit_test.go @@ -12,8 +12,8 @@ import ( "codeberg.org/lindenii/furgit/internal/testgit" "codeberg.org/lindenii/furgit/object" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore/memory" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore/memory" ) // commitBody serializes one minimal commit body. diff --git a/commitquery/oid.go b/commitquery/oid.go index c6c8d23a..897b8176 100644 --- a/commitquery/oid.go +++ b/commitquery/oid.go @@ -8,8 +8,8 @@ import ( "codeberg.org/lindenii/furgit/internal/peel" "codeberg.org/lindenii/furgit/object" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore" ) func (query *Query) id(idx nodeIndex) objectid.ObjectID { diff --git a/diff/trees/diff_test.go b/diff/trees/diff_test.go index b5c486c9..4c75d487 100644 --- a/diff/trees/diff_test.go +++ b/diff/trees/diff_test.go @@ -8,8 +8,8 @@ import ( "codeberg.org/lindenii/furgit/internal/testgit" "codeberg.org/lindenii/furgit/object" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore/loose" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore/loose" ) func TestDiffComplexNestedChanges(t *testing.T) { diff --git a/internal/peel/peel.go b/internal/peel/peel.go index 2f27d410..9114c5be 100644 --- a/internal/peel/peel.go +++ b/internal/peel/peel.go @@ -7,8 +7,8 @@ import ( giterrors "codeberg.org/lindenii/furgit/errors" "codeberg.org/lindenii/furgit/object" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore" ) // ToCommit peels annotated tags transitively until a commit is reached. diff --git a/object/resolve/exact_blob.go b/object/resolve/exact_blob.go index 6447f06e..07501513 100644 --- a/object/resolve/exact_blob.go +++ b/object/resolve/exact_blob.go @@ -4,8 +4,8 @@ import ( "fmt" "codeberg.org/lindenii/furgit/object" - "codeberg.org/lindenii/furgit/object/stored" objectid "codeberg.org/lindenii/furgit/object/id" + "codeberg.org/lindenii/furgit/object/stored" ) // ExactBlob reads, parses, and wraps the blob at id. diff --git a/object/resolve/exact_commit.go b/object/resolve/exact_commit.go index 67538d79..ba76baa2 100644 --- a/object/resolve/exact_commit.go +++ b/object/resolve/exact_commit.go @@ -4,8 +4,8 @@ import ( "fmt" "codeberg.org/lindenii/furgit/object" - "codeberg.org/lindenii/furgit/object/stored" objectid "codeberg.org/lindenii/furgit/object/id" + "codeberg.org/lindenii/furgit/object/stored" ) // ExactCommit reads, parses, and wraps the commit at id. diff --git a/object/resolve/exact_object.go b/object/resolve/exact_object.go index 48a88c5b..db6165f4 100644 --- a/object/resolve/exact_object.go +++ b/object/resolve/exact_object.go @@ -2,8 +2,8 @@ package resolve import ( "codeberg.org/lindenii/furgit/object" - "codeberg.org/lindenii/furgit/object/stored" objectid "codeberg.org/lindenii/furgit/object/id" + "codeberg.org/lindenii/furgit/object/stored" ) // ExactObject reads, parses, and wraps the object at id without constraining diff --git a/object/resolve/exact_tag.go b/object/resolve/exact_tag.go index 89706b48..26bf2b11 100644 --- a/object/resolve/exact_tag.go +++ b/object/resolve/exact_tag.go @@ -4,8 +4,8 @@ import ( "fmt" "codeberg.org/lindenii/furgit/object" - "codeberg.org/lindenii/furgit/object/stored" objectid "codeberg.org/lindenii/furgit/object/id" + "codeberg.org/lindenii/furgit/object/stored" ) // ExactTag reads, parses, and wraps the tag at id. diff --git a/object/resolve/exact_tree.go b/object/resolve/exact_tree.go index 9dbd8df8..aaf40236 100644 --- a/object/resolve/exact_tree.go +++ b/object/resolve/exact_tree.go @@ -4,8 +4,8 @@ import ( "fmt" "codeberg.org/lindenii/furgit/object" - "codeberg.org/lindenii/furgit/object/stored" objectid "codeberg.org/lindenii/furgit/object/id" + "codeberg.org/lindenii/furgit/object/stored" ) // ExactTree reads, parses, and wraps the tree at id. diff --git a/object/resolve/peel_to_blob.go b/object/resolve/peel_to_blob.go index 0e727f6f..424e309f 100644 --- a/object/resolve/peel_to_blob.go +++ b/object/resolve/peel_to_blob.go @@ -4,8 +4,8 @@ import ( "fmt" "codeberg.org/lindenii/furgit/object" - "codeberg.org/lindenii/furgit/object/stored" objectid "codeberg.org/lindenii/furgit/object/id" + "codeberg.org/lindenii/furgit/object/stored" ) // PeelToBlob peels tags until it reaches a blob. diff --git a/object/resolve/peel_to_commit.go b/object/resolve/peel_to_commit.go index d548c48f..355a3055 100644 --- a/object/resolve/peel_to_commit.go +++ b/object/resolve/peel_to_commit.go @@ -4,8 +4,8 @@ import ( "fmt" "codeberg.org/lindenii/furgit/object" - "codeberg.org/lindenii/furgit/object/stored" objectid "codeberg.org/lindenii/furgit/object/id" + "codeberg.org/lindenii/furgit/object/stored" ) // PeelToCommit peels tags until it reaches a commit. diff --git a/object/resolve/peel_to_tag.go b/object/resolve/peel_to_tag.go index 97a5f2fc..6f61d7e1 100644 --- a/object/resolve/peel_to_tag.go +++ b/object/resolve/peel_to_tag.go @@ -2,8 +2,8 @@ package resolve import ( "codeberg.org/lindenii/furgit/object" - "codeberg.org/lindenii/furgit/object/stored" objectid "codeberg.org/lindenii/furgit/object/id" + "codeberg.org/lindenii/furgit/object/stored" ) // PeelToTag returns the tag at id without further peeling. diff --git a/object/resolve/peel_to_tree.go b/object/resolve/peel_to_tree.go index e8d60b76..3b12bdd8 100644 --- a/object/resolve/peel_to_tree.go +++ b/object/resolve/peel_to_tree.go @@ -4,8 +4,8 @@ import ( "fmt" "codeberg.org/lindenii/furgit/object" - "codeberg.org/lindenii/furgit/object/stored" objectid "codeberg.org/lindenii/furgit/object/id" + "codeberg.org/lindenii/furgit/object/stored" ) // PeelToTree peels tags until it reaches a tree or commit. If it reaches a diff --git a/object/resolve/treefs_test.go b/object/resolve/treefs_test.go index c337a7cd..a22e5019 100644 --- a/object/resolve/treefs_test.go +++ b/object/resolve/treefs_test.go @@ -7,8 +7,8 @@ import ( "codeberg.org/lindenii/furgit/internal/testgit" "codeberg.org/lindenii/furgit/object" - "codeberg.org/lindenii/furgit/object/resolve" objectid "codeberg.org/lindenii/furgit/object/id" + "codeberg.org/lindenii/furgit/object/resolve" "codeberg.org/lindenii/furgit/repository" ) diff --git a/objectstore/chain/bytes.go b/objectstore/chain/bytes.go index 83d8957b..ac537e99 100644 --- a/objectstore/chain/bytes.go +++ b/objectstore/chain/bytes.go @@ -5,8 +5,8 @@ import ( "fmt" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore" ) // 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 44a365a5..3e7d6dd4 100644 --- a/objectstore/chain/header.go +++ b/objectstore/chain/header.go @@ -5,8 +5,8 @@ import ( "fmt" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore" ) // 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 d68f9965..dc71c5fd 100644 --- a/objectstore/chain/reader.go +++ b/objectstore/chain/reader.go @@ -6,8 +6,8 @@ import ( "io" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore" ) // 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 f46147d2..686bbd88 100644 --- a/objectstore/loose/helpers_test.go +++ b/objectstore/loose/helpers_test.go @@ -8,8 +8,8 @@ import ( "codeberg.org/lindenii/furgit/internal/testgit" objectheader "codeberg.org/lindenii/furgit/object/header" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore/loose" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore/loose" ) func openLooseStore(t *testing.T, testRepo *testgit.TestRepo, algo objectid.Algorithm) *loose.Store { diff --git a/objectstore/loose/read_test.go b/objectstore/loose/read_test.go index 68b2d75b..515a6dbc 100644 --- a/objectstore/loose/read_test.go +++ b/objectstore/loose/read_test.go @@ -9,9 +9,9 @@ import ( "codeberg.org/lindenii/furgit/internal/testgit" objectid "codeberg.org/lindenii/furgit/object/id" + objecttype "codeberg.org/lindenii/furgit/object/type" "codeberg.org/lindenii/furgit/objectstore" "codeberg.org/lindenii/furgit/objectstore/loose" - objecttype "codeberg.org/lindenii/furgit/object/type" ) func TestLooseStoreReadAgainstGit(t *testing.T) { diff --git a/objectstore/memory/read_bytes.go b/objectstore/memory/read_bytes.go index 5ce7dc9e..2fc31726 100644 --- a/objectstore/memory/read_bytes.go +++ b/objectstore/memory/read_bytes.go @@ -3,8 +3,8 @@ package memory import ( objectheader "codeberg.org/lindenii/furgit/object/header" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore" ) // ReadBytesFull reads one full object, including the object header. diff --git a/objectstore/memory/read_header.go b/objectstore/memory/read_header.go index cd987cfe..3d5b01b7 100644 --- a/objectstore/memory/read_header.go +++ b/objectstore/memory/read_header.go @@ -2,8 +2,8 @@ package memory import ( objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore" ) // ReadHeader reads one object header. diff --git a/objectstore/mix/bytes.go b/objectstore/mix/bytes.go index e81fa88c..fcd7b058 100644 --- a/objectstore/mix/bytes.go +++ b/objectstore/mix/bytes.go @@ -5,8 +5,8 @@ import ( "fmt" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore" ) // 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 05d93353..5cc17c81 100644 --- a/objectstore/mix/header.go +++ b/objectstore/mix/header.go @@ -5,8 +5,8 @@ import ( "fmt" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore" ) // ReadHeader reads object header data from one backend that has it. diff --git a/objectstore/mix/reader.go b/objectstore/mix/reader.go index 6d099c6b..1d569ee1 100644 --- a/objectstore/mix/reader.go +++ b/objectstore/mix/reader.go @@ -6,8 +6,8 @@ import ( "io" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore" ) // ReadReaderFull reads a full serialized object stream from one backend that diff --git a/objectstore/packed/helpers_test.go b/objectstore/packed/helpers_test.go index 9d85e095..7d4d696d 100644 --- a/objectstore/packed/helpers_test.go +++ b/objectstore/packed/helpers_test.go @@ -10,8 +10,8 @@ import ( "codeberg.org/lindenii/furgit/internal/testgit" objectheader "codeberg.org/lindenii/furgit/object/header" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore/packed" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore/packed" ) func openPackedStore(t *testing.T, testRepo *testgit.TestRepo, algo objectid.Algorithm) *packed.Store { diff --git a/reachability/helpers.go b/reachability/helpers.go index e7f4a5a3..ebed8d7e 100644 --- a/reachability/helpers.go +++ b/reachability/helpers.go @@ -6,8 +6,8 @@ import ( giterrors "codeberg.org/lindenii/furgit/errors" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore" ) func validateDomain(domain Domain) error { diff --git a/reachability/unit_test.go b/reachability/unit_test.go index 249b870c..185ca3be 100644 --- a/reachability/unit_test.go +++ b/reachability/unit_test.go @@ -11,8 +11,8 @@ import ( "codeberg.org/lindenii/furgit/internal/testgit" "codeberg.org/lindenii/furgit/object" objectid "codeberg.org/lindenii/furgit/object/id" - "codeberg.org/lindenii/furgit/objectstore/memory" objecttype "codeberg.org/lindenii/furgit/object/type" + "codeberg.org/lindenii/furgit/objectstore/memory" "codeberg.org/lindenii/furgit/reachability" ) -- cgit v1.3.1-10-gc9f91