shithub: furgit

Download patch

ref: b46eba214daa9a6ede179ed543033b0f3485ec2e
parent: 0923370014e3d04d48a7393119601ee44325cc3d
author: Runxi Yu <runxiyu@umich.edu>
date: Wed Mar 11 20:11:45 EDT 2026

refstore: s/ResolveFully/ResolveToDetached/g

--- a/cmd/show-object/main.go
+++ b/cmd/show-object/main.go
@@ -73,7 +73,7 @@
 		return id, nil
 	}
 
-	resolved, err := repo.Refs().ResolveFully(input)
+	resolved, err := repo.Refs().ResolveToDetached(input)
 	if err != nil {
 		return objectid.ObjectID{}, err
 	}
--- a/receivepack/advertise.go
+++ b/receivepack/advertise.go
@@ -37,7 +37,7 @@
 				continue
 			}
 
-			head, err := opts.Refs.ResolveFully("HEAD")
+			head, err := opts.Refs.ResolveToDetached("HEAD")
 			if err != nil {
 				if errors.Is(err, refstore.ErrReferenceNotFound) {
 					continue
--- a/receivepack/hooks/reject_force_push.go
+++ b/receivepack/hooks/reject_force_push.go
@@ -33,7 +33,7 @@
 				continue
 			}
 
-			current, err := req.Refs.ResolveFully(update.Name)
+			current, err := req.Refs.ResolveToDetached(update.Name)
 			switch {
 			case err == nil:
 			case errors.Is(err, refstore.ErrReferenceNotFound):
--- a/receivepack/int_test.go
+++ b/receivepack/int_test.go
@@ -391,7 +391,7 @@
 
 		reopened := receiver.OpenRepository(t)
 
-		resolved, err := reopened.Refs().ResolveFully("refs/heads/main")
+		resolved, err := reopened.Refs().ResolveToDetached("refs/heads/main")
 		if err != nil {
 			t.Fatalf("ResolveFully(main): %v", err)
 		}
@@ -695,7 +695,7 @@
 			t.Fatalf("unexpected receive-pack output %q", got)
 		}
 
-		resolved, err := repo.Refs().ResolveFully("refs/heads/main")
+		resolved, err := repo.Refs().ResolveToDetached("refs/heads/main")
 		if err != nil {
 			t.Fatalf("ResolveFully(main): %v", err)
 		}
@@ -786,7 +786,7 @@
 			t.Fatalf("ReceivePack: %v", serverErr)
 		}
 
-		resolved, err := receiver.OpenRepository(t).Refs().ResolveFully("refs/heads/main")
+		resolved, err := receiver.OpenRepository(t).Refs().ResolveToDetached("refs/heads/main")
 		if err != nil {
 			t.Fatalf("ResolveFully(main): %v", err)
 		}
@@ -836,7 +836,7 @@
 			t.Fatalf("ReceivePack: %v", serverErr)
 		}
 
-		resolved, err := receiver.OpenRepository(t).Refs().ResolveFully("refs/heads/topic")
+		resolved, err := receiver.OpenRepository(t).Refs().ResolveToDetached("refs/heads/topic")
 		if err != nil {
 			t.Fatalf("ResolveFully(topic): %v", err)
 		}
@@ -937,7 +937,7 @@
 			t.Fatalf("git push output missing non-fast-forward message\nstdout=%s\nstderr=%s", stdout, stderr)
 		}
 
-		resolved, err := receiver.OpenRepository(t).Refs().ResolveFully("refs/heads/main")
+		resolved, err := receiver.OpenRepository(t).Refs().ResolveToDetached("refs/heads/main")
 		if err != nil {
 			t.Fatalf("ResolveFully(main): %v", err)
 		}
--- a/refstore/chain/resolve.go
+++ b/refstore/chain/resolve.go
@@ -36,7 +36,7 @@
 //
 // It intentionally does not call backend ResolveFully. This allows symbolic
 // references to cross backends in the chain.
