Files
harness-sync/internal/apply/apply_test.go
T
lukaszraczyloandGitHub e01f3419ea fix(apply): propagate read errors, auto-open repo, dedupe adapter base (#6)
Three robustness fixes for the apply pipeline:

1. Silent read errors on state/target files treated 'file absent' as
   'file empty' and fast-forward-overwrote user edits. Add
   common.ReadExistingFile that returns (nil,nil) only on
   os.IsNotExist; other I/O errors propagate. Use it from apply.Run
   and from every adapter's Render (claudecode, crush, kilo,
   opencode, goose, zed).

2. apply.Run required callers to pre-construct *gitx.Repo; passing
   nil silently skipped the commit. Run now auto-opens a repo from
   Bundle.Root, gracefully no-ops when the root is not a git repo,
   and uses a new gitx.HasStagedChanges() check to skip the no-op
   'nothing to commit' that triggered the original silent-skip.

3. Each of 7 adapter packages re-implemented the same 25-line
   Option/WithHome/New constructor. Hoist into adapter.Base +
   adapter.BaseOption + NewBase. Each adapter embeds *Base and
   reduces to a 9-line constructor. Public New(WithHome(h)) API
   preserved; a.home becomes a.Home.

Tests:
  - apply: 5 new (propagates-read-error, auto-opens-repo,
    no-repo-skips-commit, skips-no-op-commit, commit-message-counts)
  - gitx: 2 new (HasStagedChanges empty/after-add)
  - adapter/common: 3 new (ReadExistingFile missing/content/perm)
  - adapter: 4 new (NewBase default/WithHome/order/typed)
  - existing adapter tests unchanged — verify a.Home still honoured.
2026-06-01 13:11:07 +01:00

780 lines
26 KiB
Go

