From 2a6e445d80b4a85deed29e9935647c9eaa125c4b Mon Sep 17 00:00:00 2001
From: harveyshao <harveyshao@tencent.com>
Date: Wed, 23 Mar 2022 22:37:49 +0800
Subject: [PATCH] opt some

---
 misc/git/repos.go  |  3 ++-
 misc/git/status.go | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/misc/git/repos.go b/misc/git/repos.go
index cf8717cc..178c004e 100644
--- a/misc/git/repos.go
+++ b/misc/git/repos.go
@@ -12,8 +12,9 @@ import (
 	kit "shylinux.com/x/toolkits"
 )
 
-func _repos_cmd(m *ice.Message, name string, arg ...string) {
+func _repos_cmd(m *ice.Message, name string, arg ...string) *ice.Message {
 	m.Cmdy(cli.SYSTEM, GIT, arg, ice.Option{cli.CMD_DIR, _repos_path(name)})
+	return m
 }
 func _repos_path(name string) string {
 	if strings.Contains(name, ":\\") {
diff --git a/misc/git/status.go b/misc/git/status.go
index bf575af6..e9c168ef 100644
--- a/misc/git/status.go
+++ b/misc/git/status.go
@@ -273,6 +273,20 @@ func init() {
 				_repos_cmd(m, m.Option(REPOS), COMMIT, "-am", m.Option(mdb.TEXT))
 				m.ProcessBack()
 			}},
+			"branch_switch": {Name: "branch_switch", Help: "切换", Hand: func(m *ice.Message, arg ...string) {
+				_repos_cmd(m.Spawn(), m.Option(REPOS), "checkout", m.Option(BRANCH))
+			}},
+			BRANCH: {Name: "branch", Help: "分支", Hand: func(m *ice.Message, arg ...string) {
+				for _, line := range kit.Split(_repos_cmd(m.Spawn(), arg[0], BRANCH).Result(), ice.NL, ice.NL) {
+					if strings.HasPrefix(line, "*") {
+						m.Push(BRANCH, strings.TrimPrefix(line, "* "))
+						m.PushButton("")
+					} else {
+						m.Push(BRANCH, strings.TrimSpace(line))
+						m.PushButton("branch_switch")
+					}
+				}
+			}},
 			TAG: {Name: "tag version@key", Help: "标签", Hand: func(m *ice.Message, arg ...string) {
 				if m.Option(VERSION) == "" {
 					m.Option(VERSION, _status_tag(m, m.Option(TAGS)))
@@ -299,7 +313,7 @@ func init() {
 
 			m.Option(cli.CMD_DIR, _repos_path(arg[0]))
 			m.Echo(m.Cmdx(cli.SYSTEM, GIT, DIFF))
-			m.Action(COMMIT, TAGS)
+			m.Action(COMMIT, BRANCH, TAGS)
 
 			files, adds, dels := _status_stat(m, 0, 0, 0)
 			m.Status("files", files, "adds", adds, "dels", dels)