-func (chain *Chain) ResolveFully(name string) (ref.Detached, error) {
+func (chain *Chain) ResolveToDetached(name string) (ref.Detached, error) {
 	cur := name
 
 	seen := map[string]struct{}{}
--- a/refstore/files/packed_delete_test.go
+++ b/refstore/files/packed_delete_test.go
@@ -53,7 +53,7 @@
 				t.Fatalf("ShowRef after failed delete = %v, want %v", actual, unchanged)
 			}
 
-			got, err := store.ResolveFully(prefix + "/foo")
+			got, err := store.ResolveToDetached(prefix + "/foo")
 			if err != nil {
 				t.Fatalf("ResolveFully(lock held): %v", err)
 			}
@@ -106,7 +106,7 @@
 				t.Fatalf("ShowRef after failed delete = %v, want %v", actual, unchanged)
 			}
 
-			got, err := store.ResolveFully(prefix + "/foo")
+			got, err := store.ResolveToDetached(prefix + "/foo")
 			if err != nil {
 				t.Fatalf("ResolveFully(new exists): %v", err)
 			}
@@ -182,7 +182,7 @@
 
 		store := openFilesStore(t, testRepo, algo)
 
-		got, err := store.ResolveFully(name)
+		got, err := store.ResolveToDetached(name)
 		if err != nil {
 			t.Fatalf("ResolveFully: %v", err)
 		}
@@ -204,7 +204,7 @@
 
 		fullActual := make([]string, 0, len(actual))
 		for _, name := range actual {
-			refValue, resolveErr := store.ResolveFully(name)
+			refValue, resolveErr := store.ResolveToDetached(name)
 			if resolveErr != nil {
 				t.Fatalf("ResolveFully(%q): %v", name, resolveErr)
 			}
@@ -262,7 +262,7 @@
 		default:
 		}
 
-		got, err := store.ResolveFully(prefix + "/foo")
+		got, err := store.ResolveToDetached(prefix + "/foo")
 		if err != nil {
 			t.Fatalf("ResolveFully while lock held: %v", err)
 		}
--- a/refstore/files/read_resolve_fully.go
+++ b/refstore/files/read_resolve_fully.go
@@ -9,7 +9,7 @@
 
 // ResolveFully resolves symbolic references through the visible files store
 // namespace until one detached reference is reached.
-func (store *Store) ResolveFully(name string) (ref.Detached, error) {
+func (store *Store) ResolveToDetached(name string) (ref.Detached, error) {
 	cur := name
 	seen := make(map[string]struct{})
 
--- a/refstore/files/resolve_list_test.go
+++ b/refstore/files/resolve_list_test.go
@@ -53,7 +53,7 @@
 			t.Fatalf("Resolve(HEAD) target = %q, want %q", headSym.Target, "refs/heads/main")
 		}
 
-		fullHead, err := store.ResolveFully("HEAD")
+		fullHead, err := store.ResolveToDetached("HEAD")
 		if err != nil {
 			t.Fatalf("ResolveFully(HEAD): %v", err)
 		}
@@ -96,7 +96,7 @@
 
 		store := openFilesStore(t, testRepo, algo)
 
-		got, err := store.ResolveFully("refs/heads/no-lf")
+		got, err := store.ResolveToDetached("refs/heads/no-lf")
 		if err != nil {
 			t.Fatalf("ResolveFully(no-lf): %v", err)
 		}
@@ -105,7 +105,7 @@
 			t.Fatalf("ResolveFully(no-lf) = %s, want %s", got.ID, oid)
 		}
 
-		got, err = store.ResolveFully("refs/heads/trailing-ws")
+		got, err = store.ResolveToDetached("refs/heads/trailing-ws")
 		if err != nil {
 			t.Fatalf("ResolveFully(trailing-ws): %v", err)
 		}
@@ -217,7 +217,7 @@
 
 			store := openFilesStore(t, testRepo, algo)
 
-			got, err := store.ResolveFully("refs/heads/main")
+			got, err := store.ResolveToDetached("refs/heads/main")
 			if err != nil {
 				t.Fatalf("ResolveFully(main): %v", err)
 			}
--- a/refstore/files/transaction_dirs_test.go
+++ b/refstore/files/transaction_dirs_test.go
@@ -57,7 +57,7 @@
 			t.Fatalf("Commit(update with empty directories): %v", err)
 		}
 
