✨ Add toggling between new and amend commits

Add feature to toggle between new and amend commits. The state is preserved between the two different types which helps when deciding which type of commit to apply. The existing flag can still be used to set the initial state. Switching state resets the cursor to the beginning of each input. Further code changes are required to apply the commit based on the current state.
mikelorant · Jan 31, 2023 · 898ceeb · 898ceeb
1 parent 75f985b
commit 898ceeb
Show file tree

Hide file tree

Showing 45 changed files with 138 additions and 47 deletions.
diff --git a/internal/ui/body/body.go b/internal/ui/body/body.go
@@ -119,10 +119,25 @@ func (m Model) Value() string {
 	return res
 }
 
+func (m Model) RawValue() string {
+	return m.textArea.Value()
+}
+
 func (m *Model) SetValue(str string) {
 	m.textArea.SetValue(str)
 }
 
+func (m *Model) Reset() {
+	m.textArea.Reset()
+}
+
+func (m *Model) CursorStart() {
+	m.textArea.CursorStart()
+	for i := 1; i < m.textArea.LineCount(); i++ {
+		m.textArea.CursorUp()
+	}
+}
+
 func ToModel(m tea.Model, c tea.Cmd) (Model, tea.Cmd) {
 	return m.(Model), c
 }

diff --git a/internal/ui/defaults.go b/internal/ui/defaults.go
@@ -1,6 +1,7 @@
 package ui
 
 import (
+	"github.com/mikelorant/committed/internal/commit"
 	"github.com/mikelorant/committed/internal/config"
 	"github.com/mikelorant/committed/internal/ui/theme"
 )
@@ -39,3 +40,16 @@ func (m *Model) defaultTheme(th string, clr config.Colour) {
 
 	m.state.Theme = t
 }
+
+func defaultAmendSave(st *commit.State) savedState {
+	var save savedState
+
+	save.amend = true
+	if e := commit.MessageToEmoji(st.Emojis, st.Repository.Head.Message); e.Valid {
+		save.emoji = e.Emoji
+	}
+	save.summary = commit.MessageToSummary(st.Repository.Head.Message)
+	save.body = commit.MessageToBody(st.Repository.Head.Message)
+
+	return save
+}
diff --git a/internal/ui/header/header.go b/internal/ui/header/header.go
@@ -178,6 +178,14 @@ func (m *Model) SetSummary(str string) {
 	m.summaryInput.SetValue(str)
 }
 
+func (m *Model) ResetSummary() {
+	m.summaryInput.Reset()
+}
+
+func (m *Model) CursorStartSummary() {
+	m.summaryInput.CursorStart()
+}
+
 func (m *Model) ToggleAmend() {
 	m.Amend = !m.Amend
 }

