chore: refactor rename stash

This commit is contained in:
Ryooooooga 2022-10-15 11:15:31 +09:00
parent 8a9eefa4d2
commit eceb3a5aa6
No known key found for this signature in database
GPG key ID: 07CF200DFCC20C25
3 changed files with 70 additions and 15 deletions

View file

@ -1,7 +1,9 @@
package git_commands
import (
"errors"
"fmt"
"regexp"
"strings"
"github.com/jesseduffield/lazygit/pkg/commands/loaders"
@ -119,3 +121,26 @@ func (self *StashCommands) SaveStagedChanges(message string) error {
return nil
}
func (self *StashCommands) Rename(index int, message string) error {
output, err := self.Drop(index)
if err != nil {
return err
}
// `output` is in the following format:
// Dropped refs/stash@{0} (f0d0f20f2f61ffd6d6bfe0752deffa38845a3edd)
stashShaPattern := regexp.MustCompile(`\(([0-9a-f]+)\)`)
matches := stashShaPattern.FindStringSubmatch(output)
if len(matches) <= 1 {
return errors.New("Output of `git stash drop` is invalid") // Usually this error does not occur
}
stashSha := matches[1]
err = self.Store(stashSha, message)
if err != nil {
return err
}
return nil
}

View file

@ -123,3 +123,46 @@ func TestStashStashEntryCmdObj(t *testing.T) {
})
}
}
func TestStashRename(t *testing.T) {
type scenario struct {
testName string
index int
message string
expectedDropCmd []string
dropResult string
expectedStoreCmd []string
}
scenarios := []scenario{
{
testName: "Default case",
index: 3,
message: "New message",
expectedDropCmd: []string{"stash", "drop", "stash@{3}"},
dropResult: "Dropped refs/stash@{3} (f0d0f20f2f61ffd6d6bfe0752deffa38845a3edd)\n",
expectedStoreCmd: []string{"stash", "store", "f0d0f20f2f61ffd6d6bfe0752deffa38845a3edd", "-m", "New message"},
},
{
testName: "Empty message",
index: 4,
message: "",
expectedDropCmd: []string{"stash", "drop", "stash@{4}"},
dropResult: "Dropped refs/stash@{4} (f0d0f20f2f61ffd6d6bfe0752deffa38845a3edd)\n",
expectedStoreCmd: []string{"stash", "store", "f0d0f20f2f61ffd6d6bfe0752deffa38845a3edd"},
},
}
for _, s := range scenarios {
s := s
t.Run(s.testName, func(t *testing.T) {
runner := oscommands.NewFakeRunner(t).
ExpectGitArgs(s.expectedDropCmd, s.dropResult, nil).
ExpectGitArgs(s.expectedStoreCmd, "", nil)
instance := buildStashCommands(commonDeps{runner: runner})
err := instance.Rename(s.index, s.message)
assert.NoError(t, err)
})
}
}