Artifact [0f2b5f3722]

Artifact 0f2b5f3722337e640d4c001677da7e061e2915180ca2b43e9f05657fb4c4463a:

• File internal/stash/stash_test.go — part of check-in [4add332299] at 2026-10-18 20:30:31 on branch feat/submanifest-reader — fix: record one rcvfrom row per receipt, as fossil does

  Fossil records each arrival of content (a commit, a tag, a sync or clone, a request its server answers, an unversioned add) as one rcvfrom row, made by content_rcvid_init when the first content arrives, and points every blob and unversioned file it stores at that row. go-libfossil seeded a single row at creation and pointed every blob at rcvid 1.

  db.Receipt is that row: it is made lazily on first use, with the time as a Julian day, and remade if the transaction that made it rolled back. A transaction records content under the receipt it is given, and repo.WithReceipt gives one to every transaction, bound ones included, of a commit, tag, sync, clone or served request. The client credits its local user and the peer's address, as fossil's client records g.zIpAddr; the server credits nobody until a login card names a user, then that user and the card's nonce, from the request's address. Phantoms keep rcvid 0, and an applied unversioned deletion keeps its row's rcvid, as in fossil.

  A new repository no longer starts with a placeholder row; an existing one keeps it. (user: [email protected], size: 13871) [annotate] [blame] [check-ins using] [more...]

//go:build !js

package stash

import (
	"database/sql"
	"os"
	"path/filepath"
	"reflect"
	"regexp"
	"strings"
	"testing"

	libdb "github.com/danmestas/go-libfossil/db"
	"github.com/danmestas/go-libfossil/internal/blob"
	"github.com/danmestas/go-libfossil/internal/hash"
	_ "github.com/danmestas/go-libfossil/internal/testdriver"
)