package apply
import (
"errors"
"os"
"os/exec"
"path/filepath"
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/lukaszraczylo/harness-sync/internal/adapter"
"github.com/lukaszraczylo/harness-sync/internal/canonical"
"github.com/lukaszraczylo/harness-sync/internal/gitx"
)
// failingAdapter always returns an error from Render.
type failingAdapter struct{ name, msg string }
func (f *failingAdapter) Name() string { return f.name }
func (f *failingAdapter) Detect() bool { return true }
func (f *failingAdapter) Render(_ *canonical.Bundle) (*adapter.FileSet, error) {
return nil, errors.New(f.msg)
}
func (f *failingAdapter) Import(_ string) (*adapter.ImportResult, error) {
return &adapter.ImportResult{}, nil
}
func (f *failingAdapter) Capabilities() adapter.HarnessCapabilities {
return adapter.HarnessCapabilities{}
}
type stubAdapter struct {
name string
files []adapter.File
}
func (s *stubAdapter) Name() string { return s.name }
func (s *stubAdapter) Detect() bool { return true }
func (s *stubAdapter) Import(_ string) (*adapter.ImportResult, error) {
return &adapter.ImportResult{}, nil
}
func (s *stubAdapter) Render(_ *canonical.Bundle) (*adapter.FileSet, error) {
fs := adapter.NewFileSet()
for _, f := range s.files {
fs.Add(f)
}
return fs, nil
}
func (s *stubAdapter) Capabilities() adapter.HarnessCapabilities {
return adapter.HarnessCapabilities{}
}
// ---------------------------------------------------------------------------
// Existing tests
// ---------------------------------------------------------------------------
func TestApplyRenderedFileFreshWrite(t *testing.T) {
root := t.TempDir()
target := filepath.Join(t.TempDir(), "out.json")
require.NoError(t, initCanonical(root))
ad := &stubAdapter{
name: "stub",
files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("{}\n")},
},
}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
Repo: gitx.New(root),
})
require.NoError(t, err)
assert.Equal(t, 1, rep.Written)
assert.Equal(t, 0, rep.Conflicts)
body, err := os.ReadFile(target)
require.NoError(t, err)
assert.Equal(t, "{}\n", string(body))
sp := filepath.Join(root, "state", "stub", target)
assert.FileExists(t, sp)
}
func TestApplyConflictWritesRej(t *testing.T) {
root := t.TempDir()
target := filepath.Join(t.TempDir(), "out.txt")
require.NoError(t, initCanonical(root))
repo := gitx.New(root)
ad1 := &stubAdapter{
name: "stub",
files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("base\n")},
},
}
_, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad1},
Repo: repo,
})
require.NoError(t, err)
require.NoError(t, os.WriteFile(target, []byte("user-edit\n"), 0o600)) //nolint:gosec
ad2 := &stubAdapter{
name: "stub",
files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("new\n")},
},
}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad2},
Repo: repo,
})
require.NoError(t, err)
assert.Equal(t, 1, rep.Conflicts)
assert.FileExists(t, target+".rej")
}
// ---------------------------------------------------------------------------
// TestApplySymlinkFileFreshLink — SymlinkFile kind creates a symlink.
// ---------------------------------------------------------------------------
func TestApplySymlinkFileFreshLink(t *testing.T) {
root := t.TempDir()
targetDir := t.TempDir()
target := filepath.Join(targetDir, "link")
real := filepath.Join(targetDir, "real.txt")
require.NoError(t, os.WriteFile(real, []byte("hello\n"), 0o600))
require.NoError(t, initCanonical(root))
ad := &stubAdapter{
name: "stub",
files: []adapter.File{
{Dest: target, Kind: adapter.SymlinkFile, SymlinkTarget: real},
},
}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
// No Repo: commit path covered by TestApplyCommitsToRepo; symlink target
// lives outside the canonical root so git-add would fail anyway.
})
require.NoError(t, err)
assert.Equal(t, 1, rep.Written)
assert.Equal(t, 0, rep.Skipped)
got, err := os.Readlink(target)
require.NoError(t, err)
assert.Equal(t, real, got)
}
// ---------------------------------------------------------------------------
// TestApplySymlinkAlreadyCorrect — skip path when symlink already points to right target.
// ---------------------------------------------------------------------------
func TestApplySymlinkAlreadyCorrect(t *testing.T) {
root := t.TempDir()
targetDir := t.TempDir()
target := filepath.Join(targetDir, "link")
real := filepath.Join(targetDir, "real.txt")
require.NoError(t, os.WriteFile(real, []byte("hello\n"), 0o600))
require.NoError(t, os.Symlink(real, target))
require.NoError(t, initCanonical(root))
ad := &stubAdapter{
name: "stub",
files: []adapter.File{
{Dest: target, Kind: adapter.SymlinkDir, SymlinkTarget: real},
},
}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
Repo: gitx.New(root),
})
require.NoError(t, err)
assert.Equal(t, 0, rep.Written)
assert.Equal(t, 1, rep.Skipped)
}
// ---------------------------------------------------------------------------
// TestApplySymlinkReplacesExistingFile — regular file at dest gets backed up, symlink created.
// ---------------------------------------------------------------------------
func TestApplySymlinkReplacesExistingFile(t *testing.T) {
root := t.TempDir()
targetDir := t.TempDir()
target := filepath.Join(targetDir, "config.txt")
real := filepath.Join(targetDir, "real.txt")
require.NoError(t, os.WriteFile(real, []byte("real\n"), 0o600))
require.NoError(t, os.WriteFile(target, []byte("old content\n"), 0o600))
require.NoError(t, initCanonical(root))
ad := &stubAdapter{
name: "stub",
files: []adapter.File{
{Dest: target, Kind: adapter.SymlinkFile, SymlinkTarget: real},
},
}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
Repo: gitx.New(root),
})
require.NoError(t, err)
assert.Equal(t, 1, rep.Written)
// target is now a symlink.
got, err := os.Readlink(target)
require.NoError(t, err)
assert.Equal(t, real, got)
// backup exists under <root>/backups/stub/.
backupDir := filepath.Join(root, "backups", "stub")
entries, err := os.ReadDir(backupDir)
require.NoError(t, err)
assert.NotEmpty(t, entries)
}
// ---------------------------------------------------------------------------
// TestApplyForceOverwritesDivergence — Force=true overwrites even when target diverged.
// ---------------------------------------------------------------------------
func TestApplyForceOverwritesDivergence(t *testing.T) {
root := t.TempDir()
target := filepath.Join(t.TempDir(), "out.txt")
require.NoError(t, initCanonical(root))
repo := gitx.New(root)
// First apply — writes base.
ad1 := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("base\n")},
}}
_, err := Run(Options{Bundle: &canonical.Bundle{Root: root}, Adapters: []adapter.Adapter{ad1}, Repo: repo})
require.NoError(t, err)
// User diverges target.
require.NoError(t, os.WriteFile(target, []byte("user-edit\n"), 0o600))
// Second apply with Force=true — must overwrite regardless.
ad2 := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("forced\n")},
}}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad2},
Repo: repo,
Force: true,
})
require.NoError(t, err)
assert.Equal(t, 1, rep.Written)
assert.Equal(t, 0, rep.Conflicts)
body, err := os.ReadFile(target)
require.NoError(t, err)
assert.Equal(t, "forced\n", string(body))
}
// ---------------------------------------------------------------------------
// TestApplyDryRunDoesNotWrite — DryRun=true populates Actions but writes nothing.
// ---------------------------------------------------------------------------
func TestApplyDryRunDoesNotWrite(t *testing.T) {
root := t.TempDir()
target := filepath.Join(t.TempDir(), "out.txt")
require.NoError(t, initCanonical(root))
ad := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("hello\n")},
}}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
DryRun: true,
})
require.NoError(t, err)
// DryRun: Written counter not incremented; action recorded.
assert.Equal(t, 0, rep.Written)
assert.NotEmpty(t, rep.Actions)
assert.Equal(t, "wrote", rep.Actions[0].Kind)
// File must not exist on disk.
_, statErr := os.Stat(target)
assert.True(t, os.IsNotExist(statErr), "file must not be created in dry-run")
}
// ---------------------------------------------------------------------------
// TestApplyCleanThreeWayMerge — disjoint edits merge without conflict.
// ---------------------------------------------------------------------------
func TestApplyCleanThreeWayMerge(t *testing.T) {
root := t.TempDir()
target := filepath.Join(t.TempDir(), "merge.txt")
require.NoError(t, initCanonical(root))
repo := gitx.New(root)
// First apply writes base content.
ad1 := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("line1\nline2\nline3\n")},
}}
_, err := Run(Options{Bundle: &canonical.Bundle{Root: root}, Adapters: []adapter.Adapter{ad1}, Repo: repo})
require.NoError(t, err)
// User edits line3 → "line3-user" (theirs).
require.NoError(t, os.WriteFile(target, []byte("line1\nline2\nline3-user\n"), 0o600))
// Adapter changes line1 → "line1-ours" (disjoint from user's line3 change).
ad2 := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("line1-ours\nline2\nline3\n")},
}}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad2},
Repo: repo,
})
require.NoError(t, err)
assert.Equal(t, 0, rep.Conflicts)
assert.Equal(t, 1, rep.Written)
body, err := os.ReadFile(target)
require.NoError(t, err)
// Merged result must contain both changes.
assert.Contains(t, string(body), "line1-ours")
assert.Contains(t, string(body), "line3-user")
}
// ---------------------------------------------------------------------------
// TestApplyDryRunConflict — DryRun=true on a conflict records action, no .rej written.
// ---------------------------------------------------------------------------
func TestApplyDryRunConflict(t *testing.T) {
root := t.TempDir()
target := filepath.Join(t.TempDir(), "conflict.txt")
require.NoError(t, initCanonical(root))
repo := gitx.New(root)
// First apply: write base.
ad1 := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("base\n")},
}}
_, err := Run(Options{Bundle: &canonical.Bundle{Root: root}, Adapters: []adapter.Adapter{ad1}, Repo: repo})
require.NoError(t, err)
// User diverges.
require.NoError(t, os.WriteFile(target, []byte("user-edit\n"), 0o600))
// DryRun second apply with conflicting content.
ad2 := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("new-ours\n")},
}}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad2},
DryRun: true,
})
require.NoError(t, err)
assert.Equal(t, 1, rep.Conflicts)
// .rej must NOT exist in dry-run.
_, statErr := os.Stat(target + ".rej")
assert.True(t, os.IsNotExist(statErr), ".rej must not be written in dry-run")
}
// ---------------------------------------------------------------------------
// TestApplyDryRunSymlink — DryRun=true on symlink records action, no link created.
// ---------------------------------------------------------------------------
func TestApplyDryRunSymlink(t *testing.T) {
root := t.TempDir()
targetDir := t.TempDir()
target := filepath.Join(targetDir, "dry-link")
real := filepath.Join(targetDir, "real.txt")
require.NoError(t, os.WriteFile(real, []byte("real\n"), 0o600))
require.NoError(t, initCanonical(root))
ad := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.SymlinkFile, SymlinkTarget: real},
}}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
DryRun: true,
})
require.NoError(t, err)
assert.Equal(t, 0, rep.Written)
assert.NotEmpty(t, rep.Actions)
assert.Equal(t, "symlinked", rep.Actions[0].Kind)
// Symlink must NOT be created.
_, statErr := os.Lstat(target)
assert.True(t, os.IsNotExist(statErr), "symlink must not be created in dry-run")
}
// ---------------------------------------------------------------------------
// TestApplyDryRunMerge — DryRun=true on a clean three-way merge records action, no write.
// ---------------------------------------------------------------------------
func TestApplyDryRunMerge(t *testing.T) {
root := t.TempDir()
target := filepath.Join(t.TempDir(), "dry-merge.txt")
require.NoError(t, initCanonical(root))
repo := gitx.New(root)
// Write base.
ad1 := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("line1\nline2\nline3\n")},
}}
_, err := Run(Options{Bundle: &canonical.Bundle{Root: root}, Adapters: []adapter.Adapter{ad1}, Repo: repo})
require.NoError(t, err)
// User edits line3 (theirs).
require.NoError(t, os.WriteFile(target, []byte("line1\nline2\nline3-user\n"), 0o600))
// DryRun apply with disjoint change (ours edits line1).
ad2 := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("line1-ours\nline2\nline3\n")},
}}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad2},
DryRun: true,
})
require.NoError(t, err)
assert.Equal(t, 0, rep.Written)
assert.Equal(t, 0, rep.Conflicts)
assert.NotEmpty(t, rep.Actions)
assert.Equal(t, "wrote", rep.Actions[0].Kind)
// File on disk must be unchanged (still the user's edit).
body, err := os.ReadFile(target)
require.NoError(t, err)
assert.Equal(t, "line1\nline2\nline3-user\n", string(body))
}
// ---------------------------------------------------------------------------
// TestApplyDryRunSkippedWritesState — skipped path calls writeState even in dry-run? No — writeState no-ops.
// TestApplyRenderedSkippedAlreadyInSync — target already matches rendered content → skipped.
// ---------------------------------------------------------------------------
func TestApplyRenderedSkippedAlreadyInSync(t *testing.T) {
root := t.TempDir()
target := filepath.Join(t.TempDir(), "sync.txt")
require.NoError(t, initCanonical(root))
repo := gitx.New(root)
content := []byte("synced\n")
// Write target directly (simulates already-synced state).
require.NoError(t, os.MkdirAll(filepath.Dir(target), 0o750))
require.NoError(t, os.WriteFile(target, content, 0o600))
ad := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: content},
}}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
Repo: repo,
})
require.NoError(t, err)
assert.Equal(t, 0, rep.Written)
assert.Equal(t, 1, rep.Skipped)
assert.Equal(t, "skipped", rep.Actions[0].Kind)
}
// ---------------------------------------------------------------------------
// TestApplyRenderError — adapter Render error propagates.
// ---------------------------------------------------------------------------
func TestApplyRenderError(t *testing.T) {
root := t.TempDir()
require.NoError(t, initCanonical(root))
ad := &failingAdapter{name: "bad", msg: "render failed"}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
})
require.Error(t, err)
assert.Contains(t, err.Error(), "render failed")
assert.Equal(t, 0, rep.Written)
}
// ---------------------------------------------------------------------------
// TestApplyEmptyAdapterList — no adapters → empty report, no error.
// ---------------------------------------------------------------------------
func TestApplyEmptyAdapterList(t *testing.T) {
root := t.TempDir()
require.NoError(t, initCanonical(root))
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{},
})
require.NoError(t, err)
assert.Equal(t, 0, rep.Written)
assert.Equal(t, 0, rep.Skipped)
assert.Equal(t, 0, rep.Conflicts)
assert.Empty(t, rep.Actions)
}
// ---------------------------------------------------------------------------
// TestApplyCommitsToRepo — Run commits to the canonical repo after writes.
// ---------------------------------------------------------------------------
func TestApplyCommitsToRepo(t *testing.T) {
root := t.TempDir()
target := filepath.Join(t.TempDir(), "committed.txt")
require.NoError(t, initCanonical(root))
repo := gitx.New(root)
ad := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("committed\n")},
}}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
Repo: repo,
})
require.NoError(t, err)
assert.Equal(t, 1, rep.Written)
// git log should have at least 2 commits (init + apply).
out, gitErr := runGit(root, "log", "--oneline")
require.NoError(t, gitErr)
assert.GreaterOrEqual(t, countLines(out), 2, "expected at least 2 commits in git log")
}
// ---------------------------------------------------------------------------
// TestApplyStateRoundTrip — re-apply same content → skipped (no second write).
// ---------------------------------------------------------------------------
func TestApplyStateRoundTrip(t *testing.T) {
root := t.TempDir()
target := filepath.Join(t.TempDir(), "round.txt")
require.NoError(t, initCanonical(root))
repo := gitx.New(root)
content := []byte("stable\n")
ad := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: content},
}}
opts := Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
Repo: repo,
}
// First apply: writes.
rep1, err := Run(opts)
require.NoError(t, err)
assert.Equal(t, 1, rep1.Written)
// Second apply: target matches content → skipped.
rep2, err := Run(opts)
require.NoError(t, err)
assert.Equal(t, 0, rep2.Written)
assert.Equal(t, 1, rep2.Skipped)
}
// ---------------------------------------------------------------------------
// TestApplyUnknownFileKind — unknown Kind returns error.
// ---------------------------------------------------------------------------
func TestApplyUnknownFileKind(t *testing.T) {
root := t.TempDir()
target := filepath.Join(t.TempDir(), "unknown.txt")
require.NoError(t, initCanonical(root))
ad := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.Kind(99)},
}}
_, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
})
require.Error(t, err)
assert.Contains(t, err.Error(), "unknown file kind")
}
// ---------------------------------------------------------------------------
// TestApplyPropagatesReadErrors — regression for the silent-read footgun.
// A target file in a directory we can no longer read must surface as an
// error from Run, not as a fast-forward overwrite.
// ---------------------------------------------------------------------------
func TestApplyPropagatesReadErrors(t *testing.T) {
if os.Geteuid() == 0 {
t.Skip("running as root; cannot test permission denial")
}
root := t.TempDir()
targetDir := t.TempDir()
target := filepath.Join(targetDir, "out.txt")
require.NoError(t, os.WriteFile(target, []byte("user-content\n"), 0o600))
require.NoError(t, initCanonical(root))
// Strip read perms on the target's parent so os.ReadFile fails.
require.NoError(t, os.Chmod(targetDir, 0o000))
t.Cleanup(func() { _ = os.Chmod(targetDir, 0o755) })
ad := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("new-render\n")},
}}
_, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
Repo: gitx.New(root),
})
require.Error(t, err)
assert.Contains(t, err.Error(), "read target")
// User's on-disk file must be untouched.
_ = os.Chmod(targetDir, 0o755)
body, rerr := os.ReadFile(target)
require.NoError(t, rerr)
assert.Equal(t, "user-content\n", string(body),
"target must not be overwritten when read fails")
}
// ---------------------------------------------------------------------------
// TestApplyAutoOpensRepoFromBundleRoot — regression: callers no longer need
// to pre-construct a *gitx.Repo. Run opens one from Bundle.Root, skips
// commit gracefully when the root is not a git repo, and commits when it is.
// ---------------------------------------------------------------------------
func TestApplyAutoOpensRepoFromBundleRoot(t *testing.T) {
root := t.TempDir()
target := filepath.Join(t.TempDir(), "out.txt")
require.NoError(t, initCanonical(root))
ad := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("auto\n")},
}}
// Intentionally pass Repo: nil — the new behaviour should open one itself.
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
})
require.NoError(t, err)
assert.Equal(t, 1, rep.Written)
// git log should have a new commit from apply, on top of the init one.
out, gitErr := runGit(root, "log", "--oneline")
require.NoError(t, gitErr)
assert.GreaterOrEqual(t, countLines(out), 2)
}
// ---------------------------------------------------------------------------
// TestApplyNoRepoSkipsCommit — when Bundle.Root isn't a git repo, Run must
// still succeed (no error, no commit attempt). One-off renders / dry-runs.
// ---------------------------------------------------------------------------
func TestApplyNoRepoSkipsCommit(t *testing.T) {
root := t.TempDir() // NOT initCanonical — no .git
target := filepath.Join(t.TempDir(), "out.txt")
ad := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("x\n")},
}}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
})
require.NoError(t, err)
assert.Equal(t, 1, rep.Written)
body, rerr := os.ReadFile(target)
require.NoError(t, rerr)
assert.Equal(t, "x\n", string(body))
}
// ---------------------------------------------------------------------------
// TestApplySkipsNoOpCommit — symlinks at a path outside the canonical repo
// do not write a state snapshot inside the repo (handleSymlink has no
// state-tracking), so git has nothing to commit. apply.Run must detect
// "no staged changes" and skip the commit instead of failing with
// "nothing to commit" from git itself.
// ---------------------------------------------------------------------------
func TestApplySkipsNoOpCommit(t *testing.T) {
root := t.TempDir()
require.NoError(t, initCanonical(root))
targetDir := t.TempDir()
target := filepath.Join(targetDir, "outside-link")
real := filepath.Join(targetDir, "real.txt")
require.NoError(t, os.WriteFile(real, []byte("real\n"), 0o600))
ad := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.SymlinkFile, SymlinkTarget: real},
}}
rep, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
// Repo: nil — auto-open from Bundle.Root (which IS a git repo).
})
require.NoError(t, err)
assert.Equal(t, 1, rep.Written)
// Symlink exists on disk.
got, lerr := os.Readlink(target)
require.NoError(t, lerr)
assert.Equal(t, real, got)
// No extra commit — still just the init commit. A failed "nothing to
// commit" would surface here as an error from Run.
out, gitErr := runGit(root, "log", "--oneline")
require.NoError(t, gitErr)
assert.Equal(t, 1, countLines(out),
"expected only the init commit; symlink outside canonical root should not create one")
}
// ---------------------------------------------------------------------------
// TestApplyCommitMessageHasCounts — commit message includes the file and
// conflict counts so the rollback story is auditable from git log alone.
// ---------------------------------------------------------------------------
func TestApplyCommitMessageHasCounts(t *testing.T) {
root := t.TempDir()
target := filepath.Join(t.TempDir(), "msg.txt")
require.NoError(t, initCanonical(root))
ad := &stubAdapter{name: "stub", files: []adapter.File{
{Dest: target, Kind: adapter.RenderedFile, Content: []byte("m\n")},
}}
_, err := Run(Options{
Bundle: &canonical.Bundle{Root: root},
Adapters: []adapter.Adapter{ad},
})
require.NoError(t, err)
out, gitErr := runGit(root, "log", "-1", "--pretty=%s")
require.NoError(t, gitErr)
assert.Contains(t, out, "apply: 1 files, 0 conflicts")
}
// ---------------------------------------------------------------------------
// helpers
// ---------------------------------------------------------------------------
func initCanonical(root string) error {
if err := os.MkdirAll(filepath.Join(root, "state"), 0o750); err != nil {
return err
}
r := gitx.New(root)
if err := r.Init(); err != nil {
return err
}
if err := r.Configure("test", "[email protected]"); err != nil {
return err
}
if err := os.WriteFile(filepath.Join(root, ".gitkeep"), []byte{}, 0o600); err != nil {
return err
}
if err := r.AddAll(); err != nil {
return err
}
return r.Commit("init")
}
func runGit(dir string, args ...string) (string, error) {
allArgs := append([]string{"-C", dir}, args...)
out, err := exec.Command("git", allArgs...).Output() //nolint:gosec
return string(out), err
}
func countLines(s string) int {
n := 0
for _, c := range s {
if c == '\n' {
n++
}
}
return n
}