From 27a695d781c2981328c2b7524c0fe8ade206cfe7 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Thu, 11 Jun 2026 06:52:04 +0000 Subject: object/typ: Remove Type prefix from object/typ.Type literals --- object/fetch/blob.go | 16 ++++++++-------- object/fetch/commit.go | 14 +++++++------- object/fetch/header.go | 2 +- object/fetch/tag.go | 2 +- object/fetch/tree.go | 16 ++++++++-------- object/fetch/treefs_test.go | 8 ++++---- 6 files changed, 29 insertions(+), 29 deletions(-) (limited to 'object/fetch') diff --git a/object/fetch/blob.go b/object/fetch/blob.go index 581fff90..9af34922 100644 --- a/object/fetch/blob.go +++ b/object/fetch/blob.go @@ -22,7 +22,7 @@ func (fetcher *Fetcher) ExactBlob(id oid.ObjectID) (*stored.Stored[*blob.Blob], blob, ok := parsed.(*blob.Blob) if !ok { - return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.TypeBlob} + return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.Blob} } return stored.New(id, blob), nil @@ -33,7 +33,7 @@ func (fetcher *Fetcher) ExactBlob(id oid.ObjectID) (*stored.Stored[*blob.Blob], // // Labels: Life-Parent, Close-Caller. func (fetcher *Fetcher) ExactBlobReader(id oid.ObjectID) (io.ReadCloser, uint64, error) { - return fetcher.exactReader(id, typ.TypeBlob) + return fetcher.exactReader(id, typ.Blob) } // PeelToBlob peels tags until it reaches a blob. @@ -52,7 +52,7 @@ func (fetcher *Fetcher) PeelToBlob(id oid.ObjectID) (*stored.Stored[*blob.Blob], case *tag.Tag: id = parsed.TargetID default: - return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.TypeBlob} + return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.Blob} } } } @@ -66,19 +66,19 @@ func (fetcher *Fetcher) PeelToBlobID(id oid.ObjectID) (oid.ObjectID, error) { } switch ty { - case typ.TypeBlob: + case typ.Blob: return id, nil - case typ.TypeTag: + case typ.Tag: tag, err := fetcher.ExactTag(id) if err != nil { return oid.ObjectID{}, err } id = tag.Object().TargetID - case typ.TypeUnknown, typ.TypeCommit, typ.TypeTree: - return oid.ObjectID{}, &errs.ObjectTypeError{OID: id, Got: ty, Want: typ.TypeBlob} + case typ.Unknown, typ.Commit, typ.Tree: + return oid.ObjectID{}, &errs.ObjectTypeError{OID: id, Got: ty, Want: typ.Blob} default: - return oid.ObjectID{}, &errs.ObjectTypeError{OID: id, Got: ty, Want: typ.TypeBlob} + return oid.ObjectID{}, &errs.ObjectTypeError{OID: id, Got: ty, Want: typ.Blob} } } } diff --git a/object/fetch/commit.go b/object/fetch/commit.go index 5d5af892..f6f308e8 100644 --- a/object/fetch/commit.go +++ b/object/fetch/commit.go @@ -20,7 +20,7 @@ func (fetcher *Fetcher) ExactCommit(id oid.ObjectID) (*stored.Stored[*commit.Com commit, ok := parsed.(*commit.Commit) if !ok { - return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.TypeCommit} + return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.Commit} } return stored.New(id, commit), nil @@ -42,7 +42,7 @@ func (fetcher *Fetcher) PeelToCommit(id oid.ObjectID) (*stored.Stored[*commit.Co case *tag.Tag: id = parsed.TargetID default: - return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.TypeCommit} + return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.Commit} } } } @@ -56,19 +56,19 @@ func (fetcher *Fetcher) PeelToCommitID(id oid.ObjectID) (oid.ObjectID, error) { } switch ty { - case typ.TypeCommit: + case typ.Commit: return id, nil - case typ.TypeTag: + case typ.Tag: tag, err := fetcher.ExactTag(id) if err != nil { return oid.ObjectID{}, err } id = tag.Object().TargetID - case typ.TypeUnknown, typ.TypeTree, typ.TypeBlob: - return oid.ObjectID{}, &errs.ObjectTypeError{OID: id, Got: ty, Want: typ.TypeCommit} + case typ.Unknown, typ.Tree, typ.Blob: + return oid.ObjectID{}, &errs.ObjectTypeError{OID: id, Got: ty, Want: typ.Commit} default: - return oid.ObjectID{}, &errs.ObjectTypeError{OID: id, Got: ty, Want: typ.TypeCommit} + return oid.ObjectID{}, &errs.ObjectTypeError{OID: id, Got: ty, Want: typ.Commit} } } } diff --git a/object/fetch/header.go b/object/fetch/header.go index d8cc7644..7a8df483 100644 --- a/object/fetch/header.go +++ b/object/fetch/header.go @@ -11,7 +11,7 @@ import ( func (fetcher *Fetcher) Header(id oid.ObjectID) (typ.Type, uint64, error) { ty, size, err := fetcher.store.ReadHeader(id) if err != nil { - return typ.TypeUnknown, 0, wrapObjectReadError(id, err) + return typ.Unknown, 0, wrapObjectReadError(id, err) } return ty, size, nil diff --git a/object/fetch/tag.go b/object/fetch/tag.go index 326244d8..205bb127 100644 --- a/object/fetch/tag.go +++ b/object/fetch/tag.go @@ -19,7 +19,7 @@ func (fetcher *Fetcher) ExactTag(id oid.ObjectID) (*stored.Stored[*tag.Tag], err tag, ok := parsed.(*tag.Tag) if !ok { - return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.TypeTag} + return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.Tag} } return stored.New(id, tag), nil diff --git a/object/fetch/tree.go b/object/fetch/tree.go index add41274..9ac3875f 100644 --- a/object/fetch/tree.go +++ b/object/fetch/tree.go @@ -21,7 +21,7 @@ func (fetcher *Fetcher) ExactTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], tree, ok := parsed.(*tree.Tree) if !ok { - return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.TypeTree} + return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.Tree} } return stored.New(id, tree), nil @@ -46,7 +46,7 @@ func (fetcher *Fetcher) PeelToTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], case *tag.Tag: id = parsed.TargetID default: - return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.TypeTree} + return nil, &errs.ObjectTypeError{OID: id, Got: parsed.ObjectType(), Want: typ.Tree} } } } @@ -61,26 +61,26 @@ func (fetcher *Fetcher) PeelToTreeID(id oid.ObjectID) (oid.ObjectID, error) { } switch ty { - case typ.TypeTree: + case typ.Tree: return id, nil - case typ.TypeCommit: + case typ.Commit: commit, err := fetcher.ExactCommit(id) if err != nil { return oid.ObjectID{}, err } return commit.Object().Tree, nil - case typ.TypeTag: + case typ.Tag: tag, err := fetcher.ExactTag(id) if err != nil { return oid.ObjectID{}, err } id = tag.Object().TargetID - case typ.TypeUnknown, typ.TypeBlob: - return oid.ObjectID{}, &errs.ObjectTypeError{OID: id, Got: ty, Want: typ.TypeTree} + case typ.Unknown, typ.Blob: + return oid.ObjectID{}, &errs.ObjectTypeError{OID: id, Got: ty, Want: typ.Tree} default: - return oid.ObjectID{}, &errs.ObjectTypeError{OID: id, Got: ty, Want: typ.TypeTree} + return oid.ObjectID{}, &errs.ObjectTypeError{OID: id, Got: ty, Want: typ.Tree} } } } diff --git a/object/fetch/treefs_test.go b/object/fetch/treefs_test.go index 73f1c591..ba292276 100644 --- a/object/fetch/treefs_test.go +++ b/object/fetch/treefs_test.go @@ -24,12 +24,12 @@ func TestTreeFS(t *testing.T) { store := memory.New(objectFormat) - plainID, err := store.WriteBytesContent(typ.TypeBlob, []byte("plain\n")) + plainID, err := store.WriteBytesContent(typ.Blob, []byte("plain\n")) if err != nil { t.Fatalf("WriteBytesContent(plain.txt): %v", err) } - execID, err := store.WriteBytesContent(typ.TypeBlob, []byte("#!/bin/sh\nexit 0\n")) + execID, err := store.WriteBytesContent(typ.Blob, []byte("#!/bin/sh\nexit 0\n")) if err != nil { t.Fatalf("WriteBytesContent(exec.sh): %v", err) } @@ -133,7 +133,7 @@ func writeTree(t *testing.T, store *memory.Memory, entries []tree.Entry) id.Obje t.Fatalf("tree.AppendWithoutHeader: %v", err) } - treeID, err := store.WriteBytesContent(typ.TypeTree, body) + treeID, err := store.WriteBytesContent(typ.Tree, body) if err != nil { t.Fatalf("WriteBytesContent(tree): %v", err) } @@ -163,7 +163,7 @@ func writeCommit(t *testing.T, store *memory.Memory, tree id.ObjectID) id.Object t.Fatalf("commit.AppendWithoutHeader: %v", err) } - commitID, err := store.WriteBytesContent(typ.TypeCommit, body) + commitID, err := store.WriteBytesContent(typ.Commit, body) if err != nil { t.Fatalf("WriteBytesContent(commit): %v", err) } -- cgit v1.3.1-10-gc9f91