// testEnv sets up a repo DB with one blob ("hello" in a.txt), a checkout DB
// with vvar/vfile/vmerge tables, writes a.txt to disk, and returns both DBs,
// the working directory, and the rid+uuid of the stored blob.
func testEnv(t *testing.T) (repoDB *sql.DB, ckout *sql.DB, dir string) {
	t.Helper()
	dir = t.TempDir()

	// --- Repo DB ---
	repoPath := filepath.Join(dir, "repo.fossil")
	var err error
	repoDB, err = sql.Open(libdb.RegisteredDriver().Name, repoPath)
	if err != nil {
		t.Fatalf("open repo db: %v", err)
	}
	t.Cleanup(func() { repoDB.Close() })

	repoSchema := []string{
		`CREATE TABLE blob(
			rid INTEGER PRIMARY KEY,
			rcvid INTEGER,
			size INTEGER,
			uuid TEXT UNIQUE NOT NULL,
			content BLOB,
			CHECK( length(uuid)>=40 AND rid>0 )
		)`,
		`CREATE TABLE delta(
			rid INTEGER PRIMARY KEY,
			srcid INTEGER NOT NULL REFERENCES blob
		)`,
		`CREATE INDEX delta_i1 ON delta(srcid)`,
		`INSERT INTO blob(rid, uuid, size, content) VALUES(0, '0000000000000000000000000000000000000000', 0, NULL)`,
	}
	// The CHECK constraint requires rid>0, so we need to insert rid=0 differently.
	// Actually let's just create schema and use blob.Store.
	repoSchema2 := []string{
		`CREATE TABLE blob(
			rid INTEGER PRIMARY KEY,
			rcvid INTEGER,
			size INTEGER,
			uuid TEXT UNIQUE NOT NULL,
			content BLOB
		)`,
		`CREATE TABLE delta(
			rid INTEGER PRIMARY KEY,
			srcid INTEGER NOT NULL REFERENCES blob
		)`,
		`CREATE INDEX delta_i1 ON delta(srcid)`,
		`CREATE TABLE unclustered(rid INTEGER PRIMARY KEY)`,
		// Every stored blob names the rcvfrom row of its receipt.
		`CREATE TABLE rcvfrom(
			rcvid INTEGER PRIMARY KEY,
			uid INTEGER,
			mtime DATETIME,
			nonce TEXT UNIQUE,
			ipaddr TEXT
		)`,
	}
	_ = repoSchema
	for _, s := range repoSchema2 {
		if _, err := repoDB.Exec(s); err != nil {
			t.Fatalf("repo schema: %v\n  SQL: %s", err, s)
		}
	}

	// Store "hello" blob.
	rid, uuid, err := blob.Store(repoDB, []byte("hello"))
	if err != nil {
		t.Fatalf("blob.Store: %v", err)
	}

	// --- Checkout DB ---
	ckoutPath := filepath.Join(dir, ".fslckout")
	ckout, err = sql.Open(libdb.RegisteredDriver().Name, ckoutPath)
	if err != nil {
		t.Fatalf("open ckout db: %v", err)
	}
	t.Cleanup(func() { ckout.Close() })

	ckoutSchema := []string{
		`CREATE TABLE vvar(name TEXT PRIMARY KEY, value TEXT)`,
		`CREATE TABLE vfile(
			id       INTEGER PRIMARY KEY,
			vid      INTEGER,
			chnged   INTEGER DEFAULT 0,
			deleted  INTEGER DEFAULT 0,
			isexe    BOOLEAN DEFAULT 0,
			islink   BOOLEAN DEFAULT 0,
			rid      INTEGER DEFAULT 0,
			mrid     INTEGER DEFAULT 0,
			mtime    REAL DEFAULT 0,
			pathname TEXT,
			origname TEXT
		)`,
		`CREATE TABLE vmerge(id INTEGER, merge INTEGER, mhash TEXT)`,
	}
	for _, s := range ckoutSchema {
		if _, err := ckout.Exec(s); err != nil {
			t.Fatalf("ckout schema: %v\n  SQL: %s", err, s)
		}
	}

	// Populate vvar and vfile.
	if _, err := ckout.Exec("INSERT INTO vvar(name,value) VALUES('checkout','1')"); err != nil {
		t.Fatal(err)
	}
	if _, err := ckout.Exec("INSERT INTO vvar(name,value) VALUES('checkout-hash',?)", uuid); err != nil {
		t.Fatal(err)
	}
	if _, err := ckout.Exec("INSERT INTO vfile(id,vid,pathname,rid,mrid) VALUES(1,1,'a.txt',?,?)", int64(rid), int64(rid)); err != nil {
		t.Fatal(err)
	}

	// Write a.txt to disk with baseline content.
	if err := os.WriteFile(filepath.Join(dir, "a.txt"), []byte("hello"), 0o644); err != nil {
		t.Fatal(err)
	}

	return repoDB, ckout, dir
}

// modifyFile changes a.txt on disk and marks it changed in vfile.
func modifyFile(t *testing.T, ckout *sql.DB, dir string) {
	t.Helper()
	if err := os.WriteFile(filepath.Join(dir, "a.txt"), []byte("hello world"), 0o644); err != nil {
		t.Fatal(err)
	}
	if _, err := ckout.Exec("UPDATE vfile SET chnged=1 WHERE pathname='a.txt'"); err != nil {
		t.Fatal(err)
	}
}

func readFile(t *testing.T, path string) string {
	t.Helper()
	data, err := os.ReadFile(path)
	if err != nil {
		t.Fatalf("readFile(%s): %v", path, err)
	}
	return string(data)
}

