Artifact [e7d4a8772a]

Artifact e7d4a8772aa706841a2cc794126420c601a0d28680691ded59b79575d17ecde4:

• File cli/repo_merge_renames_test.go — part of check-in [2c3a78cf5e] at 2026-10-22 21:16:18 on branch feat/horizon-cones — fix(merge): follow renames as fossil's merge does

  A file renamed on one side and edited on the other was merged as a deletion plus an addition: the edit was kept under the old name and the renamed copy arrived beside it, so fossil and go-libfossil left different trees and recorded different changes for the same merge.

  Port fossil's rename matching (merge.c merge_cmd): the name pivot nid (pivot_find(1) of M and V, rerun against P when they differ), the renames from nid to V, P and M (path.c find_filename_changes, one way, now path.FilenameChanges), and the fv table those fill (add_renames, the nid!=pid name fill-in, then the files of V, P and M) as merge.MatchFiles/FollowRenames. Checkout.Merge classifies each matched file as before and renames on disk and in vfile a file the merged-in version renamed and the checkout did not, after the other steps, moving swapped names together and setting aside a removed or deleted row that held the new name. Where fossil would rename over a kept tracked file or an untracked one, Merge refuses, as it already does for adds.

  Repo.Merge matches files the same way and commits the merged tree whole, recording the rename (FileToCommit.OldName); the whole-tree commit also stops it carrying forward a file the merge deleted. The CLI prints RENAME lines where fossil's merge prints them. (user: [email protected], size: 1656) [annotate] [blame] [check-ins using] [more...]

package cli_test

import (
	"os"
	"path/filepath"
	"strings"
	"testing"

	"github.com/danmestas/go-libfossil/cli"
)

// merge prints what fossil's merge prints for a file the merged-in version
// renamed and both sides edited: the merge under the old name, the rename
// after it, and additions last.
func TestRepoMergePrintsRenamesLikeFossil(t *testing.T) {
	bin, repoPath, ckDir := fossilCheckout(t)
	writeCkFile(t, ckDir, "a.txt", "one\nx\nx\nx\ntwo\n")
	runFossil(t, bin, ckDir, "commit", "-m", "base")
	runFossil(t, bin, ckDir, "mv", "--hard", "a.txt", "r.txt")
	writeCkFile(t, ckDir, "r.txt", "one feat\nx\nx\nx\ntwo\n")
	writeCkFile(t, ckDir, "n.txt", "new\n")
	runFossil(t, bin, ckDir, "add", "n.txt")
	runFossil(t, bin, ckDir, "commit", "-m", "feat", "--branch", "feat")
	runFossil(t, bin, ckDir, "update", "trunk")
	writeCkFile(t, ckDir, "a.txt", "one\nx\nx\nx\ntwo trunk\n")
	runFossil(t, bin, ckDir, "commit", "-m", "trunk")

	fossilCk := filepath.Join(t.TempDir(), "ck2")
	if err := os.Mkdir(fossilCk, 0o755); err != nil {
		t.Fatal(err)
	}
	runFossil(t, bin, fossilCk, "open", repoPath, "trunk")
	var want string
	for _, line := range strings.SplitAfter(runFossil(t, bin, fossilCk, "merge", "feat"), "\n") {
		if !strings.Contains(line, "fossil undo") {
			want += line
		}
	}

	got := captureStdout(t, func() error {
		return (&cli.RepoMergeCmd{Version: "feat", Dir: ckDir}).Run(&cli.Globals{Repo: repoPath})
	})
	if got != want {
		t.Errorf("merge printed:\n%s\nfossil merge printed:\n%s", got, want)
	}
	if got := readCkFile(t, ckDir, "r.txt"); got != "one feat\nx\nx\nx\ntwo trunk\n" {
		t.Errorf("r.txt = %q, want both edits", got)
	}
}