feat: add rename branch

README.md

@@ -29,4 +29,5 @@ gh b
 | <kbd>Ctrl+d</kbd>   | Delete the currently selected branch, with confirmation |
 | <kbd>Ctrl+t</kbd>   | Track the currently selected branch, with confirmation  |
 | <kbd>Ctrl+y</kbd>   | Merge the currently selected branch, with confirmation  |
-| <kbd>Ctrl+r</kbd>   | Rebase the currently selected branch, with confirmation |
+| <kbd>Ctrl+u</kbd>   | Rebase the currently selected branch, with confirmation |
+| <kbd>Ctrl+r</kbd>   | Rename the currently selected branch                    |

git/git.go

@@ -9,18 +9,55 @@ type Branch struct {
 	Name          string
 	AuthorName    string
 	CommitterDate string
+	IsRemote      bool
 }
 
 const format = `branch:%(refname:short)%(HEAD)
 authorname:%(authorname)
 committerdate:%(committerdate:relative)
 `
 
-func GetAllBranches() (branches []Branch, err error) {
+func getLocalBranches(branches []Branch) ([]Branch, error) {
 	cmd := exec.Command(
 		"git",
 		"for-each-ref",
 		"refs/heads",
+		"--sort",
+		"-committerdate",
+		"--sort",
+		"-upstream",
+		"--format",
+		format,
+	)
+
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		return []Branch{}, err
+	}
+
+	s := strings.Split(strings.TrimSpace(string(out)), "\n\n")
+
+	for _, branch := range s {
+		fields := strings.Split(branch, "\n")
+
+		branch := strings.TrimPrefix(fields[0], "branch:")
+		authorname := strings.TrimPrefix(fields[1], "authorname:")
+		committerdate := strings.TrimPrefix(fields[2], "committerdate:")
+		branches = append(branches, Branch{
+			Name:          strings.TrimSpace(branch),
+			AuthorName:    strings.TrimSpace(authorname),
+			CommitterDate: strings.TrimSpace(committerdate),
+			IsRemote:      false,
+		})
+	}
+
+	return branches, err
+}
+
+func getRemoteBranches(branches []Branch) ([]Branch, error) {
+	cmd := exec.Command(
+		"git",
+		"for-each-ref",
 		"refs/remotes",
 		"--sort",
 		"-committerdate",
@@ -32,7 +69,7 @@ func GetAllBranches() (branches []Branch, err error) {
 
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		return
+		return []Branch{}, err
 	}
 
 	s := strings.Split(strings.TrimSpace(string(out)), "\n\n")
@@ -47,9 +84,24 @@ func GetAllBranches() (branches []Branch, err error) {
 			Name:          strings.TrimSpace(branch),
 			AuthorName:    strings.TrimSpace(authorname),
 			CommitterDate: strings.TrimSpace(committerdate),
+			IsRemote:      true,
 		})
 	}
 
+	return branches, err
+}
+
+func GetAllBranches() (branches []Branch, err error) {
+	branches, err = getLocalBranches(branches)
+	if err != nil {
+		return
+	}
+
+	branches, err = getRemoteBranches(branches)
+	if err != nil {
+		return
+	}
+
 	return
 }
 
@@ -100,3 +152,20 @@ func RebaseBranch(branch string) string {
 
 	return string(out)
 }
+
+func RenameBranch(oldName, newName string) string {
+	cmd := exec.Command("git", "branch", "-m", oldName, newName)
+
+	out, _ := cmd.CombinedOutput()
+
+	return string(out)
+}
+
+func RenameRemoteBranch(oldName, newName string) string {
+	exec.Command("git", "push", "origin", "--delete", oldName)
+
+	cmd := exec.Command("git", "push", "origin", "-u", newName)
+	out, _ := cmd.CombinedOutput()
+
+	return string(out)
+}

tui/create.go