func TestSaveAndList(t *testing.T) {
	repoDB, ckout, dir := testEnv(t)

	// Modify file.
	modifyFile(t, ckout, dir)

	// Save.
	if err := Save(ckout, repoDB, dir, "test stash"); err != nil {
		t.Fatalf("Save: %v", err)
	}

	// File should be reverted to baseline.
	got := readFile(t, filepath.Join(dir, "a.txt"))
	if got != "hello" {
		t.Errorf("after Save: a.txt = %q, want %q", got, "hello")
	}

	// vfile should show chnged=0.
	var chnged int
	if err := ckout.QueryRow("SELECT chnged FROM vfile WHERE pathname='a.txt'").Scan(&chnged); err != nil {
		t.Fatal(err)
	}
	if chnged != 0 {
		t.Errorf("after Save: vfile chnged = %d, want 0", chnged)
	}

	// List should have 1 entry.
	entries, err := List(ckout)
	if err != nil {
		t.Fatalf("List: %v", err)
	}
	if len(entries) != 1 {
		t.Fatalf("List: got %d entries, want 1", len(entries))
	}
	if entries[0].Comment != "test stash" {
		t.Errorf("List: comment = %q, want %q", entries[0].Comment, "test stash")
	}

	// Verify baseline hash is stored.
	expectedHash := hash.SHA1([]byte("hello"))
	if entries[0].Hash != expectedHash {
		// Hash is checkout-hash from vvar, not file hash — it's the manifest UUID.
		// Just check it's not empty.
	}
}

func TestPopRestoresChanges(t *testing.T) {
	repoDB, ckout, dir := testEnv(t)

	modifyFile(t, ckout, dir)

	if err := Save(ckout, repoDB, dir, "pop test"); err != nil {
		t.Fatalf("Save: %v", err)
	}

	// Verify reverted.
	if got := readFile(t, filepath.Join(dir, "a.txt")); got != "hello" {
		t.Fatalf("after Save: a.txt = %q, want %q", got, "hello")
	}

	// Pop.
	if err := Pop(ckout, repoDB, dir); err != nil {
		t.Fatalf("Pop: %v", err)
	}

	// File should have modified content.
	got := readFile(t, filepath.Join(dir, "a.txt"))
	if got != "hello world" {
		t.Errorf("after Pop: a.txt = %q, want %q", got, "hello world")
	}

	// List should be empty.
	entries, err := List(ckout)
	if err != nil {
		t.Fatalf("List: %v", err)
	}
	if len(entries) != 0 {
		t.Errorf("after Pop: List has %d entries, want 0", len(entries))
	}
}

func TestApplyKeepsStash(t *testing.T) {
	repoDB, ckout, dir := testEnv(t)

	modifyFile(t, ckout, dir)

	if err := Save(ckout, repoDB, dir, "apply test"); err != nil {
		t.Fatalf("Save: %v", err)
	}

	// Get the stash ID.
	entries, err := List(ckout)
	if err != nil {
		t.Fatal(err)
	}
	if len(entries) != 1 {
		t.Fatalf("expected 1 entry, got %d", len(entries))
	}

	// Apply.
	if err := Apply(ckout, repoDB, dir, entries[0].ID); err != nil {
		t.Fatalf("Apply: %v", err)
	}

	// File should have modified content.
	got := readFile(t, filepath.Join(dir, "a.txt"))
	if got != "hello world" {
		t.Errorf("after Apply: a.txt = %q, want %q", got, "hello world")
	}

	// List should still have 1 entry.
	entries, err = List(ckout)
	if err != nil {
		t.Fatal(err)
	}
	if len(entries) != 1 {
		t.Errorf("after Apply: List has %d entries, want 1", len(entries))
	}
}

