back round 0 view raw

knotserver: use local clones if repo is hosted on the same knot #850

merged

opened by

oppi.li 1 week ago targeting master from op/mozkrnmzvkru

detect the host to clone from and use a local clone if possible.

Signed-off-by: oppiliappan me@oppi.li

options

unified split

Changed files

+39 -3

knotserver

git

fork.go

xrpc

create_repo.go

+38 -2

knotserver/git/fork.go

···

       3
        
       import (

     

       4
        
       	"errors"

     

       5
        
       	"fmt"

     

       0
        
       
     

       0
        
       
     

       6
        
       	"os/exec"

     

       0
        
       
     

       7
        
       

     

       8
        
       	"github.com/go-git/go-git/v5"

     

       9
        
       	"github.com/go-git/go-git/v5/config"

     

       0
        
       
     

       10
        
       )

     

       11
        
       

     

       12
       -
       func Fork(repoPath, source string) error {

     

       13
       -
       	cloneCmd := exec.Command("git", "clone", "--bare", source, repoPath)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14
        
       	if err := cloneCmd.Run(); err != nil {

     

       15
        
       		return fmt.Errorf("failed to bare clone repository: %w", err)

     

       16
        
       	}

     
···

       23
        
       	return nil

     

       24
        
       }

     

       25
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       26
        
       func (g *GitRepo) Sync() error {

     

       27
        
       	branch := g.h.String()

     

       28

···

       3
        
       import (

     

       4
        
       	"errors"

     

       5
        
       	"fmt"

     

       6
       +
       	"log/slog"

     

       7
       +
       	"net/url"

     

       8
        
       	"os/exec"

     

       9
       +
       	"path/filepath"

     

       10
        
       

     

       11
        
       	"github.com/go-git/go-git/v5"

     

       12
        
       	"github.com/go-git/go-git/v5/config"

     

       13
       +
       	knotconfig "tangled.org/core/knotserver/config"

     

       14
        
       )

     

       15
        
       

     

       16
       +
       func Fork(repoPath, source string, cfg *knotconfig.Config) error {

     

       17
       +
       	u, err := url.Parse(source)

     

       18
       +
       	if err != nil {

     

       19
       +
       		return fmt.Errorf("failed to parse source URL: %w", err)

     

       20
       +
       	}

     

       21
       +
       

     

       22
       +
       	if o := optimizeClone(u, cfg); o != nil {

     

       23
       +
       		u = o

     

       24
       +
       	}

     

       25
       +
       

     

       26
       +
       	cloneCmd := exec.Command("git", "clone", "--bare", u.String(), repoPath)

     

       27
        
       	if err := cloneCmd.Run(); err != nil {

     

       28
        
       		return fmt.Errorf("failed to bare clone repository: %w", err)

     

       29
        
       	}

     
···

       36
        
       	return nil

     

       37
        
       }

     

       38
        
       

     

       39
       +
       func optimizeClone(u *url.URL, cfg *knotconfig.Config) *url.URL {

     

       40
       +
       	// only optimize if it's the same host

     

       41
       +
       	if u.Host != cfg.Server.Hostname {

     

       42
       +
       		return nil

     

       43
       +
       	}

     

       44
       +
       

     

       45
       +
       	local := filepath.Join(cfg.Repo.ScanPath, u.Path)

     

       46
       +
       

     

       47
       +
       	// sanity check: is there a git repo there?

     

       48
       +
       	if _, err := PlainOpen(local); err != nil {

     

       49
       +
       		return nil

     

       50
       +
       	}

     

       51
       +
       

     

       52
       +
       	// create optimized file:// URL

     

       53
       +
       	optimized := &url.URL{

     

       54
       +
       		Scheme: "file",

     

       55
       +
       		Path:   local,

     

       56
       +
       	}

     

       57
       +
       

     

       58
       +
       	slog.Debug("performing local clone", "url", optimized.String())

     

       59
       +
       	return optimized

     

       60
       +
       }

     

       61
       +
       

     

       62
        
       func (g *GitRepo) Sync() error {

     

       63
        
       	branch := g.h.String()

     

       64

+1 -1

knotserver/xrpc/create_repo.go

···

       84
        
       	repoPath, _ := securejoin.SecureJoin(h.Config.Repo.ScanPath, relativeRepoPath)

     

       85
        
       

     

       86
        
       	if data.Source != nil && *data.Source != "" {

     

       87
       -
       		err = git.Fork(repoPath, *data.Source)

     

       88
        
       		if err != nil {

     

       89
        
       			l.Error("forking repo", "error", err.Error())

     

       90
        
       			writeError(w, xrpcerr.GenericError(err), http.StatusInternalServerError)

···

       84
        
       	repoPath, _ := securejoin.SecureJoin(h.Config.Repo.ScanPath, relativeRepoPath)

     

       85
        
       

     

       86
        
       	if data.Source != nil && *data.Source != "" {

     

       87
       +
       		err = git.Fork(repoPath, *data.Source, h.Config)

     

       88
        
       		if err != nil {

     

       89
        
       			l.Error("forking repo", "error", err.Error())

     

       90
        
       			writeError(w, xrpcerr.GenericError(err), http.StatusInternalServerError)