diff --git a/internal/ui/status/status.go b/internal/ui/status/status.go
@@ -138,6 +138,7 @@ func defaultKeyBindings() []shortcut.KeyBinding {
 	return []shortcut.KeyBinding{
 		{Modifier: shortcut.ControlModifier, Key: "c", Label: "Cancel"},
 		{Modifier: shortcut.AltModifier, Key: "enter", Label: "Commit"},
+		{Modifier: shortcut.AltModifier, Key: "a", Label: "Amend"},
 		{Modifier: shortcut.AltModifier, Key: "s", Label: "Sign-off"},
 		{Modifier: shortcut.AltModifier, Key: "/", Label: "Help"},
 	}

diff --git a/internal/ui/status/testdata/default.golden b/internal/ui/status/testdata/default.golden
@@ -1,2 +1,2 @@
- Alt + <enter> Commit <s> Sign-off </> Help
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help
 Ctrl +     <c> Cancel
diff --git a/internal/ui/status/testdata/help.golden b/internal/ui/status/testdata/help.golden
@@ -1,2 +1,2 @@
- Alt + <enter> Commit <s> Sign-off </> Help                           Exit <esc>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help                 Exit <esc>
 Ctrl +     <c> Cancel
diff --git a/internal/ui/status/testdata/next.golden b/internal/ui/status/testdata/next.golden
@@ -1,2 +1,2 @@
- Alt + <enter> Commit <s> Sign-off </> Help                   next <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help         next <tab>
 Ctrl +     <c> Cancel
diff --git a/internal/ui/status/testdata/next_previous.golden b/internal/ui/status/testdata/next_previous.golden
@@ -1,2 +1,2 @@
- Alt + <enter> Commit <s> Sign-off </> Help                   next <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help         next <tab>
 Ctrl +     <c> Cancel                                     previous <tab> + Shift
diff --git a/internal/ui/status/testdata/previous.golden b/internal/ui/status/testdata/previous.golden
@@ -1,2 +1,2 @@
- Alt + <enter> Commit <s> Sign-off </> Help
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help
 Ctrl +     <c> Cancel                                     previous <tab> + Shift
diff --git a/internal/ui/testdata/alt+1.golden b/internal/ui/testdata/alt+1.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                  Emoji <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help        Emoji <tab>
 Ctrl +     <c> Cancel
diff --git a/internal/ui/testdata/alt+1_twice.golden b/internal/ui/testdata/alt+1_twice.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                  Emoji <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help        Emoji <tab>
 Ctrl +     <c> Cancel
diff --git a/internal/ui/testdata/alt+2.golden b/internal/ui/testdata/alt+2.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift
diff --git a/internal/ui/testdata/alt+2_twice.golden b/internal/ui/testdata/alt+2_twice.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift
diff --git a/internal/ui/testdata/alt+3.golden b/internal/ui/testdata/alt+3.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                   Body <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help         Body <tab>
 Ctrl +     <c> Cancel                                        Emoji <tab> + Shift
diff --git a/internal/ui/testdata/alt+3_twice.golden b/internal/ui/testdata/alt+3_twice.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                   Body <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help         Body <tab>
 Ctrl +     <c> Cancel                                        Emoji <tab> + Shift
diff --git a/internal/ui/testdata/alt+4.golden b/internal/ui/testdata/alt+4.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │                                                                          │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help
 Ctrl +     <c> Cancel                                      Summary <tab> + Shift
diff --git a/internal/ui/testdata/alt+4_twice.golden b/internal/ui/testdata/alt+4_twice.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │                                                                          │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help
 Ctrl +     <c> Cancel                                      Summary <tab> + Shift
diff --git a/internal/ui/testdata/alt+enter_invalid.golden b/internal/ui/testdata/alt+enter_invalid.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │                                                                          │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help
 Ctrl +     <c> Cancel                                      Summary <tab> + Shift
diff --git a/internal/ui/testdata/alt+s.golden b/internal/ui/testdata/alt+s.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
 
       Signed-off-by: John Doe <[email protected]>
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift
diff --git a/internal/ui/testdata/alt+s_change_author.golden b/internal/ui/testdata/alt+s_change_author.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
 
       Signed-off-by: John Doe <[email protected]>
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift
diff --git a/internal/ui/testdata/alt+s_twice.golden b/internal/ui/testdata/alt+s_twice.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift
diff --git a/internal/ui/testdata/alt+slash.golden b/internal/ui/testdata/alt+slash.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │                                                                          │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                           Exit <esc>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help                 Exit <esc>
 Ctrl +     <c> Cancel
diff --git a/internal/ui/testdata/alt+slash_twice.golden b/internal/ui/testdata/alt+slash_twice.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift
diff --git a/internal/ui/testdata/alt+slash_twice_body.golden b/internal/ui/testdata/alt+slash_twice_body.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │                                                                          │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help
 Ctrl +     <c> Cancel                                      Summary <tab> + Shift
diff --git a/internal/ui/testdata/alt+t.golden b/internal/ui/testdata/alt+t.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift
diff --git a/internal/ui/testdata/config_author.golden b/internal/ui/testdata/config_author.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                  Emoji <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help        Emoji <tab>
 Ctrl +     <c> Cancel
diff --git a/internal/ui/testdata/config_emoji.golden b/internal/ui/testdata/config_emoji.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift
diff --git a/internal/ui/testdata/config_signoff_off.golden b/internal/ui/testdata/config_signoff_off.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift
diff --git a/internal/ui/testdata/config_signoff_on.golden b/internal/ui/testdata/config_signoff_on.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
 
       Signed-off-by: John Doe <[email protected]>
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift
diff --git a/internal/ui/testdata/config_summary.golden b/internal/ui/testdata/config_summary.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                   Body <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help         Body <tab>
 Ctrl +     <c> Cancel                                        Emoji <tab> + Shift
diff --git a/internal/ui/testdata/ctrl+c.golden b/internal/ui/testdata/ctrl+c.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift
diff --git a/internal/ui/testdata/enter_author.golden b/internal/ui/testdata/enter_author.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift
diff --git a/internal/ui/testdata/enter_body.golden b/internal/ui/testdata/enter_body.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │                                                                          │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help
 Ctrl +     <c> Cancel                                      Summary <tab> + Shift
diff --git a/internal/ui/testdata/enter_emoji.golden b/internal/ui/testdata/enter_emoji.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                   Body <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help         Body <tab>
 Ctrl +     <c> Cancel                                        Emoji <tab> + Shift
diff --git a/internal/ui/testdata/enter_summary.golden b/internal/ui/testdata/enter_summary.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │                                                                          │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help
 Ctrl +     <c> Cancel                                      Summary <tab> + Shift
diff --git a/internal/ui/testdata/escape_help.golden b/internal/ui/testdata/escape_help.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift
diff --git a/internal/ui/testdata/shift_tab_author.golden b/internal/ui/testdata/shift_tab_author.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                  Emoji <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help        Emoji <tab>
 Ctrl +     <c> Cancel
diff --git a/internal/ui/testdata/shift_tab_body.golden b/internal/ui/testdata/shift_tab_body.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │                                                                          │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                   Body <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help         Body <tab>
 Ctrl +     <c> Cancel                                        Emoji <tab> + Shift
diff --git a/internal/ui/testdata/shift_tab_emoji.golden b/internal/ui/testdata/shift_tab_emoji.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                  Emoji <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help        Emoji <tab>
 Ctrl +     <c> Cancel
diff --git a/internal/ui/testdata/shift_tab_summary.golden b/internal/ui/testdata/shift_tab_summary.golden
@@ -28,5 +28,5 @@ date:   Sat Jan 1 01:00:00 2022 +0000
     │  ~                                                                       │
     └──────────────────────────────────────────────────────────────────────────┘
 
- Alt + <enter> Commit <s> Sign-off </> Help                Summary <tab>
+ Alt + <enter> Commit <a> Amend <s> Sign-off </> Help      Summary <tab>
 Ctrl +     <c> Cancel                                       Author <tab> + Shift