aboutsummaryrefslogtreecommitdiff
path: root/repository
diff options
context:
space:
mode:
authorGravatar Runxi Yu2026-05-27 03:46:41 +0000
committerGravatar Runxi Yu2026-05-27 03:46:41 +0000
commit82b5a3b23d42013c45b0bf77d04b8c77fe342f4a (patch)
treeeefbe15dd08b2e0ad1ca45721d29ce3cfa9459f0 /repository
parentref/store/memory: Fix whitespace (diff)
signatureNo signature
repository: Object->&Store, Refs->RefStore
Diffstat (limited to 'repository')
-rw-r--r--repository/objects.go6
-rw-r--r--repository/refs.go8
-rw-r--r--repository/refs_test.go8
-rw-r--r--repository/traversal_test.go2
-rw-r--r--repository/write_loose_test.go12
5 files changed, 18 insertions, 18 deletions
diff --git a/repository/objects.go b/repository/objects.go
index 2527363a..b1e975ee 100644
--- a/repository/objects.go
+++ b/repository/objects.go
@@ -81,9 +81,9 @@ func openObjectStore(
return objects, objectsRoot, objectsPackRoot, objectsLoose, objectsPacked, nil
}
-// Objects returns the configured object store.
+// ObjectStore returns the configured object store.
//
-// Use Objects for direct object-ID lookups, object headers, sizes, raw object
+// Use ObjectStore for direct object-ID lookups, object headers, sizes, raw object
// bytes, streamed object contents, object writes, pack ingestion, and
// coordinated quarantines. Callers who want typed object values should usually
// prefer [Repository.Fetcher].
@@ -91,7 +91,7 @@ func openObjectStore(
// Labels: Life-Parent.
//
//nolint:ireturn
-func (repo *Repository) Objects() interface {
+func (repo *Repository) ObjectStore() interface {
objectstore.Reader
objectstore.Writer
objectstore.Quarantiner
diff --git a/repository/refs.go b/repository/refs.go
index d66ae752..ab983baf 100644
--- a/repository/refs.go
+++ b/repository/refs.go
@@ -2,16 +2,16 @@ package repository
import refstore "codeberg.org/lindenii/furgit/ref/store"
-// Refs returns the configured ref store.
+// RefStore returns the configured ref store.
//
-// Use Refs when starting from branch names, tags, HEAD, or other references.
+// Use RefStore when starting from branch names, tags, HEAD, or other references.
// A common pattern is to resolve a reference first and then pass the resulting
-// object ID to [Repository.Fetcher] or [Repository.Objects].
+// object ID to [Repository.Fetcher] or [Repository.ObjectStore].
//
// Labels: Life-Parent.
//
//nolint:ireturn
-func (repo *Repository) Refs() interface {
+func (repo *Repository) RefStore() interface {
refstore.Reader
refstore.Transactioner
refstore.Batcher
diff --git a/repository/refs_test.go b/repository/refs_test.go
index d01dda19..cde0e94e 100644
--- a/repository/refs_test.go
+++ b/repository/refs_test.go
@@ -29,7 +29,7 @@ func TestOpenFilesRefFormat(t *testing.T) {
t.Fatalf("Algorithm = %v, want %v", repo.Algorithm(), algo)
}
- headerType, headerSize, err := repo.Objects().ReadHeader(commitID)
+ headerType, headerSize, err := repo.ObjectStore().ReadHeader(commitID)
if err != nil {
t.Fatalf("ReadHeader(commit): %v", err)
}
@@ -42,7 +42,7 @@ func TestOpenFilesRefFormat(t *testing.T) {
t.Fatalf("ReadHeader(commit) size = %d, want > 0", headerSize)
}
- resolved, err := repo.Refs().Resolve("refs/heads/main")
+ resolved, err := repo.RefStore().Resolve("refs/heads/main")
if err != nil {
t.Fatalf("Resolve(refs/heads/main): %v", err)
}
@@ -56,7 +56,7 @@ func TestOpenFilesRefFormat(t *testing.T) {
t.Fatalf("Resolve(refs/heads/main) id = %s, want %s", detached.ID, commitID)
}
- head, err := repo.Refs().ResolveToDetached("HEAD")
+ head, err := repo.RefStore().ResolveToDetached("HEAD")
if err != nil {
t.Fatalf("ResolveToDetached(HEAD): %v", err)
}
@@ -102,7 +102,7 @@ func assertResolveToDetached(t *testing.T, repoHarness *testgit.TestRepo, name s
repo := repoHarness.OpenRepository(t)
- resolved, err := repo.Refs().ResolveToDetached(name)
+ resolved, err := repo.RefStore().ResolveToDetached(name)
if err != nil {
t.Fatalf("ResolveToDetached(%s): %v", name, err)
}
diff --git a/repository/traversal_test.go b/repository/traversal_test.go
index 5f75eb5b..034119ac 100644
--- a/repository/traversal_test.go
+++ b/repository/traversal_test.go
@@ -147,7 +147,7 @@ func walkRepositoryFromRoot(t *testing.T, root *os.Root, label string) {
defer func() { _ = repo.Close() }()
- head, err := repo.Refs().ResolveToDetached("HEAD")
+ head, err := repo.RefStore().ResolveToDetached("HEAD")
if err != nil {
t.Fatalf("ResolveRefFully(HEAD): %v", err)
}
diff --git a/repository/write_loose_test.go b/repository/write_loose_test.go
index d1fa479c..218a70cd 100644
--- a/repository/write_loose_test.go
+++ b/repository/write_loose_test.go
@@ -23,7 +23,7 @@ func TestWriteLooseBytesContent(t *testing.T) {
content := []byte("write-loose-bytes-content\n")
- gotID, err := repo.Objects().WriteBytesContent(objecttype.TypeBlob, content)
+ gotID, err := repo.ObjectStore().WriteBytesContent(objecttype.TypeBlob, content)
if err != nil {
t.Fatalf("WriteLooseBytesContent: %v", err)
}
@@ -33,7 +33,7 @@ func TestWriteLooseBytesContent(t *testing.T) {
t.Fatalf("WriteLooseBytesContent id = %s, want %s", gotID, wantID)
}
- ty, gotContent, err := repo.Objects().ReadBytesContent(gotID)
+ ty, gotContent, err := repo.ObjectStore().ReadBytesContent(gotID)
if err != nil {
t.Fatalf("ReadStoredBytesContent: %v", err)
}
@@ -62,7 +62,7 @@ func TestWriteLooseReaderContent(t *testing.T) {
content := []byte("write-loose-reader-content\n")
- gotID, err := repo.Objects().WriteReaderContent(objecttype.TypeBlob, int64(len(content)), bytes.NewReader(content))
+ gotID, err := repo.ObjectStore().WriteReaderContent(objecttype.TypeBlob, int64(len(content)), bytes.NewReader(content))
if err != nil {
t.Fatalf("WriteLooseReaderContent: %v", err)
}
@@ -87,12 +87,12 @@ func TestWriteLooseFull(t *testing.T) {
repo := repoHarness.OpenRepository(t)
- raw, err := repo.Objects().ReadBytesFull(commitID)
+ raw, err := repo.ObjectStore().ReadBytesFull(commitID)
if err != nil {
t.Fatalf("ReadStoredBytesFull: %v", err)
}
- idFromBytes, err := repo.Objects().WriteBytesFull(raw)
+ idFromBytes, err := repo.ObjectStore().WriteBytesFull(raw)
if err != nil {
t.Fatalf("WriteLooseBytesFull: %v", err)
}
@@ -101,7 +101,7 @@ func TestWriteLooseFull(t *testing.T) {
t.Fatalf("WriteLooseBytesFull id = %s, want %s", idFromBytes, commitID)
}
- idFromReader, err := repo.Objects().WriteReaderFull(bytes.NewReader(raw))
+ idFromReader, err := repo.ObjectStore().WriteReaderFull(bytes.NewReader(raw))
if err != nil {
t.Fatalf("WriteLooseReaderFull: %v", err)
}