repository, README: Fix fetcher/resolver naming v0.1.119

5 files changed, 16 insertions, 16 deletions

diff --git a/README.md b/README.md
index 10e44914..3e4f7180 100644
--- a/README.md
+++ b/README.md
@@ -23,13 +23,13 @@ Furgit is a low-level Git library in Go.
 
 If you are working with a normal on-disk repository, start with
 `repository.Open(...)`. It opens the repository and wires together the refs
-storage, object storage, and resolver. Note that it requires either a
+storage, object storage, and fetcher. Note that it requires either a
 bare repository or a `.git` directory. Then,
 
 * `repo.Refs()` is for branch names, tags, `HEAD`, and ref updates.
   * Use it when you are starting from names rather than object IDs.
   * A common pattern is to resolve a ref first, then pass the resulting object
-    ID to the resolver.
+    ID to the fetcher.
 
 * `repo.Fetcher()` is the main object-facing API for most callers.
   * Use it when you want commits, trees, blobs, or tags as typed values.
@@ -43,7 +43,7 @@ bare repository or a `.git` directory. Then,
   * Use it when you need to read object headers, read raw object contents,
     stream object data, or otherwise look up objects directly by ID.
   * Most callers who want to work with Git objects as commits, trees, blobs, or
-    tags should prefer the resolver instead.
+    tags should prefer the fetcher instead.
   * However, checking an object ID's size and type are somewhat common
     operations that should be done here.
 
diff --git a/cmd/show-object/main.go b/cmd/show-object/main.go
index b4b55a1b..ee952876 100644
--- a/cmd/show-object/main.go
+++ b/cmd/show-object/main.go
@@ -55,7 +55,7 @@ func run(repoPath, name *string) error {
 		return fmt.Errorf("resolve %q: %w", *name, err)
 	}
 
-	s, err := repo.Resolver().ExactObject(id)
+	s, err := repo.Fetcher().ExactObject(id)
 	if err != nil {
 		_ = repo.Close()
 
diff --git a/repository/resolver.go b/repository/resolver.go
index 920045c5..f7717490 100644
--- a/repository/resolver.go
+++ b/repository/resolver.go
@@ -2,10 +2,10 @@ package repository
 
 import "codeberg.org/lindenii/furgit/object/fetch"
 
-// Resolver returns an object resolver backed by the repository's object store.
+// Fetcher returns an object fetcher backed by the repository's object store.
 //
-// The returned resolver is ready for use, borrows the repository's object
+// The returned fetcher is ready for use, borrows the repository's object
 // store, does not need closing, and must not be used after Close.
-func (repo *Repository) Resolver() *fetch.Fetcher {
+func (repo *Repository) Fetcher() *fetch.Fetcher {
 	return fetch.New(repo.objects)
 }
diff --git a/repository/stored_test.go b/repository/stored_test.go
index 3ebd9a76..5604b418 100644
--- a/repository/stored_test.go
+++ b/repository/stored_test.go
@@ -24,7 +24,7 @@ func TestReadStoredTyped(t *testing.T) {
 
 		repo := repoHarness.OpenRepository(t)
 
-		blob, err := repo.Resolver().ExactBlob(blobID)
+		blob, err := repo.Fetcher().ExactBlob(blobID)
 		if err != nil {
 			t.Fatalf("ExactBlob: %v", err)
 		}
@@ -37,7 +37,7 @@ func TestReadStoredTyped(t *testing.T) {
 			t.Fatalf("blob body = %q, want %q", blob.Object().Data, "commit-body\n")
 		}
 
-		tree, err := repo.Resolver().ExactTree(treeID)
+		tree, err := repo.Fetcher().ExactTree(treeID)
 		if err != nil {
 			t.Fatalf("ExactTree: %v", err)
 		}
@@ -50,7 +50,7 @@ func TestReadStoredTyped(t *testing.T) {
 			t.Fatalf("tree entries = %d, want 1", len(tree.Object().Entries))
 		}
 
-		commit, err := repo.Resolver().ExactCommit(commitID)
+		commit, err := repo.Fetcher().ExactCommit(commitID)
 		if err != nil {
 			t.Fatalf("ExactCommit: %v", err)
 		}
@@ -81,7 +81,7 @@ func TestResolverPath(t *testing.T) {
 
 		repo := repoHarness.OpenRepository(t)
 
-		entry, err := repo.Resolver().Path(rootTreeID, [][]byte{[]byte("dir"), []byte("leaf.txt")})
+		entry, err := repo.Fetcher().Path(rootTreeID, [][]byte{[]byte("dir"), []byte("leaf.txt")})
 		if err != nil {
 			t.Fatalf("Path: %v", err)
 		}
@@ -112,7 +112,7 @@ func TestResolverPathErrors(t *testing.T) {
 
 			repo := repoHarness.OpenRepository(t)
 
-			_, err := repo.Resolver().Path(rootTreeID, [][]byte{[]byte("missing")})
+			_, err := repo.Fetcher().Path(rootTreeID, [][]byte{[]byte("missing")})
 			if err == nil || !strings.Contains(err.Error(), "not found") {
 				t.Fatalf("Path missing: err = %v, want not found error", err)
 			}
@@ -130,7 +130,7 @@ func TestResolverPathErrors(t *testing.T) {
 
 			repo := repoHarness.OpenRepository(t)
 
-			_, err := repo.Resolver().Path(rootTreeID, [][]byte{[]byte("dir"), []byte("leaf")})
+			_, err := repo.Fetcher().Path(rootTreeID, [][]byte{[]byte("dir"), []byte("leaf")})
 			if err == nil || !strings.Contains(err.Error(), "is not a tree") {
 				t.Fatalf("Path non-tree: err = %v, want non-tree error", err)
 			}
@@ -164,7 +164,7 @@ func TestResolverPathDeepPath(t *testing.T) {
 
 		repo := repoHarness.OpenRepository(t)
 
-		entry, err := repo.Resolver().Path(currentTree, parts)
+		entry, err := repo.Fetcher().Path(currentTree, parts)
 		if err != nil {
 			t.Fatalf("Path(deep): %v", err)
 		}
@@ -207,7 +207,7 @@ func TestReadStoredTreeMixedModes(t *testing.T) {
 
 		repo := repoHarness.OpenRepository(t)
 
-		rootTree, err := repo.Resolver().ExactTree(rootTreeID)
+		rootTree, err := repo.Fetcher().ExactTree(rootTreeID)
 		if err != nil {
 			t.Fatalf("ExactTree(root): %v", err)
 		}
diff --git a/repository/traversal_test.go b/repository/traversal_test.go
index 29f0cc81..99a8faaf 100644
--- a/repository/traversal_test.go
+++ b/repository/traversal_test.go
@@ -178,7 +178,7 @@ func traverseReachableIter(repo *repository.Repository, root objectid.ObjectID)
 
 		visited[id] = struct{}{}
 
-		stored, err := repo.Resolver().ExactObject(id)
+		stored, err := repo.Fetcher().ExactObject(id)
 		if err != nil {
 			return 0, err
 		}