mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-01-22 05:29:44 +02:00
100 lines
2.8 KiB
Go
100 lines
2.8 KiB
Go
package commands
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands/loaders"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
|
|
"github.com/jesseduffield/lazygit/pkg/common"
|
|
)
|
|
|
|
type StashCommands struct {
|
|
*common.Common
|
|
|
|
cmd oscommands.ICmdObjBuilder
|
|
fileLoader *loaders.FileLoader
|
|
osCommand *oscommands.OSCommand
|
|
workingTree *WorkingTreeCommands
|
|
}
|
|
|
|
func NewStashCommands(
|
|
common *common.Common,
|
|
cmd oscommands.ICmdObjBuilder,
|
|
osCommand *oscommands.OSCommand,
|
|
fileLoader *loaders.FileLoader,
|
|
workingTree *WorkingTreeCommands,
|
|
) *StashCommands {
|
|
return &StashCommands{
|
|
Common: common,
|
|
cmd: cmd,
|
|
fileLoader: fileLoader,
|
|
osCommand: osCommand,
|
|
workingTree: workingTree,
|
|
}
|
|
}
|
|
|
|
func (self *StashCommands) Drop(index int) error {
|
|
return self.cmd.New(fmt.Sprintf("git stash drop stash@{%d}", index)).Run()
|
|
}
|
|
|
|
func (self *StashCommands) Pop(index int) error {
|
|
return self.cmd.New(fmt.Sprintf("git stash pop stash@{%d}", index)).Run()
|
|
}
|
|
|
|
func (self *StashCommands) Apply(index int) error {
|
|
return self.cmd.New(fmt.Sprintf("git stash apply stash@{%d}", index)).Run()
|
|
}
|
|
|
|
// Save save stash
|
|
// TODO: before calling this, check if there is anything to save
|
|
func (self *StashCommands) Save(message string) error {
|
|
return self.cmd.New("git stash save " + self.cmd.Quote(message)).Run()
|
|
}
|
|
|
|
func (self *StashCommands) ShowStashEntryCmdObj(index int) oscommands.ICmdObj {
|
|
cmdStr := fmt.Sprintf("git stash show -p --stat --color=%s --unified=%d stash@{%d}", self.UserConfig.Git.Paging.ColorArg, self.UserConfig.Git.DiffContextSize, index)
|
|
|
|
return self.cmd.New(cmdStr).DontLog()
|
|
}
|
|
|
|
// SaveStagedChanges stashes only the currently staged changes. This takes a few steps
|
|
// shoutouts to Joe on https://stackoverflow.com/questions/14759748/stashing-only-staged-changes-in-git-is-it-possible
|
|
func (self *StashCommands) SaveStagedChanges(message string) error {
|
|
// wrap in 'writing', which uses a mutex
|
|
if err := self.cmd.New("git stash --keep-index").Run(); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := self.Save(message); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := self.cmd.New("git stash apply stash@{1}").Run(); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := self.osCommand.PipeCommands("git stash show -p", "git apply -R"); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := self.cmd.New("git stash drop stash@{1}").Run(); err != nil {
|
|
return err
|
|
}
|
|
|
|
// if you had staged an untracked file, that will now appear as 'AD' in git status
|
|
// meaning it's deleted in your working tree but added in your index. Given that it's
|
|
// now safely stashed, we need to remove it.
|
|
files := self.fileLoader.
|
|
GetStatusFiles(loaders.GetStatusFileOptions{})
|
|
|
|
for _, file := range files {
|
|
if file.ShortStatus == "AD" {
|
|
if err := self.workingTree.UnStageFile(file.Names(), false); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|