👔 up: add remote info for repo.Info

Author: inhere

info.go

@@ -22,4 +22,6 @@ type RepoInfo struct {
 	Version  string
 	// Upstream remote name
 	Upstream string
+	// Remotes name and url mapping.
+	Remotes map[string]string
 }

info_remote.go

@@ -11,6 +11,16 @@ const (
 // RemoteInfos map. key is type name(see RemoteTypePush)
 type RemoteInfos map[string]*RemoteInfo
 
+// FetchInfo fetch remote info
+func (rs RemoteInfos) FetchInfo() *RemoteInfo {
+	return rs[RemoteTypeFetch]
+}
+
+// PushInfo push remote info
+func (rs RemoteInfos) PushInfo() *RemoteInfo {
+	return rs[RemoteTypePush]
+}
+
 // RemoteInfo struct
 //
 // - http: "https://github.com/gookit/gitw.git"

repo.go

@@ -53,6 +53,9 @@ type Repo struct {
 	// remoteNames
 	remoteNames []string
 	// remoteInfosMp
+	//
+	// Example:
+	// 	{origin: {fetch: remote info, push: remote info}}
 	remoteInfosMp map[string]RemoteInfos
 
 	// cache some information of the repo
@@ -117,7 +120,7 @@ func (r *Repo) Info() *RepoInfo {
 		Upstream: r.UpstreamPath(),
 	}
 
-	rt := r.loadRemoteInfos().DefaultRemoteInfo()
+	rt := r.loadRemoteInfos().FirstRemoteInfo()
 	if rt == nil {
 		return ri
 	}
@@ -126,6 +129,12 @@ func (r *Repo) Info() *RepoInfo {
 	ri.Path = rt.Path()
 	ri.URL = rt.URLOrBuild()
 
+	remotes := make(map[string]string)
+	for name, infos := range r.remoteInfosMp {
+		remotes[name] = infos.FetchInfo().URL
+	}
+
+	ri.Remotes = remotes
 	return ri
 }
 
@@ -480,7 +489,7 @@ func (r *Repo) UpstreamPath() string {
 	// RUN: git rev-parse --abbrev-ref @{u}
 	if path == "" {
 		path = r.Git().RevParse("--abbrev-ref", "@{u}").SafeOutput()
-		r.cache.Set(cacheUpstreamPath, path)
+		r.cache.Set(cacheUpstreamPath, strings.TrimSpace(path))
 	}
 
 	return path