Merge pull request #11 from git-remote-gitopia/faza/optimize-git-fetch

Author: gitopia1wqynht5cs3lp3mxrr5l33x34tr3qd5hcu0s8du

cmd/git-remote-gitopia/gitopia.go

@@ -145,36 +145,60 @@ func (h *GitopiaHandler) List(remote *core.Remote, forPush bool) ([]string, erro
 	return out, nil
 }
 
-func (h *GitopiaHandler) Fetch(remote *core.Remote, sha, ref string) error {
+func (h *GitopiaHandler) Fetch(remote *core.Remote, refsToFetch []core.RefToFetch) error {
 	remoteURL := fmt.Sprintf("%v/%v.git", config.GitServerHost, h.remoteRepository.Id)
 
-	force := false
-	if strings.HasPrefix(ref, "+") {
-		ref = strings.TrimPrefix(ref, "+")
-		force = true
-	}
+	if !remote.Force {
+		args := []string{
+			"fetch",
+			"--no-write-fetch-head",
+			remoteURL,
+		}
+		for _, ref := range refsToFetch {
+			args = append(args, ref.Ref)
+		}
+		cmd, outPipe := core.GitCommand("git", args...)
+		if err := cmd.Start(); err != nil {
+			out, e := io.ReadAll(outPipe)
+			return errors.Wrapf(err, `error fetching from remote repository. 
+			output %s, output read error %s`, string(out), e.Error())
+		}
+		defer core.CleanUpProcessGroup(cmd)
+		cmd.Wait()
 
-	args := []string{
-		"fetch",
-		remoteURL,
-		ref,
-	}
-	if force {
-		args = append(args, "--force")
+		return nil
 	}
-	cmd, outPipe := core.GitCommand("git", args...)
-	if err := cmd.Start(); err != nil {
-		out, e := io.ReadAll(outPipe)
-		return errors.Wrapf(err, `error fetching from remote repository. 
+
+	for _, ref := range refsToFetch {
+		force := false
+		if strings.HasPrefix(ref.Ref, "+") {
+			ref.Ref = strings.TrimPrefix(ref.Ref, "+")
+			force = true
+		}
+
+		args := []string{
+			"fetch",
+			"--no-write-fetch-head",
+			remoteURL,
+			ref.Ref,
+		}
+		if force {
+			args = append(args, "--force")
+		}
+		cmd, outPipe := core.GitCommand("git", args...)
+		if err := cmd.Start(); err != nil {
+			out, e := io.ReadAll(outPipe)
+			return errors.Wrapf(err, `error fetching from remote repository. 
 		output %s, output read error %s`, string(out), e.Error())
+		}
+		defer core.CleanUpProcessGroup(cmd)
+		cmd.Wait()
 	}
-	defer core.CleanUpProcessGroup(cmd)
-	cmd.Wait()
 
 	return nil
 }
 
-func (h *GitopiaHandler) Push(remote *core.Remote, refsToPush []core.RefToPush) (*[]string, error) {
+func (h *GitopiaHandler) Push(remote *core.Remote, refsToPush []core.RefToPush) ([]string, error) {
 	var err error
 
 	if h.wallet == nil {
@@ -213,7 +237,7 @@ func (h *GitopiaHandler) Push(remote *core.Remote, refsToPush []core.RefToPush)
 	var setTags []gitopiaTypes.MsgMultiSetTag_Tag
 	var deleteBranches, deleteTags []string
 	var res []string
-	  
+
 	for _, ref := range refsToPush {
 		if ref.Local == "" {
 			if strings.HasPrefix(ref.Remote, branchPrefix) {
@@ -340,7 +364,7 @@ func (h *GitopiaHandler) Push(remote *core.Remote, refsToPush []core.RefToPush)
 		return nil, err
 	}
 
-	return &res, nil
+	return res, nil
 }
 
 func (h *GitopiaHandler) havePushPermission(walletAddress string) (havePermission bool, err error) {

core/remote.go

@@ -14,8 +14,8 @@ import (
 
 type RemoteHandler interface {
 	List(remote *Remote, forPush bool) ([]string, error)
-	Fetch(remote *Remote, sha, ref string) error
-	Push(remote *Remote, refsToPush []RefToPush) (*[]string, error)
+	Fetch(remote *Remote, refsToFetch []RefToFetch) error
+	Push(remote *Remote, refsToPush []RefToPush) ([]string, error)
 
 	Initialize(remote *Remote) error
 }
@@ -30,15 +30,20 @@ type Remote struct {
 
 	Handler RemoteHandler
 
-	todo     []func() (string, error)
-	pushList []func() (*[]string, error)
+	todo  []func() (string, error)
+	Force bool
 }
 
 type RefToPush struct {
 	Local  string
 	Remote string
 }
 
+type RefToFetch struct {
+	Sha string
+	Ref string
+}
+
 func NewRemote(handler RemoteHandler, reader io.Reader, writer io.Writer, logger *log.Logger) (*Remote, error) {
 	localDir, err := GetLocalDir()
 	if err != nil {
@@ -82,33 +87,19 @@ func (r *Remote) Printf(format string, a ...interface{}) (n int, err error) {
 	return fmt.Fprintf(r.writer, format, a...)
 }
 
-func (r *Remote) push(refsToPush []RefToPush) {
-	r.pushList = append(r.pushList, func() (*[]string, error) {
-		locals, err := r.Handler.Push(r, refsToPush)
-		if err != nil {
-			return nil, err
-		}
-
-		return locals, nil
-
-		//return fmt.Sprintf("ok %s\n", done), nil, nil
-	})
+func (r *Remote) push(refsToPush []RefToPush) ([]string, error) {
+	return r.Handler.Push(r, refsToPush)
 }
 
-func (r *Remote) fetch(sha, ref string) {
-	r.todo = append(r.todo, func() (string, error) {
-		err := r.Handler.Fetch(r, sha, ref)
-		if err != nil {
-			return "", err
-		}
-
-		return "", nil
-	})
+func (r *Remote) fetch(refsToFetch []RefToFetch) error {
+	return r.Handler.Fetch(r, refsToFetch)
 }
 
 func (r *Remote) ProcessCommands() error {
 	reader := bufio.NewReader(r.reader)
 	var refsToPush []RefToPush
+	var refsToFetch []RefToFetch
+
 	prevCommand := ""
 loop:
 	for {
@@ -143,21 +134,26 @@ loop:
 			//r.push(refs[0], refs[1])
 		case strings.HasPrefix(command, "fetch "):
 			parts := strings.Split(command, " ")
-			r.fetch(parts[1], parts[2])
+
+			if strings.HasPrefix(parts[2], "+") {
+				r.Force = true
+			}
+
+			refsToFetch = append(refsToFetch, RefToFetch{
+				Sha: parts[1],
+				Ref: parts[2],
+			})
+			// r.fetch(parts[1], parts[2])
 		case command == "":
 			fallthrough
 		case command == "\n":
 			if strings.HasPrefix(prevCommand, "push ") {
-				r.push(refsToPush)
-				var locals *[]string
-				for _, task := range r.pushList {
-					locals, err = task()
-					if err != nil {
-						return err
-					}
+				locals, err := r.push(refsToPush)
+				if err != nil {
+					return err
 				}
 				if locals != nil {
-					for _, local := range *locals {
+					for _, local := range locals {
 						r.Printf("ok %s\n", local)
 					}
 					r.Printf("\n")
@@ -167,6 +163,18 @@ loop:
 				break loop
 			}
 
+			if strings.HasPrefix(prevCommand, "fetch ") {
+				err = r.fetch(refsToFetch)
+				if err != nil {
+					return err
+				}
+
+				r.Printf("\n")
+
+				r.todo = nil
+				break loop
+			}
+
 			for _, task := range r.todo {
 				resp, err := task()
 				if err != nil {

core/util.go

@@ -23,10 +23,9 @@ func GitCommand(name string, args ...string) (*exec.Cmd, io.Reader) {
 	cmd := exec.Command(name, args...)
 	cmd.Env = os.Environ()
 
-	r, _ := cmd.StdoutPipe()
-	cmd.Stderr = cmd.Stdout
-
-	return cmd, r
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd, nil
 }
 
 func CleanUpProcessGroup(cmd *exec.Cmd) {