From df16437a3458d845782c829b1c2799b28647a8fc Mon Sep 17 00:00:00 2001 From: shylinux Date: Sun, 12 Mar 2023 10:11:03 +0800 Subject: [PATCH] opt some --- misc/git/status.go | 9 ++++++++- misc/git/token.go | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/misc/git/status.go b/misc/git/status.go index 6a0711b5..8a7c04d3 100644 --- a/misc/git/status.go +++ b/misc/git/status.go @@ -279,6 +279,13 @@ func init() { _git_cmd(m, "config", "--global", "url."+m.Option(nfs.TO)+".insteadof", m.Option(nfs.FROM)) } }}, + "token": {Name: "token token", Help: "切换", Hand: func(m *ice.Message, arg ...string) { + list := []string{m.Option(TOKEN)} + m.Cmd(nfs.CAT, kit.HomePath(".git-credentials"), func(line string) { list = append(list, line) }) + m.Cmd(nfs.SAVE, kit.HomePath(".git-credentials"), strings.Join(list, ice.NL)+ice.NL) + ctx.ProcessHold(m) + }}, + "branch_switch": {Help: "切换", Hand: func(m *ice.Message, arg ...string) { _repos_cmd(m, m.Option(REPOS), "checkout", m.Option(BRANCH)) }}, @@ -325,7 +332,7 @@ func init() { defer web.ToastProcess(m)() files, adds, dels, last := _status_list(m) m.StatusTimeCount("files", files, "adds", adds, "dels", dels, "last", last.Format(ice.MOD_TIME)) - m.Action(PULL, PUSH, "insteadof") + m.Action(PULL, PUSH, "insteadof", TOKEN) m.Sort("repos,type,file") } else { _repos_cmd(m, arg[0], DIFF) diff --git a/misc/git/token.go b/misc/git/token.go index c3bc0cd5..d7d6e14e 100644 --- a/misc/git/token.go +++ b/misc/git/token.go @@ -16,6 +16,7 @@ func init() { Index.MergeCommands(ice.Commands{ TOKEN: {Name: "token username auto prunes", Actions: mdb.HashAction(mdb.EXPIRE, mdb.MONTH, mdb.SHORT, aaa.USERNAME, mdb.FIELD, "time,username,token"), Hand: func(m *ice.Message, arg ...string) { if mdb.HashSelect(m, arg...); len(arg) > 0 && m.Length() > 0 { + m.EchoScript(strings.Replace(m.Option(ice.MSG_USERHOST), "://", kit.Format("://%s:%s@", m.Option(ice.MSG_USERNAME), m.Append(TOKEN)), 1)) m.EchoScript(nfs.Template(m, "echo.sh", strings.Replace(m.Option(ice.MSG_USERHOST), "://", kit.Format("://%s:%s@", m.Option(ice.MSG_USERNAME), m.Append(TOKEN)), 1))) } }},