Artifact [e4078adb7a]

Artifact e4078adb7a6b1368fcb31b2115d22978d77520e3611963f0b5b3070c946681d3:

• File cli/repo_add.go — part of check-in [7ea6fba63f] at 2026-10-06 15:57:25 on branch trunk — fix(checkout): merge the way fossil does, and commit merges with their parent (#244) (#252)

  The CLI's merge marked a conflict with vfile.chnged=5, which fossil reads as "added by integrate", and recorded no merge-in version or vmerge row, so a merge went unseen and the next commit dropped the merge parent.

  Merging now lives in the library as Checkout.Merge and records what fossil records: chnged=2 and mrid for a file taken from the merged-in version, chnged=3 for an added file, a per-file vmerge row for a merged file, and vmerge id 0 for the merge. Conflicts use fossil's markers and are found by looking for them (Checkout.Conflicts), so fossil and go-libfossil read each other's merges. Where fossil relies on its undo copy, Merge keeps the file or refuses instead.

  Commit reads vmerge for merge parents, and, as fossil's commit does, refuses unresolved conflict markers, empty commits, unknown names and partial commits of a merge. The CLI's merge, conflicts, mark-resolved and ci commands call the library; ci now commits the checkout. (user: [email protected], size: 1417) [annotate] [blame] [check-ins using]

package cli

import (
	"fmt"
	"path/filepath"
)

// RepoAddCmd stages files for addition in the checkout database.
type RepoAddCmd struct {
	Files []string `arg:"" required:"" help:"Files to stage for addition"`
	Dir   string   `short:"d" help:"Checkout directory" default:"."`
}

func (c *RepoAddCmd) Run(g *Globals) (err error) {
	_, co, done, err := openWorkingCheckout(g, c.Dir)
	if err != nil {
		return err
	}
	defer closeWith(done, &err)

	absDir, err := filepath.Abs(c.Dir)
	if err != nil {
		return err
	}
	for _, path := range c.Files {
		relPath, err := checkoutRelative(absDir, path)
		if err != nil {
			return err
		}
		added, err := co.Add([]string{relPath})
		if err != nil {
			return err
		}
		if added == 0 {
			fmt.Printf("TRACKED  %s\n", relPath)
			continue
		}
		fmt.Printf("ADDED    %s\n", relPath)
	}
	return nil
}

// checkoutRelative turns a file argument, absolute or relative to the
// current directory, into a path relative to the checkout at absDir.
func checkoutRelative(absDir, path string) (string, error) {
	absPath, err := filepath.Abs(path)
	if err != nil {
		return "", err
	}
	relPath, err := filepath.Rel(absDir, absPath)
	if err != nil {
		return "", fmt.Errorf("file %s is not within checkout directory: %w", path, err)
	}
	if !filepath.IsLocal(relPath) {
		return "", fmt.Errorf("file %s is not within checkout directory", path)
	}
	return filepath.ToSlash(relPath), nil
}