1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
package save
import (
"fmt"
"time"
"github.com/MakeNowJust/heredoc/v2"
"github.com/briandowns/spinner"
"gitlab.com/gitlab-org/cli/internal/run"
"gitlab.com/gitlab-org/cli/pkg/git"
"gitlab.com/gitlab-org/cli/pkg/text"
"github.com/spf13/cobra"
"gitlab.com/gitlab-org/cli/commands/cmdutils"
)
func NewCmdAmendStack(f *cmdutils.Factory, getText cmdutils.GetTextUsingEditor) *cobra.Command {
stackSaveCmd := &cobra.Command{
Use: "amend",
Short: `Save more changes to a stacked diff. (EXPERIMENTAL.)`,
Long: `Add more changes to an existing stacked diff.
` + text.ExperimentalString,
Example: heredoc.Doc(`glab stack amend modifiedfile
glab stack amend . -m "fixed a function"
glab stack amend newfile -d "forgot to add this"`),
RunE: func(cmd *cobra.Command, args []string) error {
output, err := amendFunc(f, args, getText, description)
if err != nil {
return fmt.Errorf("could not run stack amend: %v", err)
}
if f.IO.IsOutputTTY() {
fmt.Fprint(f.IO.StdOut, output)
}
return nil
},
}
stackSaveCmd.Flags().StringVarP(&description, "description", "d", "", "a description of the change")
stackSaveCmd.Flags().StringVarP(&description, "message", "m", "", "alias for the description flag")
stackSaveCmd.MarkFlagsMutuallyExclusive("message", "description")
return stackSaveCmd
}
func amendFunc(f *cmdutils.Factory, args []string, getText cmdutils.GetTextUsingEditor, description string) (string, error) {
// check if there are even any changes before we start
err := checkForChanges()
if err != nil {
return "", fmt.Errorf("could not save: %v", err)
}
// get stack title
title, err := git.GetCurrentStackTitle()
if err != nil {
return "", fmt.Errorf("error running Git command: %v", err)
}
ref, err := git.CurrentStackRefFromCurrentBranch(title)
if err != nil {
return "", fmt.Errorf("error checking for stack: %v", err)
}
if ref.Branch == "" {
return "", fmt.Errorf("not currently in a stack. Change to the branch you want to amend.")
}
// a description is required, so ask if one is not provided
if description == "" {
description, err = promptForCommit(f, getText, ref.Description)
if err != nil {
return "", fmt.Errorf("error getting commit message: %v", err)
}
}
s := spinner.New(spinner.CharSets[11], 100*time.Millisecond)
// git add files
_, err = addFiles(args[0:])
if err != nil {
return "", fmt.Errorf("error adding files: %v", err)
}
// run the amend commit
err = gitAmend(description)
if err != nil {
return "", fmt.Errorf("error amending commit with Git: %v", err)
}
var output string
if f.IO.IsOutputTTY() {
output = fmt.Sprintf("Amended stack item with description: %q.\n", description)
}
s.Stop()
return output, nil
}
func gitAmend(description string) error {
amendCmd := git.GitCommand("commit", "--amend", "-m", description)
output, err := run.PrepareCmd(amendCmd).Output()
if err != nil {
return fmt.Errorf("error running Git command: %v", err)
}
fmt.Println("Amend commit: ", string(output))
return nil
}
|