func TestDropAndClear(t *testing.T) {
	repoDB, ckout, dir := testEnv(t)

	// Save twice (need to re-modify between saves).
	modifyFile(t, ckout, dir)
	if err := Save(ckout, repoDB, dir, "first"); err != nil {
		t.Fatalf("Save 1: %v", err)
	}

	modifyFile(t, ckout, dir)
	if err := Save(ckout, repoDB, dir, "second"); err != nil {
		t.Fatalf("Save 2: %v", err)
	}

	entries, err := List(ckout)
	if err != nil {
		t.Fatal(err)
	}
	if len(entries) != 2 {
		t.Fatalf("expected 2 entries, got %d", len(entries))
	}

	// Drop first (oldest = first in list, which is ordered by creation).
	firstID := entries[0].ID
	if err := Drop(ckout, firstID); err != nil {
		t.Fatalf("Drop: %v", err)
	}

	entries, err = List(ckout)
	if err != nil {
		t.Fatal(err)
	}
	if len(entries) != 1 {
		t.Fatalf("after Drop: expected 1 entry, got %d", len(entries))
	}
	if entries[0].Comment != "second" {
		t.Errorf("remaining entry comment = %q, want %q", entries[0].Comment, "second")
	}

	// Clear.
	if err := Clear(ckout); err != nil {
		t.Fatalf("Clear: %v", err)
	}

	entries, err = List(ckout)
	if err != nil {
		t.Fatal(err)
	}
	if len(entries) != 0 {
		t.Errorf("after Clear: expected 0 entries, got %d", len(entries))
	}
}

// Save cannot yet stash a pending merge: its revert path would rewrite the
// committed version and drop the merge. It must refuse, naming the file,
// rather than silently leave the merged file out of the stash (#233).
func TestSaveRefusesPendingMerge(t *testing.T) {
	repoDB, ckout, dir := testEnv(t)
	modifyFile(t, ckout, dir)
	if _, err := ckout.Exec("UPDATE vfile SET chnged=2 WHERE pathname='a.txt'"); err != nil {
		t.Fatal(err)
	}

	err := Save(ckout, repoDB, dir, "merge")
	if err == nil || !strings.Contains(err.Error(), "merge") {
		t.Fatalf("Save over a pending merge = %v, want a pending-merge refusal", err)
	}
	if got := readFile(t, filepath.Join(dir, "a.txt")); got != "hello world" {
		t.Fatalf("a.txt = %q after refusal, want the merged content kept", got)
	}
}

// A clean three-way merge leaves a plain edit (chnged=1, mrid=rid) and a
// vmerge record. Stashing the edit would leave the record naming a merge
// whose content is gone, and the next commit would claim the merge (#244).
func TestSaveRefusesCleanThreeWayMerge(t *testing.T) {
	repoDB, ckout, dir := testEnv(t)
	modifyFile(t, ckout, dir)
	if _, err := ckout.Exec("INSERT INTO vmerge(id, merge, mhash) VALUES(0, 99, 'h')"); err != nil {
		t.Fatal(err)
	}

	err := Save(ckout, repoDB, dir, "merged")
	if err == nil || !strings.Contains(err.Error(), "merge") {
		t.Fatalf("Save during a merge = %v, want a pending-merge refusal", err)
	}
	if got := readFile(t, filepath.Join(dir, "a.txt")); got != "hello world" {
		t.Fatalf("a.txt = %q after refusal, want the merged content kept", got)
	}
}

// Save cannot yet stash a rename: it records and restores files by their
// current name only. It must refuse rather than stash the rename as a plain
// edit and lose it (#233).
func TestSaveRefusesRename(t *testing.T) {
	repoDB, ckout, dir := testEnv(t)
	modifyFile(t, ckout, dir)
	if _, err := ckout.Exec("UPDATE vfile SET origname='old.txt' WHERE pathname='a.txt'"); err != nil {
		t.Fatal(err)
	}

	err := Save(ckout, repoDB, dir, "rename")
	if err == nil || !strings.Contains(err.Error(), "rename") {
		t.Fatalf("Save over a rename = %v, want a rename refusal", err)
	}
}

// An edit made on top of a merge drops chnged back to 1 but leaves mrid on
// the merged-in content: still a pending merge, still refused (#233).
func TestSaveRefusesEditOnTopOfMerge(t *testing.T) {
	repoDB, ckout, dir := testEnv(t)
	modifyFile(t, ckout, dir)
	if _, err := ckout.Exec("UPDATE vfile SET mrid=mrid+100 WHERE pathname='a.txt'"); err != nil {
		t.Fatal(err)
	}

	err := Save(ckout, repoDB, dir, "edited merge")
	if err == nil || !strings.Contains(err.Error(), "merge") {
		t.Fatalf("Save over an edited merge = %v, want a pending-merge refusal", err)
	}
}

