👔 up(all): update and add more git repo methods

Author: inhere

gitw.go

@@ -19,6 +19,12 @@ import (
 // GitDir name
 const GitDir = ".git"
 
+// HeadFile in .git/
+const HeadFile = "HEAD"
+
+// ConfFile in .git/
+const ConfFile = "config"
+
 var (
 	// DefaultBin name
 	DefaultBin = "git"
@@ -276,6 +282,7 @@ func (gw *GitWrap) OutputLines() ([]string, error) {
 
 // SafeOutput run and return output
 func (gw *GitWrap) SafeOutput() string {
+	gw.Stderr = nil // ignore stderr
 	out, err := gw.Output()
 	if err != nil {
 		return ""
@@ -503,8 +510,9 @@ func (gw *GitWrap) RevList(args ...string) *GitWrap {
 // RevParse command for git
 //
 // rev-parse usage:
-// 	git rev-parse --show-toplevel // get git workdir, repo dir.
-// 	git rev-parse -q --git-dir // get git data dir name. eg: .git
+//
+//	git rev-parse --show-toplevel // get git workdir, repo dir.
+//	git rev-parse -q --git-dir // get git data dir name. eg: .git
 func (gw *GitWrap) RevParse(args ...string) *GitWrap {
 	return gw.Cmd("rev-parse", args...)
 }

info.go

@@ -20,4 +20,6 @@ type RepoInfo struct {
 	LastHash string
 	Branch   string
 	Version  string
+	// Upstream remote name
+	Upstream string
 }

info_remote.go

@@ -111,17 +111,14 @@ func (r *RemoteInfo) buildHTTPURL(toHttps bool) string {
 	return schema + "://" + r.Host + "/" + r.Group + "/" + r.Repo
 }
 
-// HTTPScheme name string
-func (r *RemoteInfo) HTTPScheme() string {
-	if r.Proto == ProtoHTTP {
-		return r.Scheme
+// HTTPHost URL build. return like: https://github.com
+func (r *RemoteInfo) HTTPHost() string {
+	schema := r.Scheme
+	if r.Proto != ProtoHTTP {
+		schema = SchemeHTTPS
 	}
-	return SchemeHTTPS
-}
 
-// HTTPHost URL build.
-func (r *RemoteInfo) HTTPHost() string {
-	return r.HTTPScheme() + "://" + r.Host
+	return schema + "://" + r.Host
 }
 
 // Path string

repo.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/gookit/goutil/arrutil"
 	"github.com/gookit/goutil/errorx"
+	"github.com/gookit/goutil/fsutil"
 	"github.com/gookit/goutil/maputil"
 	"github.com/gookit/goutil/strutil"
 )
@@ -97,21 +98,26 @@ func (r *Repo) IsInited() bool {
 
 // Info get repo information
 func (r *Repo) Info() *RepoInfo {
-	rt := r.loadRemoteInfos().DefaultRemoteInfo()
-	if rt == nil {
-		return nil
-	}
-
-	return &RepoInfo{
-		Name: rt.Repo,
-		Path: rt.Path(),
+	ri := &RepoInfo{
 		Dir:  r.dir,
-		URL:  rt.RawURLOfHTTP(),
+		Name: fsutil.Name(r.dir),
 		// more
 		Branch:   r.CurBranchName(),
 		Version:  r.LargestTag(),
 		LastHash: r.LastAbbrevID(),
+		Upstream: r.FollowedRemote(),
 	}
+
+	rt := r.loadRemoteInfos().DefaultRemoteInfo()
+	if rt == nil {
+		return ri
+	}
+
+	ri.Name = rt.Repo
+	ri.Path = rt.Path()
+	ri.URL = rt.URLOrBuild()
+
+	return ri
 }
 
 // -------------------------------------------------
@@ -409,6 +415,24 @@ func (r *Repo) CurBranchName() string {
 	return brName
 }
 
+// SetUpstreamTo set the branch upstream remote branch.
+// If `localBranch` is empty, will use `branch` as `localBranch`
+//
+// CMD:
+//
+//	git branch --set-upstream-to=<remote>/<branch> <local_branch>
+func (r *Repo) SetUpstreamTo(remote, branch string, localBranch ...string) error {
+	localBr := branch
+	if len(localBranch) > 0 {
+		localBr = localBranch[0]
+	}
+
+	return r.gw.Cmd("branch").
+		Argf("--set-upstream-to=%s/%s", remote, branch).
+		AddArg(localBr).
+		Run()
+}
+
 // -------------------------------------------------
 // repo remote
 // -------------------------------------------------
@@ -423,6 +447,17 @@ func (r *Repo) RemoteNames() []string {
 	return r.loadRemoteInfos().remoteNames
 }
 
+// FollowedRemote get current followed upstream remote name.
+// Returns like: origin/main
+//
+// CMD:
+//
+//	git rev-parse --abbrev-ref @{u}
+func (r *Repo) FollowedRemote() string {
+	// RUN: git rev-parse --abbrev-ref @{u}
+	return r.Git().RevParse("--abbrev-ref", "@{u}").SafeOutput()
+}
+
 // RemoteInfos get by remote name
 func (r *Repo) RemoteInfos(remote string) RemoteInfos {
 	r.loadRemoteInfos()
@@ -543,6 +578,16 @@ func (r *Repo) loadRemoteInfos() *Repo {
 // 	r.err = nil
 // }
 
+// ReadConfig contents from REPO/.git/config
+func (r *Repo) ReadConfig() []byte {
+	return fsutil.GetContents(fsutil.JoinPaths(r.dir, GitDir, ConfFile))
+}
+
+// ReadHEAD contents from REPO/.git/HEAD
+func (r *Repo) ReadHEAD() []byte {
+	return fsutil.GetContents(fsutil.JoinPaths(r.dir, GitDir, HeadFile))
+}
+
 // -------------------------------------------------
 // helper methods
 // -------------------------------------------------