-		got, err := store.ResolveFully("refs/e-update/foo")
+		got, err := store.ResolveToDetached("refs/e-update/foo")
 		if err != nil {
 			t.Fatalf("ResolveFully(updated foo): %v", err)
 		}
@@ -84,7 +84,7 @@
 			t.Fatalf("Commit(create with empty directories): %v", err)
 		}
 
-		got, err = store.ResolveFully("refs/e-create/foo")
+		got, err = store.ResolveToDetached("refs/e-create/foo")
 		if err != nil {
 			t.Fatalf("ResolveFully(created foo): %v", err)
 		}
--- a/refstore/files/transaction_pseudoref_test.go
+++ b/refstore/files/transaction_pseudoref_test.go
@@ -35,7 +35,7 @@
 			t.Fatalf("Commit(create PSEUDOREF): %v", err)
 		}
 
-		got, err := store.ResolveFully("PSEUDOREF")
+		got, err := store.ResolveToDetached("PSEUDOREF")
 		if err != nil {
 			t.Fatalf("ResolveFully(PSEUDOREF): %v", err)
 		}
@@ -59,7 +59,7 @@
 			t.Fatalf("Commit(update PSEUDOREF): %v", err)
 		}
 
-		got, err = store.ResolveFully("PSEUDOREF")
+		got, err = store.ResolveToDetached("PSEUDOREF")
 		if err != nil {
 			t.Fatalf("ResolveFully(PSEUDOREF) after update: %v", err)
 		}
--- a/refstore/files/transaction_symbolic_test.go
+++ b/refstore/files/transaction_symbolic_test.go
@@ -54,7 +54,7 @@
 			t.Fatalf("Resolve(SYMREF after delete) err=%v", err)
 		}
 
-		got, err := store.ResolveFully("refs/heads/main")
+		got, err := store.ResolveToDetached("refs/heads/main")
 		if err != nil {
 			t.Fatalf("ResolveFully(main): %v", err)
 		}
--- a/refstore/files/transaction_update_test.go
+++ b/refstore/files/transaction_update_test.go
@@ -38,7 +38,7 @@
 			t.Fatalf("Commit: %v", err)
 		}
 
-		got, err := store.ResolveFully("refs/heads/main")
+		got, err := store.ResolveToDetached("refs/heads/main")
 		if err != nil {
 			t.Fatalf("ResolveFully(main): %v", err)
 		}
@@ -137,7 +137,7 @@
 			t.Fatalf("Commit(update HEAD): %v", err)
 		}
 
-		mainRef, err := store.ResolveFully("refs/heads/main")
+		mainRef, err := store.ResolveToDetached("refs/heads/main")
 		if err != nil {
 			t.Fatalf("ResolveFully(main): %v", err)
 		}
--- a/refstore/files/worktree_test.go
+++ b/refstore/files/worktree_test.go
@@ -50,7 +50,7 @@
 		wt1Store := openFilesStoreAt(t, openGitRootUnder(t, repoRoot, "wt1"), algo)
 		wt2Store := openFilesStoreAt(t, openGitRootUnder(t, repoRoot, "wt2"), algo)
 
-		got, err := mainStore.ResolveFully("refs/worktree/foo")
+		got, err := mainStore.ResolveToDetached("refs/worktree/foo")
 		if err != nil {
 			t.Fatalf("ResolveFully(main refs/worktree/foo): %v", err)
 		}
@@ -59,7 +59,7 @@
 			t.Fatalf("ResolveFully(main refs/worktree/foo) = %s, want %s", got.ID, initialID)
 		}
 
-		got, err = wt1Store.ResolveFully("refs/worktree/foo")
+		got, err = wt1Store.ResolveToDetached("refs/worktree/foo")
 		if err != nil {
 			t.Fatalf("ResolveFully(wt1 refs/worktree/foo): %v", err)
 		}
@@ -68,7 +68,7 @@
 			t.Fatalf("ResolveFully(wt1 refs/worktree/foo) = %s, want %s", got.ID, wt1ID)
 		}
 