// chnged 6 through 9 record a change to the executable or symlink bit, not a
// merge. Save cannot restore modes yet, so it refuses with an accurate reason
// rather than calling it a merge (#233).
func TestSaveRefusesModeChangeAccurately(t *testing.T) {
	repoDB, ckout, dir := testEnv(t)
	if _, err := ckout.Exec("UPDATE vfile SET chnged=6 WHERE pathname='a.txt'"); err != nil {
		t.Fatal(err)
	}

	err := Save(ckout, repoDB, dir, "mode")
	if err == nil || !strings.Contains(err.Error(), "permission") {
		t.Fatalf("Save over a mode change = %v, want a permission-change refusal", err)
	}
	if strings.Contains(err.Error(), "merge") {
		t.Fatalf("a mode change was reported as a merge: %v", err)
	}
}

// A stash's creation time is stored as fossil stores it, a Julian day
// (src/stash.c: julianday('now')), and listed as fossil's stash ls shows it,
// datetime(ctime). A row fossil wrote lists the same way.
func TestStashTimeAsFossil(t *testing.T) {
	repoDB, ckout, dir := testEnv(t)
	modifyFile(t, ckout, dir)
	if err := Save(ckout, repoDB, dir, "test stash"); err != nil {
		t.Fatalf("Save: %v", err)
	}
	var typ string
	if err := ckout.QueryRow("SELECT typeof(ctime) FROM stash").Scan(&typ); err != nil {
		t.Fatal(err)
	}
	if typ != "real" {
		t.Errorf("stash.ctime stored as %s, want a Julian day (real)", typ)
	}
	if _, err := ckout.Exec("INSERT INTO stash(stashid, hash, comment, ctime)" +
		" VALUES(99, '', 'fossil', 2461332.5)"); err != nil {
		t.Fatal(err)
	}
	entries, err := List(ckout)
	if err != nil {
		t.Fatalf("List: %v", err)
	}
	shape := regexp.MustCompile(`^\d{4}-\d\d-\d\d \d\d:\d\d:\d\d$`)
	for _, e := range entries {
		if !shape.MatchString(e.CTime) {
			t.Errorf("stash %d: CTime %q, want datetime(ctime)'s YYYY-MM-DD HH:MM:SS", e.ID, e.CTime)
		}
		if e.ID == 99 && e.CTime != "2026-10-19 00:00:00" {
			t.Errorf("fossil's stash: CTime %q, want 2026-10-19 00:00:00", e.CTime)
		}
	}
}

// Stashes list in creation order, oldest first, as fossil's stash ls orders
// them (ORDER BY ctime); stash ids break a tie.
func TestListOrdersByCreationTime(t *testing.T) {
	_, ckout, _ := testEnv(t)
	if err := EnsureTables(ckout); err != nil {
		t.Fatal(err)
	}
	for _, row := range []string{
		"(1, '', 'b', 2461332.6)", "(2, '', 'a', 2461332.5)",
		"(3, '', 'd', 2461332.7)", "(4, '', 'c', 2461332.6)",
	} {
		if _, err := ckout.Exec("INSERT INTO stash(stashid, hash, comment, ctime) VALUES" + row); err != nil {
			t.Fatal(err)
		}
	}
	entries, err := List(ckout)
	if err != nil {
		t.Fatal(err)
	}
	var got []int64
	for _, e := range entries {
		got = append(got, e.ID)
	}
	if want := []int64{2, 1, 4, 3}; !reflect.DeepEqual(got, want) {
		t.Fatalf("List order = %v, want %v", got, want)
	}
}