aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd/show-object/main.go32
-rw-r--r--object/stored/blob.go (renamed from objectstored/blob.go)2
-rw-r--r--object/stored/commit.go (renamed from objectstored/commit.go)2
-rw-r--r--object/stored/object.go (renamed from objectstored/object.go)2
-rw-r--r--object/stored/objectstored.go (renamed from objectstored/objectstored.go)2
-rw-r--r--object/stored/stored.go2
-rw-r--r--object/stored/tree.go (renamed from objectstored/tree.go)2
-rw-r--r--objectstored/stored.go2
-rw-r--r--repository/stored.go44
-rw-r--r--repository/tree.go4
10 files changed, 47 insertions, 47 deletions
diff --git a/cmd/show-object/main.go b/cmd/show-object/main.go
index 94978db6..b50929a0 100644
--- a/cmd/show-object/main.go
+++ b/cmd/show-object/main.go
@@ -8,8 +8,8 @@ import (
"os"
"strings"
+ "codeberg.org/lindenii/furgit/object/stored"
"codeberg.org/lindenii/furgit/objectid"
- "codeberg.org/lindenii/furgit/objectstored"
"codeberg.org/lindenii/furgit/objecttype"
"codeberg.org/lindenii/furgit/repository"
)
@@ -50,14 +50,14 @@ func run(repoPath, name *string) error {
return fmt.Errorf("resolve %q: %w", *name, err)
}
- stored, err := repo.ReadStored(id)
+ s, err := repo.ReadStored(id)
if err != nil {
_ = repo.Close()
return fmt.Errorf("read object %s: %w", id, err)
}
- printStored(stored)
+ printStored(s)
err = repo.Close()
if err != nil {
@@ -81,11 +81,11 @@ func resolveInput(repo *repository.Repository, input string) (objectid.ObjectID,
return resolved.ID, nil
}
-func printStored(stored objectstored.StoredObject) {
+func printStored(s stored.StoredObject) {
var b strings.Builder
- id := stored.ID()
- ty := stored.Object().ObjectType()
+ id := s.ID()
+ ty := s.Object().ObjectType()
tyName, ok := objecttype.Name(ty)
if !ok {
@@ -95,20 +95,20 @@ func printStored(stored objectstored.StoredObject) {
fmt.Fprintf(&b, "id: %s\n", id)
fmt.Fprintf(&b, "type: %s\n", tyName)
- switch stored := stored.(type) {
- case *objectstored.StoredBlob:
- blob := stored.Blob()
+ switch s := s.(type) {
+ case *stored.StoredBlob:
+ blob := s.Blob()
fmt.Fprintf(&b, "size: %d\n", len(blob.Data))
fmt.Fprintf(&b, "data: %q\n", string(blob.Data))
- case *objectstored.StoredTree:
- tree := stored.Tree()
+ case *stored.StoredTree:
+ tree := s.Tree()
fmt.Fprintf(&b, "entries: %d\n", len(tree.Entries))
for _, entry := range tree.Entries {
fmt.Fprintf(&b, "%06o %s\t%s\n", entry.Mode, entry.ID, entry.Name)
}
- case *objectstored.StoredCommit:
- commit := stored.Commit()
+ case *stored.StoredCommit:
+ commit := s.Commit()
fmt.Fprintf(&b, "tree: %s\n", commit.Tree)
for _, parent := range commit.Parents {
@@ -118,8 +118,8 @@ func printStored(stored objectstored.StoredObject) {
fmt.Fprintf(&b, "author: %s <%s>\n", commit.Author.Name, commit.Author.Email)
fmt.Fprintf(&b, "committer: %s <%s>\n", commit.Committer.Name, commit.Committer.Email)
fmt.Fprintf(&b, "message:\n%s\n", string(commit.Message))
- case *objectstored.StoredTag:
- tag := stored.Tag()
+ case *stored.StoredTag:
+ tag := s.Tag()
targetTy, ok := objecttype.Name(tag.TargetType)
if !ok {
@@ -135,7 +135,7 @@ func printStored(stored objectstored.StoredObject) {
fmt.Fprintf(&b, "message:\n%s\n", string(tag.Message))
default:
- fmt.Fprintf(&b, "%#v\n", stored.Object())
+ fmt.Fprintf(&b, "%#v\n", s.Object())
}
_, _ = os.Stdout.WriteString(b.String())
diff --git a/objectstored/blob.go b/object/stored/blob.go
index 26584ce5..4b3b6b74 100644
--- a/objectstored/blob.go
+++ b/object/stored/blob.go
@@ -1,4 +1,4 @@
-package objectstored
+package stored
import (
"codeberg.org/lindenii/furgit/object"
diff --git a/objectstored/commit.go b/object/stored/commit.go
index 0bcd1e3f..880ba40c 100644
--- a/objectstored/commit.go
+++ b/object/stored/commit.go
@@ -1,4 +1,4 @@
-package objectstored
+package stored
import (
"codeberg.org/lindenii/furgit/object"
diff --git a/objectstored/object.go b/object/stored/object.go
index 8099ddcd..c0a0db8f 100644
--- a/objectstored/object.go
+++ b/object/stored/object.go
@@ -1,4 +1,4 @@
-package objectstored
+package stored
import (
"codeberg.org/lindenii/furgit/object"
diff --git a/objectstored/objectstored.go b/object/stored/objectstored.go
index f50b27ee..ff7d516a 100644
--- a/objectstored/objectstored.go
+++ b/object/stored/objectstored.go
@@ -1,4 +1,4 @@
-package objectstored
+package stored
import (
"codeberg.org/lindenii/furgit/object"
diff --git a/object/stored/stored.go b/object/stored/stored.go
new file mode 100644
index 00000000..588b1726
--- /dev/null
+++ b/object/stored/stored.go
@@ -0,0 +1,2 @@
+// Package stored wraps parsed objects with their storage object IDs.
+package stored
diff --git a/objectstored/tree.go b/object/stored/tree.go
index 3c6e53de..a54c1f6e 100644
--- a/objectstored/tree.go
+++ b/object/stored/tree.go
@@ -1,4 +1,4 @@
-package objectstored
+package stored
import (
"codeberg.org/lindenii/furgit/object"
diff --git a/objectstored/stored.go b/objectstored/stored.go
deleted file mode 100644
index 96060295..00000000
--- a/objectstored/stored.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// Package objectstored wraps parsed objects with their storage object IDs.
-package objectstored
diff --git a/repository/stored.go b/repository/stored.go
index d7ee5267..ca782cea 100644
--- a/repository/stored.go
+++ b/repository/stored.go
@@ -4,15 +4,15 @@ import (
"fmt"
"codeberg.org/lindenii/furgit/object"
+ "codeberg.org/lindenii/furgit/object/stored"
"codeberg.org/lindenii/furgit/objectid"
- "codeberg.org/lindenii/furgit/objectstored"
"codeberg.org/lindenii/furgit/objecttype"
)
// ReadStored reads, parses, and wraps one object by ID.
//
//nolint:ireturn
-func (repo *Repository) ReadStored(id objectid.ObjectID) (objectstored.StoredObject, error) {
+func (repo *Repository) ReadStored(id objectid.ObjectID) (stored.StoredObject, error) {
parsed, err := repo.readParsedObject(id)
if err != nil {
return nil, err
@@ -20,73 +20,73 @@ func (repo *Repository) ReadStored(id objectid.ObjectID) (objectstored.StoredObj
switch parsed := parsed.(type) {
case *object.Blob:
- return objectstored.NewStoredBlob(id, parsed), nil
+ return stored.NewStoredBlob(id, parsed), nil
case *object.Tree:
- return objectstored.NewStoredTree(id, parsed), nil
+ return stored.NewStoredTree(id, parsed), nil
case *object.Commit:
- return objectstored.NewStoredCommit(id, parsed), nil
+ return stored.NewStoredCommit(id, parsed), nil
case *object.Tag:
- return objectstored.NewStoredTag(id, parsed), nil
+ return stored.NewStoredTag(id, parsed), nil
default:
return nil, fmt.Errorf("repository: unsupported parsed object type %T", parsed)
}
}
// ReadStoredBlob reads and parses a blob object by ID.
-func (repo *Repository) ReadStoredBlob(id objectid.ObjectID) (*objectstored.StoredBlob, error) {
- stored, err := repo.ReadStored(id)
+func (repo *Repository) ReadStoredBlob(id objectid.ObjectID) (*stored.StoredBlob, error) {
+ s, err := repo.ReadStored(id)
if err != nil {
return nil, err
}
- blob, ok := stored.(*objectstored.StoredBlob)
+ blob, ok := s.(*stored.StoredBlob)
if !ok {
- return nil, fmt.Errorf("repository: expected blob object %s, got %v", id, stored.Object().ObjectType())
+ return nil, fmt.Errorf("repository: expected blob object %s, got %v", id, s.Object().ObjectType())
}
return blob, nil
}
// ReadStoredTree reads and parses a tree object by ID.
-func (repo *Repository) ReadStoredTree(id objectid.ObjectID) (*objectstored.StoredTree, error) {
- stored, err := repo.ReadStored(id)
+func (repo *Repository) ReadStoredTree(id objectid.ObjectID) (*stored.StoredTree, error) {
+ s, err := repo.ReadStored(id)
if err != nil {
return nil, err
}
- tree, ok := stored.(*objectstored.StoredTree)
+ tree, ok := s.(*stored.StoredTree)
if !ok {
- return nil, fmt.Errorf("repository: expected tree object %s, got %v", id, stored.Object().ObjectType())
+ return nil, fmt.Errorf("repository: expected tree object %s, got %v", id, s.Object().ObjectType())
}
return tree, nil
}
// ReadStoredCommit reads and parses a commit object by ID.
-func (repo *Repository) ReadStoredCommit(id objectid.ObjectID) (*objectstored.StoredCommit, error) {
- stored, err := repo.ReadStored(id)
+func (repo *Repository) ReadStoredCommit(id objectid.ObjectID) (*stored.StoredCommit, error) {
+ s, err := repo.ReadStored(id)
if err != nil {
return nil, err
}
- commit, ok := stored.(*objectstored.StoredCommit)
+ commit, ok := s.(*stored.StoredCommit)
if !ok {
- return nil, fmt.Errorf("repository: expected commit object %s, got %v", id, stored.Object().ObjectType())
+ return nil, fmt.Errorf("repository: expected commit object %s, got %v", id, s.Object().ObjectType())
}
return commit, nil
}
// ReadStoredTag reads and parses a tag object by ID.
-func (repo *Repository) ReadStoredTag(id objectid.ObjectID) (*objectstored.StoredTag, error) {
- stored, err := repo.ReadStored(id)
+func (repo *Repository) ReadStoredTag(id objectid.ObjectID) (*stored.StoredTag, error) {
+ s, err := repo.ReadStored(id)
if err != nil {
return nil, err
}
- tag, ok := stored.(*objectstored.StoredTag)
+ tag, ok := s.(*stored.StoredTag)
if !ok {
- return nil, fmt.Errorf("repository: expected tag object %s, got %v", id, stored.Object().ObjectType())
+ return nil, fmt.Errorf("repository: expected tag object %s, got %v", id, s.Object().ObjectType())
}
return tag, nil
diff --git a/repository/tree.go b/repository/tree.go
index d4ef529e..ce3e96e4 100644
--- a/repository/tree.go
+++ b/repository/tree.go
@@ -5,14 +5,14 @@ import (
"fmt"
"codeberg.org/lindenii/furgit/object"
- "codeberg.org/lindenii/furgit/objectstored"
+ "codeberg.org/lindenii/furgit/object/stored"
)
// ResolveTreeEntry resolves one path within a stored root tree.
//
// parts must contain at least one path segment. Intermediate segments must be
// tree entries.
-func (repo *Repository) ResolveTreeEntry(tree *objectstored.StoredTree, parts [][]byte) (object.TreeEntry, error) {
+func (repo *Repository) ResolveTreeEntry(tree *stored.StoredTree, parts [][]byte) (object.TreeEntry, error) {
if tree == nil {
return object.TreeEntry{}, errors.New("repository: nil root tree")
}
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-05-25 14:02:56 +0000