fixup! Add merge options menu

Author: lmnek

pkg/commands/git_commands/working_tree.go

@@ -409,6 +409,14 @@ func (self *WorkingTreeCommands) ResetMixed(ref string) error {
 	return self.cmd.New(cmdArgs).Run()
 }
 
+func (self *WorkingTreeCommands) ShowFileAtStage(path string, stage int) (string, error) {
+	cmdArgs := NewGitCmd("show").
+		Arg(fmt.Sprintf(":%d:%s", stage, path)).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).RunWithOutput()
+}
+
 func (self *WorkingTreeCommands) ObjectIDAtStage(path string, stage int) (string, error) {
 	cmdArgs := NewGitCmd("rev-parse").
 		Arg(fmt.Sprintf(":%d:%s", stage, path)).
@@ -422,11 +430,22 @@ func (self *WorkingTreeCommands) ObjectIDAtStage(path string, stage int) (string
 	return strings.TrimSpace(output), nil
 }
 
-func (self *WorkingTreeCommands) MergeFile(strategy string, oursID string, baseID string, theirsID string) (string, error) {
+func (self *WorkingTreeCommands) MergeFileForFiles(strategy string, oursFilepath string, baseFilepath string, theirsFilepath string) (string, error) {
+	cmdArgs := NewGitCmd("merge-file").
+		Arg(strategy).
+		Arg("--stdout").
+		Arg(oursFilepath, baseFilepath, theirsFilepath).
+		ToArgv()
+
+	return self.cmd.New(cmdArgs).RunWithOutput()
+}
+
+// OIDs mode (Git 2.43+)
+func (self *WorkingTreeCommands) MergeFileForObjectIDs(strategy string, oursID string, baseID string, theirsID string) (string, error) {
 	cmdArgs := NewGitCmd("merge-file").
-		Arg("--object-id").
 		Arg(strategy).
 		Arg("--stdout").
+		Arg("--object-id").
 		Arg(oursID, baseID, theirsID).
 		ToArgv()
 

pkg/gui/controllers/helpers/working_tree_helper.go

@@ -253,25 +253,78 @@ func (self *WorkingTreeHelper) commitPrefixConfigsForRepo() []config.CommitPrefi
 	return self.c.UserConfig().Git.CommitPrefix
 }
 
-func (self *WorkingTreeHelper) CreateMergeConflictMenu(selectedFilepaths []string) error {
-	onMergeStrategySelected := func(strategy string) error {
-		for _, filepath := range selectedFilepaths {
-			baseID, err := self.c.Git().WorkingTree.ObjectIDAtStage(filepath, 1)
-			if err != nil {
-				return err
-			}
+func (self *WorkingTreeHelper) mergeFile(filepath string, strategy string) (string, error) {
+	if self.c.Git().Version.IsOlderThan(2, 43, 0) {
+		return self.mergeFileWithTempFiles(filepath, strategy)
+	} else {
+		return self.mergeFileWithObjectIDs(filepath, strategy)
+	}
+}
 
-			oursID, err := self.c.Git().WorkingTree.ObjectIDAtStage(filepath, 2)
-			if err != nil {
-				return err
-			}
+func (self *WorkingTreeHelper) mergeFileWithTempFiles(filepath string, strategy string) (string, error) {
+	showToTempFile := func(stage int, label string) (string, error) {
+		output, err := self.c.Git().WorkingTree.ShowFileAtStage(filepath, stage)
+		if err != nil {
+			return "", err
+		}
 
-			theirsID, err := self.c.Git().WorkingTree.ObjectIDAtStage(filepath, 3)
-			if err != nil {
-				return err
-			}
+		f, err := os.CreateTemp("", "mergefile-"+label+"-*")
+		if err != nil {
+			return "", err
+		}
+		defer f.Close()
 
-			output, err := self.c.Git().WorkingTree.MergeFile(strategy, oursID, baseID, theirsID)
+		if _, err := f.Write([]byte(output)); err != nil {
+			return "", err
+		}
+
+		return f.Name(), nil
+	}
+
+	baseFilepath, err := showToTempFile(1, "base")
+	if err != nil {
+		return "", err
+	}
+	defer os.Remove(baseFilepath)
+
+	oursFilepath, err := showToTempFile(2, "ours")
+	if err != nil {
+		return "", err
+	}
+	defer os.Remove(oursFilepath)
+
+	theirsFilepath, err := showToTempFile(3, "theirs")
+	if err != nil {
+		return "", err
+	}
+	defer os.Remove(theirsFilepath)
+
+	return self.c.Git().WorkingTree.MergeFileForFiles(strategy, oursFilepath, baseFilepath, theirsFilepath)
+}
+
+func (self *WorkingTreeHelper) mergeFileWithObjectIDs(filepath, strategy string) (string, error) {
+	baseID, err := self.c.Git().WorkingTree.ObjectIDAtStage(filepath, 1)
+	if err != nil {
+		return "", err
+	}
+
+	oursID, err := self.c.Git().WorkingTree.ObjectIDAtStage(filepath, 2)
+	if err != nil {
+		return "", err
+	}
+
+	theirsID, err := self.c.Git().WorkingTree.ObjectIDAtStage(filepath, 3)
+	if err != nil {
+		return "", err
+	}
+
+	return self.c.Git().WorkingTree.MergeFileForObjectIDs(strategy, oursID, baseID, theirsID)
+}
+
+func (self *WorkingTreeHelper) CreateMergeConflictMenu(selectedFilepaths []string) error {
+	onMergeStrategySelected := func(strategy string) error {
+		for _, filepath := range selectedFilepaths {
+			output, err := self.mergeFile(filepath, strategy)
 			if err != nil {
 				return err
 			}