diff --git a/data.go b/data.go index 1512036f..0986e68e 100644 --- a/data.go +++ b/data.go @@ -18,7 +18,7 @@ func (m *Message) PrefixKey(arg ...Any) string { return kit.Keys(m.Prefix(m.CommandKey()), kit.Keys(arg...)) } func (m *Message) PrefixPath(arg ...Any) string { - return strings.TrimPrefix(strings.ReplaceAll(kit.Keys(m.Prefix(m.CommandKey()), kit.Keys(arg...)), PT, PS), "web") + return strings.TrimPrefix(strings.ReplaceAll(kit.Keys(m.Prefix(m.CommandKey()), kit.Keys(arg...)), PT, PS), "web") + PS } func (m *Message) Prefix(arg ...string) string { return m.Target().PrefixKey(arg...) diff --git a/misc/git/status.go b/misc/git/status.go index 80529f05..d97ee8f4 100644 --- a/misc/git/status.go +++ b/misc/git/status.go @@ -114,6 +114,7 @@ func _status_stat(m *ice.Message, files, adds, dels int) (int, int, int) { } func _status_list(m *ice.Message) (files, adds, dels int, last time.Time) { onlychange := m.Option(ice.MSG_MODE) == mdb.ZONE || m.Option("view") == "change" + defer m.Option(cli.CMD_DIR, "") ReposList(m).Tables(func(value ice.Maps) { m.Option(cli.CMD_DIR, value[nfs.PATH]) files, adds, dels = _status_stat(m, files, adds, dels) @@ -335,7 +336,7 @@ func init() { } else if len(arg) == 0 { 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.StatusTimeCount("files", files, "adds", adds, "dels", dels, "last", last.Format(ice.MOD_TIME), "origin", _git_cmds(m, "remote", "get-url", "origin")) m.Action(PULL, PUSH, "insteadof", "oauth") m.Sort("repos,type,file") } else { diff --git a/misc/git/token.go b/misc/git/token.go index c383840d..cbf09648 100644 --- a/misc/git/token.go +++ b/misc/git/token.go @@ -24,7 +24,7 @@ func init() { Index.MergeCommands(ice.Commands{ TOKEN: {Name: "token username auto prunes", Actions: ice.MergeActions(ice.Actions{ ice.CTX_INIT: {Hand: func(m *ice.Message, arg ...string) { aaa.White(m, kit.Keys(TOKEN, SID)) }}, - web.P(SET): {Hand: func(m *ice.Message, arg ...string) { + web.PP(SET): {Hand: func(m *ice.Message, arg ...string) { host, list := kit.Dict(), []string{m.Option(TOKEN)} m.Cmd(nfs.CAT, kit.HomePath(FILE), func(line string) { kit.IfNoKey(host, kit.ParseURL(line).Host, func(p string) { list = append(list, line) })