diff options
| author | 2026-03-12 00:11:45 +0800 | |
|---|---|---|
| committer | 2026-03-12 00:11:45 +0800 | |
| commit | b46eba214daa9a6ede179ed543033b0f3485ec2e (patch) | |
| tree | fe9dc5569b4f6d77db0dc183b2e3cd1b3b176e06 /refstore | |
| parent | README: Less personal (diff) | |
| signature | No signature | |
refstore: s/ResolveFully/ResolveToDetached/g
Diffstat (limited to 'refstore')
| -rw-r--r-- | refstore/chain/resolve.go | 2 | ||||
| -rw-r--r-- | refstore/files/packed_delete_test.go | 10 | ||||
| -rw-r--r-- | refstore/files/read_resolve_fully.go | 2 | ||||
| -rw-r--r-- | refstore/files/resolve_list_test.go | 8 | ||||
| -rw-r--r-- | refstore/files/transaction_dirs_test.go | 4 | ||||
| -rw-r--r-- | refstore/files/transaction_pseudoref_test.go | 4 | ||||
| -rw-r--r-- | refstore/files/transaction_symbolic_test.go | 2 | ||||
| -rw-r--r-- | refstore/files/transaction_update_test.go | 4 | ||||
| -rw-r--r-- | refstore/files/worktree_test.go | 16 | ||||
| -rw-r--r-- | refstore/reading.go | 2 |
10 files changed, 27 insertions, 27 deletions
diff --git a/refstore/chain/resolve.go b/refstore/chain/resolve.go index 007c3668..c9dcc501 100644 --- a/refstore/chain/resolve.go +++ b/refstore/chain/resolve.go @@ -36,7 +36,7 @@ func (chain *Chain) Resolve(name string) (ref.Ref, error) { // // 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{}{} diff --git a/refstore/files/packed_delete_test.go b/refstore/files/packed_delete_test.go index 23df14e8..ed05f20b 100644 --- a/refstore/files/packed_delete_test.go +++ b/refstore/files/packed_delete_test.go @@ -53,7 +53,7 @@ func TestFilesTransactionPackedDeleteFailureLeavesRefsUnchanged(t *testing.T) { 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 @@ func TestFilesTransactionPackedDeleteFailureLeavesRefsUnchanged(t *testing.T) { 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 @@ func TestFilesPackedRefIgnoresEmptyDirectories(t *testing.T) { 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 @@ func TestFilesPackedRefIgnoresEmptyDirectories(t *testing.T) { 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 @@ func TestFilesDeleteWaitsForPackedRefsLockWithoutIntermediateState(t *testing.T) default: } - got, err := store.ResolveFully(prefix + "/foo") + got, err := store.ResolveToDetached(prefix + "/foo") if err != nil { t.Fatalf("ResolveFully while lock held: %v", err) } diff --git a/refstore/files/read_resolve_fully.go b/refstore/files/read_resolve_fully.go index 7bc4cfea..6871712c 100644 --- a/refstore/files/read_resolve_fully.go +++ b/refstore/files/read_resolve_fully.go @@ -9,7 +9,7 @@ import ( // 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{}) diff --git a/refstore/files/resolve_list_test.go b/refstore/files/resolve_list_test.go index 0e3f2c7c..41bd1ad2 100644 --- a/refstore/files/resolve_list_test.go +++ b/refstore/files/resolve_list_test.go @@ -53,7 +53,7 @@ func TestFilesResolveAndListOverlay(t *testing.T) { 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 @@ func TestFilesLooseRefParsingMatchesGit(t *testing.T) { 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 @@ func TestFilesLooseRefParsingMatchesGit(t *testing.T) { 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 @@ func TestFilesPackedRefsReadSemanticsMatchGit(t *testing.T) { 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) } diff --git a/refstore/files/transaction_dirs_test.go b/refstore/files/transaction_dirs_test.go index 7a8f7c14..09dc29fd 100644 --- a/refstore/files/transaction_dirs_test.go +++ b/refstore/files/transaction_dirs_test.go @@ -57,7 +57,7 @@ func TestFilesTransactionEmptyDirectoriesDoNotBlock(t *testing.T) { 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 @@ func TestFilesTransactionEmptyDirectoriesDoNotBlock(t *testing.T) { 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) } diff --git a/refstore/files/transaction_pseudoref_test.go b/refstore/files/transaction_pseudoref_test.go index 2111b5db..e313ad63 100644 --- a/refstore/files/transaction_pseudoref_test.go +++ b/refstore/files/transaction_pseudoref_test.go @@ -35,7 +35,7 @@ func TestFilesTransactionPseudorefLifecycle(t *testing.T) { 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 @@ func TestFilesTransactionPseudorefLifecycle(t *testing.T) { 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) } diff --git a/refstore/files/transaction_symbolic_test.go b/refstore/files/transaction_symbolic_test.go index 864429db..691e4ecf 100644 --- a/refstore/files/transaction_symbolic_test.go +++ b/refstore/files/transaction_symbolic_test.go @@ -54,7 +54,7 @@ func TestFilesTransactionDirectSymbolicDeletes(t *testing.T) { 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) } diff --git a/refstore/files/transaction_update_test.go b/refstore/files/transaction_update_test.go index 8bbf06be..9ed32179 100644 --- a/refstore/files/transaction_update_test.go +++ b/refstore/files/transaction_update_test.go @@ -38,7 +38,7 @@ func TestFilesTransactionPackedUpdateCreatesLooseOverride(t *testing.T) { 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 @@ func TestFilesTransactionDerefAndDirectSymbolic(t *testing.T) { 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) } diff --git a/refstore/files/worktree_test.go b/refstore/files/worktree_test.go index 88167200..2d973d51 100644 --- a/refstore/files/worktree_test.go +++ b/refstore/files/worktree_test.go @@ -50,7 +50,7 @@ func TestFilesWorktreeRefsMatchGit(t *testing.T) { 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 @@ func TestFilesWorktreeRefsMatchGit(t *testing.T) { 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 @@ func TestFilesWorktreeRefsMatchGit(t *testing.T) { 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 @@ func TestFilesWorktreeRefsMatchGit(t *testing.T) { 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 @@ func TestFilesWorktreeRefsMatchGit(t *testing.T) { 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 @@ func TestFilesWorktreeRefsMatchGit(t *testing.T) { 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 @@ func TestFilesTransactionPerWorktreeRefsMatchGit(t *testing.T) { 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 @@ func TestFilesTransactionPerWorktreeRefsMatchGit(t *testing.T) { 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) } diff --git a/refstore/reading.go b/refstore/reading.go index eb499deb..478ba4af 100644 --- a/refstore/reading.go +++ b/refstore/reading.go @@ -19,7 +19,7 @@ type ReadingStore interface { // // 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. |