-		got, err = wt2Store.ResolveFully("refs/worktree/foo")
+		got, err = wt2Store.ResolveToDetached("refs/worktree/foo")
 		if err != nil {
 			t.Fatalf("ResolveFully(wt2 refs/worktree/foo): %v", err)
 		}
@@ -77,7 +77,7 @@
 			t.Fatalf("ResolveFully(wt2 refs/worktree/foo) = %s, want %s", got.ID, wt2ID)
 		}
 
-		got, err = wt1Store.ResolveFully("main-worktree/HEAD")
+		got, err = wt1Store.ResolveToDetached("main-worktree/HEAD")
 		if err != nil {
 			t.Fatalf("ResolveFully(wt1 main-worktree/HEAD): %v", err)
 		}
@@ -86,7 +86,7 @@
 			t.Fatalf("ResolveFully(wt1 main-worktree/HEAD) = %s, want %s", got.ID, initialID)
 		}
 
-		got, err = mainStore.ResolveFully("worktrees/wt1/HEAD")
+		got, err = mainStore.ResolveToDetached("worktrees/wt1/HEAD")
 		if err != nil {
 			t.Fatalf("ResolveFully(main worktrees/wt1/HEAD): %v", err)
 		}
@@ -95,7 +95,7 @@
 			t.Fatalf("ResolveFully(main worktrees/wt1/HEAD) = %s, want %s", got.ID, wt1ID)
 		}
 
-		got, err = wt2Store.ResolveFully("worktrees/wt1/HEAD")
+		got, err = wt2Store.ResolveToDetached("worktrees/wt1/HEAD")
 		if err != nil {
 			t.Fatalf("ResolveFully(wt2 worktrees/wt1/HEAD): %v", err)
 		}
@@ -164,7 +164,7 @@
 			t.Fatalf("Commit(wt-only): %v", err)
 		}
 
-		got, err := mainStore.ResolveFully("refs/bisect/main-only")
+		got, err := mainStore.ResolveToDetached("refs/bisect/main-only")
 		if err != nil {
 			t.Fatalf("ResolveFully(main-only): %v", err)
 		}
@@ -173,7 +173,7 @@
 			t.Fatalf("ResolveFully(main-only) = %s, want %s", got.ID, mainID)
 		}
 
-		got, err = wt1Store.ResolveFully("refs/bisect/wt-only")
+		got, err = wt1Store.ResolveToDetached("refs/bisect/wt-only")
 		if err != nil {
 			t.Fatalf("ResolveFully(wt-only): %v", err)
 		}
--- a/refstore/reading.go
+++ b/refstore/reading.go
@@ -19,7 +19,7 @@
 	//
 	// ResolveFully resolves symbolic references only. It does not imply peeling
 	// annotated tag objects.
-	ResolveFully(name string) (ref.Detached, error)
+	ResolveToDetached(name string) (ref.Detached, error)
 	// List returns references matching pattern.
 	//
 	// The exact pattern language is backend-defined.
--- a/repository/refs_test.go
+++ b/repository/refs_test.go
@@ -56,7 +56,7 @@
 			t.Fatalf("Resolve(refs/heads/main) id = %s, want %s", detached.ID, commitID)
 		}
 
-		head, err := repo.Refs().ResolveFully("HEAD")
+		head, err := repo.Refs().ResolveToDetached("HEAD")
 		if err != nil {
 			t.Fatalf("ResolveFully(HEAD): %v", err)
 		}
@@ -102,7 +102,7 @@
 
 	repo := repoHarness.OpenRepository(t)
 
-	resolved, err := repo.Refs().ResolveFully(name)
+	resolved, err := repo.Refs().ResolveToDetached(name)
 	if err != nil {
 		t.Fatalf("ResolveFully(%s): %v", name, err)
 	}
--- a/repository/traversal_test.go
+++ b/repository/traversal_test.go
@@ -144,7 +144,7 @@
 
 	defer func() { _ = repo.Close() }()
 
-	head, err := repo.Refs().ResolveFully("HEAD")
+	head, err := repo.Refs().ResolveToDetached("HEAD")
 	if err != nil {
 		t.Fatalf("ResolveRefFully(HEAD): %v", err)
 	}
--