@@ -90,6 +90,7 @@ func createUpdate(msg tea.Msg, m Model) (tea.Model, tea.Cmd) {
 				m.create.inputs[1].Reset()
 				m.create.showConfirmInput = false
 				m.state = browsing
+				m.keyMap.State = "browsing"
 				m.updateKeybindins()
 
 				return m, nil

tui/delegate.go

@@ -60,6 +60,6 @@ func (d itemDelegate) ShortHelp() []key.Binding {
 
 func (d itemDelegate) FullHelp() [][]key.Binding {
 	return [][]key.Binding{
-		{d.keys.Track, d.keys.Create, d.keys.Delete, d.keys.Merge, d.keys.Rebase},
+		{d.keys.Track, d.keys.Create, d.keys.Delete, d.keys.Merge, d.keys.Rebase, d.keys.Rename},
 	}
 }

tui/delete.go

@@ -45,12 +45,14 @@ func deleteUpdate(msg tea.Msg, m Model) (tea.Model, tea.Cmd) {
 
 					m.updateListItem()
 					m.state = browsing
+					m.keyMap.State = "browsing"
 					m.updateKeybindins()
 				}
 
 			case "n", "N":
 				m.delete.confirmInput.Reset()
 				m.state = browsing
+				m.keyMap.State = "browsing"
 				m.updateKeybindins()
 
 			default:
@@ -60,6 +62,7 @@ func deleteUpdate(msg tea.Msg, m Model) (tea.Model, tea.Cmd) {
 		case key.Matches(msg, m.keyMap.Cancel):
 			m.delete.confirmInput.Reset()
 			m.state = browsing
+			m.keyMap.State = "browsing"
 			m.updateKeybindins()
 		}
 	case tea.WindowSizeMsg:

tui/keys/keys.go

@@ -13,6 +13,7 @@ type KeyMap struct {
 	Track      key.Binding
 	Merge      key.Binding
 	Rebase     key.Binding
+	Rename     key.Binding
 	Cancel     key.Binding
 	Quit       key.Binding
 	ForceQuit  key.Binding
@@ -23,10 +24,7 @@ type KeyMap struct {
 func (k KeyMap) ShortHelp() []key.Binding {
 	var kb []key.Binding
 
-	if k.State == "creating" ||
-		k.State == "deleting" ||
-		k.State == "merge" ||
-		k.State == "rebasing" {
+	if k.State != "browsing" {
 		kb = append(kb, k.Cancel, k.ForceQuit)
 	}
 
@@ -77,12 +75,16 @@ func NewKeyMap() *KeyMap {
 			),
 		),
 		Rebase: key.NewBinding(
-			key.WithKeys("ctrl+r"),
+			key.WithKeys("ctrl+u"),
 			key.WithHelp(
-				"ctrl+r",
+				"ctrl+u",
 				"Rebase the currently selected branch, with confirmation",
 			),
 		),
+		Rename: key.NewBinding(
+			key.WithKeys("ctrl+r"),
+			key.WithHelp("ctrl+r", "Rename the currently selected branch"),
+		),
 		Cancel: key.NewBinding(
 			key.WithKeys("esc"),
 			key.WithHelp("esc", "Cancel"),

tui/merge.go

@@ -46,6 +46,7 @@ func mergeUpdate(msg tea.Msg, m Model) (tea.Model, tea.Cmd) {
 			case "n", "N":
 				m.merge.confirmInput.Reset()
 				m.state = browsing
+				m.keyMap.State = "browsing"
 				m.updateKeybindins()
 
 			default:
@@ -55,6 +56,7 @@ func mergeUpdate(msg tea.Msg, m Model) (tea.Model, tea.Cmd) {
 		case key.Matches(msg, m.keyMap.Cancel):
 			m.merge.confirmInput.Reset()
 			m.state = browsing
+			m.keyMap.State = "browsing"
 			m.updateKeybindins()
 		}
 

tui/rebase.go

@@ -45,6 +45,7 @@ func rebaseUpdate(msg tea.Msg, m Model) (tea.Model, tea.Cmd) {
 			case "n", "N":
 				m.rebase.confirmInput.Reset()
 				m.state = browsing
+				m.keyMap.State = "browsing"
 				m.updateKeybindins()
 
 			default:
@@ -53,6 +54,7 @@ func rebaseUpdate(msg tea.Msg, m Model) (tea.Model, tea.Cmd) {
 		case key.Matches(msg, m.keyMap.Cancel):
 			m.rebase.confirmInput.Reset()
 			m.state = browsing
+			m.keyMap.State = "browsing"
 			m.updateKeybindins()
 		}
 	case tea.WindowSizeMsg:

tui/rename.go

@@ -1,21 +1,33 @@
 package tui
 
 import (
+	"strings"
+
+	"github.com/charmbracelet/bubbles/help"
 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/joaom00/gh-b/git"
 )
 
 type renameModel struct {
-	input textinput.Model
+	input            textinput.Model
+	confirmInput     textinput.Model
+	showConfirmInput bool
+	help             help.Model
 }
 
 func newRenameModel() *renameModel {
 	ti := textinput.New()
+	ci := textinput.New()
+	ci.CharLimit = 1
 
 	return &renameModel{
-		input: ti,
+		input:            ti,
+		confirmInput:     ci,
+		showConfirmInput: false,
+		help:             help.New(),
 	}
 }
 
@@ -24,16 +36,51 @@ func renameUpdate(msg tea.Msg, m Model) (tea.Model, tea.Cmd) {
 	case tea.KeyMsg:
 		switch {
 		case key.Matches(msg, m.keyMap.Enter):
-			return m, nil
+			if i, ok := m.selectedItem(); ok {
+				out := git.RenameBranch(i.Name, m.rename.input.Value())
+
+				m.state = browsing
+				m.updateListItem()
+				m.list.NewStatusMessage(out)
+
+				return m, nil
+			}
+
+		case key.Matches(msg, m.keyMap.Cancel):
+			m.rename.input.Reset()
+			m.state = browsing
+			m.updateKeybindins()
 		}
 	}
 
-	return m, nil
+	var cmd tea.Cmd
+	var cmds []tea.Cmd
+
+	m.rename.input, cmd = m.rename.input.Update(msg)
+	cmds = append(cmds, cmd)
+
+	m.rename.confirmInput, cmd = m.rename.confirmInput.Update(msg)
+	cmds = append(cmds, cmd)
+
+	return m, tea.Batch(cmds...)
 }
 
 func (m Model) renameView() string {
+	m.rename.input.Placeholder = strings.TrimSuffix(m.list.SelectedItem().(item).Name, "*")
+
+	title := m.styles.Title.MarginLeft(2).Render("Rename your branch")
+	textInput := lipgloss.NewStyle().MarginLeft(4).Render(m.rename.input.View())
+	help := lipgloss.NewStyle().MarginLeft(4).Render(m.create.help.View(m.keyMap))
+
+	if m.rename.showConfirmInput {
+		confirmInput := lipgloss.NewStyle().
+			MarginLeft(4).
+			Render(lipgloss.JoinHorizontal(lipgloss.Left, "You would like rename remote branch? [y/N]", m.rename.confirmInput.View()))
+
+		return lipgloss.NewStyle().MarginTop(1).Render(lipgloss.JoinVertical(lipgloss.Left, title, "\n", textInput, "\n", confirmInput, "\n", help))
+	}
+
 	return lipgloss.NewStyle().
 		MarginTop(1).
-		MarginLeft(4).
-		Render(lipgloss.JoinVertical(lipgloss.Left, m.rename.input.View()))
+		Render(lipgloss.JoinVertical(lipgloss.Left, title, "\n", textInput, "\n", help))
 }