From 30a5d1b486edaab21add811ee1531a6abd621cfe Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sat, 21 Mar 2020 19:57:57 +1100
Subject: move into undoing file

---
 pkg/gui/reflog_panel.go | 160 ------------------------------------------------
 1 file changed, 160 deletions(-)

(limited to 'pkg/gui/reflog_panel.go')

diff --git a/pkg/gui/reflog_panel.go b/pkg/gui/reflog_panel.go
index 691ff34bb..fd26a67c8 100644
--- a/pkg/gui/reflog_panel.go
+++ b/pkg/gui/reflog_panel.go
@@ -1,8 +1,6 @@
 package gui
 
 import (
-	"regexp"
-
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/gui/presentation"
@@ -101,161 +99,3 @@ func (gui *Gui) handleCreateReflogResetMenu(g *gocui.Gui, v *gocui.View) error {
 
 	return gui.createResetMenu(commit.Sha)
 }
-
-const (
-	USER_ACTION = iota
-	UNDO
-	REDO
-)
-
-type reflogAction struct {
-	regexStr string
-	action   func(match []string, commitSha string, waitingStatus string, envVars []string, isUndo bool) error
-	kind     int
-}
-
-func (gui *Gui) reflogActions() []reflogAction {
-	return []reflogAction{
-		{
-			regexStr: `^checkout: moving from ([\S]+) to ([\S]+)`,
-			kind:     USER_ACTION,
-			action: func(match []string, commitSha string, waitingStatus string, envVars []string, isUndo bool) error {
-				branchName := match[2]
-				if isUndo {
-					branchName = match[1]
-				}
-				return gui.handleCheckoutRef(branchName, handleCheckoutRefOptions{
-					WaitingStatus: waitingStatus,
-					EnvVars:       envVars,
-				},
-				)
-			},
-		},
-		{
-			regexStr: `^commit|^rebase -i \(start\)|^reset: moving to|^pull`,
-			kind:     USER_ACTION,
-			action: func(match []string, commitSha string, waitingStatus string, envVars []string, isUndo bool) error {
-				return gui.handleHardResetWithAutoStash(commitSha, handleHardResetWithAutoStashOptions{EnvVars: envVars, WaitingStatus: waitingStatus})
-			},
-		},
-		{
-			regexStr: `^\[lazygit undo\]`,
-			kind:     UNDO,
-		},
-		{
-			regexStr: `^\[lazygit redo\]`,
-			kind:     REDO,
-		},
-	}
-}
-
-func (gui *Gui) reflogUndo(g *gocui.Gui, v *gocui.View) error {
-	return gui.iterateUserActions(func(match []string, reflogCommits []*commands.Commit, reflogIdx int, action reflogAction, counter int) (bool, error) {
-		if counter == -1 {
-			prevCommitSha := ""
-			if len(reflogCommits)-1 >= reflogIdx+1 {
-				prevCommitSha = reflogCommits[reflogIdx+1].Sha
-			}
-			return true, action.action(match, prevCommitSha, gui.Tr.SLocalize("UndoingStatus"), []string{"GIT_REFLOG_ACTION=[lazygit undo]"}, true)
-		} else {
-			return false, nil
-		}
-	})
-}
-
-func (gui *Gui) reflogRedo(g *gocui.Gui, v *gocui.View) error {
-	return gui.iterateUserActions(func(match []string, reflogCommits []*commands.Commit, reflogIdx int, action reflogAction, counter int) (bool, error) {
-		if counter == 0 {
-			return true, action.action(match, reflogCommits[reflogIdx].Sha, gui.Tr.SLocalize("RedoingStatus"), []string{"GIT_REFLOG_ACTION=[lazygit redo]"}, false)
-		} else if counter < 0 {
-			return true, nil
-		} else {
-			return false, nil
-		}
-	})
-}
-
-func (gui *Gui) iterateUserActions(onUserAction func(match []string, reflogCommits []*commands.Commit, reflogIdx int, action reflogAction, counter int) (bool, error)) error {
-	reflogCommits := gui.State.ReflogCommits
-
-	counter := 0
-	for i, reflogCommit := range reflogCommits {
-		for _, action := range gui.reflogActions() {
-			re := regexp.MustCompile(action.regexStr)
-			match := re.FindStringSubmatch(reflogCommit.Name)
-			if len(match) == 0 {
-				continue
-			}
-
-			switch action.kind {
-			case UNDO:
-				counter++
-			case REDO:
-				counter--
-			case USER_ACTION:
-				counter--
-				shouldReturn, err := onUserAction(match, reflogCommits, i, action, counter)
-				if err != nil {
-					return err
-				}
-				if shouldReturn {
-					return nil
-				}
-			}
-		}
-	}
-	return nil
-}
-
-type handleHardResetWithAutoStashOptions struct {
-	WaitingStatus string
-	EnvVars       []string
-}
-
-// only to be used in the undo flow for now
-func (gui *Gui) handleHardResetWithAutoStash(commitSha string, options handleHardResetWithAutoStashOptions) error {
-	// if we have any modified tracked files we need to ask the user if they want us to stash for them
-	dirtyWorkingTree := false
-	for _, file := range gui.State.Files {
-		if file.Tracked {
-			dirtyWorkingTree = true
-			break
-		}
-	}
-
-	reset := func() error {
-		if err := gui.resetToRef(commitSha, "hard", commands.RunCommandOptions{EnvVars: options.EnvVars}); err != nil {
-			return gui.createErrorPanel(gui.g, err.Error())
-		}
-		return nil
-	}
-
-	if dirtyWorkingTree {
-		// offer to autostash changes
-		return gui.createConfirmationPanel(gui.g, gui.getBranchesView(), true, gui.Tr.SLocalize("AutoStashTitle"), gui.Tr.SLocalize("AutoStashPrompt"), func(g *gocui.Gui, v *gocui.View) error {
-			return gui.WithWaitingStatus(options.WaitingStatus, func() error {
-				if err := gui.GitCommand.StashSave(gui.Tr.SLocalize("StashPrefix") + commitSha); err != nil {
-					return gui.createErrorPanel(g, err.Error())
-				}
-				if err := reset(); err != nil {
-					return err
-				}
-
-				if err := gui.GitCommand.StashDo(0, "pop"); err != nil {
-					if err := gui.refreshSidePanels(g); err != nil {
-						return err
-					}
-					return gui.createErrorPanel(g, err.Error())
-				}
-				return gui.refreshSidePanels(g)
-			})
-		}, nil)
-	}
-
-	return gui.WithWaitingStatus(options.WaitingStatus, func() error {
-		if err := reset(); err != nil {
-			return err
-		}
-		return gui.refreshSidePanels(gui.g)
-	})
-}
-- 
cgit v1.2.3