back round 0 view raw

knotserver/git: refactor GitRepo.Tags to use `git for-each-ref` #309

merged

opened by

oppi.li 5 months ago targeting master from push-rqxyyurmpkps

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

options

unified split

Changed files

+118 -44

knotserver

git

git.go

tag.go

routes.go

-33

knotserver/git/git.go

···

       264
       264
        
       	return io.ReadAll(reader)

     

       265
       265
        
       }

     

       266
       266
        
       

     

       267
       267
       -
       func (g *GitRepo) Tags() ([]*TagReference, error) {

     

       268
       268
       -
       	iter, err := g.r.Tags()

     

       269
       269
       -
       	if err != nil {

     

       270
       270
       -
       		return nil, fmt.Errorf("tag objects: %w", err)

     

       271
       271
       -
       	}

     

       272
       272
       -
       

     

       273
       273
       -
       	tags := make([]*TagReference, 0)

     

       274
       274
       -
       

     

       275
       275
       -
       	if err := iter.ForEach(func(ref *plumbing.Reference) error {

     

       276
       276
       -
       		obj, err := g.r.TagObject(ref.Hash())

     

       277
       277
       -
       		switch err {

     

       278
       278
       -
       		case nil:

     

       279
       279
       -
       			tags = append(tags, &TagReference{

     

       280
       280
       -
       				ref: ref,

     

       281
       281
       -
       				tag: obj,

     

       282
       282
       -
       			})

     

       283
       283
       -
       		case plumbing.ErrObjectNotFound:

     

       284
       284
       -
       			tags = append(tags, &TagReference{

     

       285
       285
       -
       				ref: ref,

     

       286
       286
       -
       			})

     

       287
       287
       -
       		default:

     

       288
       288
       -
       			return err

     

       289
       289
       -
       		}

     

       290
       290
       -
       		return nil

     

       291
       291
       -
       	}); err != nil {

     

       292
       292
       -
       		return nil, err

     

       293
       293
       -
       	}

     

       294
       294
       -
       

     

       295
       295
       -
       	tagList := &TagList{r: g.r, refs: tags}

     

       296
       296
       -
       	sort.Sort(tagList)

     

       297
       297
       -
       	return tags, nil

     

       298
       298
       -
       }

     

       299
       299
       -
       

     

       300
       267
        
       func (g *GitRepo) Branches() ([]types.Branch, error) {

     

       301
       268
        
       	bi, err := g.r.Branches()

     

       302
       269
        
       	if err != nil {

+99

knotserver/git/tag.go

···

       1
       1
       +
       package git

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       	"slices"

     

       6
       6
       +
       	"strconv"

     

       7
       7
       +
       	"strings"

     

       8
       8
       +
       	"time"

     

       9
       9
       +
       

     

       10
       10
       +
       	"github.com/go-git/go-git/v5/plumbing"

     

       11
       11
       +
       	"github.com/go-git/go-git/v5/plumbing/object"

     

       12
       12
       +
       )

     

       13
       13
       +
       

     

       14
       14
       +
       func (g *GitRepo) Tags() ([]object.Tag, error) {

     

       15
       15
       +
       	fields := []string{

     

       16
       16
       +
       		"refname:short",

     

       17
       17
       +
       		"objectname",

     

       18
       18
       +
       		"objecttype",

     

       19
       19
       +
       		"*objectname",

     

       20
       20
       +
       		"*objecttype",

     

       21
       21
       +
       		"taggername",

     

       22
       22
       +
       		"taggeremail",

     

       23
       23
       +
       		"taggerdate:unix",

     

       24
       24
       +
       		"contents",

     

       25
       25
       +
       	}

     

       26
       26
       +
       

     

       27
       27
       +
       	var outFormat strings.Builder

     

       28
       28
       +
       	outFormat.WriteString("--format=")

     

       29
       29
       +
       	for i, f := range fields {

     

       30
       30
       +
       		if i != 0 {

     

       31
       31
       +
       			outFormat.WriteString(fieldSeparator)

     

       32
       32
       +
       		}

     

       33
       33
       +
       		outFormat.WriteString(fmt.Sprintf("%%(%s)", f))

     

       34
       34
       +
       	}

     

       35
       35
       +
       	outFormat.WriteString("")

     

       36
       36
       +
       	outFormat.WriteString(recordSeparator)

     

       37
       37
       +
       

     

       38
       38
       +
       	output, err := g.forEachRef(outFormat.String(), "refs/tags")

     

       39
       39
       +
       	if err != nil {

     

       40
       40
       +
       		return nil, fmt.Errorf("failed to get tags: %w", err)

     

       41
       41
       +
       	}

     

       42
       42
       +
       

     

       43
       43
       +
       	records := strings.Split(strings.TrimSpace(string(output)), recordSeparator)

     

       44
       44
       +
       	if len(records) == 1 && records[0] == "" {

     

       45
       45
       +
       		return nil, nil

     

       46
       46
       +
       	}

     

       47
       47
       +
       

     

       48
       48
       +
       	tags := make([]object.Tag, 0, len(records))

     

       49
       49
       +
       

     

       50
       50
       +
       	for _, line := range records {

     

       51
       51
       +
       		parts := strings.SplitN(strings.TrimSpace(line), fieldSeparator, len(fields))

     

       52
       52
       +
       		if len(parts) < 6 {

     

       53
       53
       +
       			continue

     

       54
       54
       +
       		}

     

       55
       55
       +
       

     

       56
       56
       +
       		tagName := parts[0]

     

       57
       57
       +
       		objectHash := parts[1]

     

       58
       58
       +
       		objectType := parts[2]

     

       59
       59
       +
       		targetHash := parts[3] // dereferenced object hash (empty for lightweight tags)

     

       60
       60
       +
       		// targetType := parts[4] // dereferenced object type (empty for lightweight tags)

     

       61
       61
       +
       		taggerName := parts[5]

     

       62
       62
       +
       		taggerEmail := parts[6]

     

       63
       63
       +
       		taggerDate := parts[7]

     

       64
       64
       +
       		message := parts[8]

     

       65
       65
       +
       

     

       66
       66
       +
       		// parse creation time

     

       67
       67
       +
       		var createdAt time.Time

     

       68
       68
       +
       		if unix, err := strconv.ParseInt(taggerDate, 10, 64); err == nil {

     

       69
       69
       +
       			createdAt = time.Unix(unix, 0)

     

       70
       70
       +
       		}

     

       71
       71
       +
       

     

       72
       72
       +
       		// parse object type

     

       73
       73
       +
       		typ, err := plumbing.ParseObjectType(objectType)

     

       74
       74
       +
       		if err != nil {

     

       75
       75
       +
       			return nil, err

     

       76
       76
       +
       		}

     

       77
       77
       +
       

     

       78
       78
       +
       		// strip email separators

     

       79
       79
       +
       		taggerEmail = strings.TrimSuffix(strings.TrimPrefix(taggerEmail, "<"), ">")

     

       80
       80
       +
       

     

       81
       81
       +
       		tag := object.Tag{

     

       82
       82
       +
       			Hash: plumbing.NewHash(objectHash),

     

       83
       83
       +
       			Name: tagName,

     

       84
       84
       +
       			Tagger: object.Signature{

     

       85
       85
       +
       				Name:  taggerName,

     

       86
       86
       +
       				Email: taggerEmail,

     

       87
       87
       +
       				When:  createdAt,

     

       88
       88
       +
       			},

     

       89
       89
       +
       			Message:    message,

     

       90
       90
       +
       			TargetType: typ,

     

       91
       91
       +
       			Target:     plumbing.NewHash(targetHash),

     

       92
       92
       +
       		}

     

       93
       93
       +
       

     

       94
       94
       +
       		tags = append(tags, tag)

     

       95
       95
       +
       	}

     

       96
       96
       +
       

     

       97
       97
       +
       	slices.Reverse(tags)

     

       98
       98
       +
       	return tags, nil

     

       99
       99
       +
       }

+19 -11

knotserver/routes.go

···

       96
       96
        
       		total    int

     

       97
       97
        
       		branches []types.Branch

     

       98
       98
        
       		files    []types.NiceTree

     

       99
       99
       -
       		tags     []*git.TagReference

     

       99
       99
       +
       		tags     []object.Tag

     

       100
       100
        
       	)

     

       101
       101
        
       

     

       102
       102
        
       	var wg sync.WaitGroup

     
···

       169
       169
        
       

     

       170
       170
        
       	rtags := []*types.TagReference{}

     

       171
       171
        
       	for _, tag := range tags {

     

       172
       172
       +
       		var target *object.Tag

     

       173
       173
       +
       		if tag.Target != plumbing.ZeroHash {

     

       174
       174
       +
       			target = &tag

     

       175
       175
       +
       		}

     

       172
       176
        
       		tr := types.TagReference{

     

       173
       173
       -
       			Tag: tag.TagObject(),

     

       177
       177
       +
       			Tag: target,

     

       174
       178
        
       		}

     

       175
       179
        
       

     

       176
       180
        
       		tr.Reference = types.Reference{

     

       177
       177
       -
       			Name: tag.Name(),

     

       178
       178
       -
       			Hash: tag.Hash().String(),

     

       181
       181
       +
       			Name: tag.Name,

     

       182
       182
       +
       			Hash: tag.Hash.String(),

     

       179
       183
        
       		}

     

       180
       184
        
       

     

       181
       181
       -
       		if tag.Message() != "" {

     

       182
       182
       -
       			tr.Message = tag.Message()

     

       185
       185
       +
       		if tag.Message != "" {

     

       186
       186
       +
       			tr.Message = tag.Message

     

       183
       187
        
       		}

     

       184
       188
        
       

     

       185
       189
        
       		rtags = append(rtags, &tr)

     
···

       488
       492
        
       

     

       489
       493
        
       	rtags := []*types.TagReference{}

     

       490
       494
        
       	for _, tag := range tags {

     

       495
       495
       +
       		var target *object.Tag

     

       496
       496
       +
       		if tag.Target != plumbing.ZeroHash {

     

       497
       497
       +
       			target = &tag

     

       498
       498
       +
       		}

     

       491
       499
        
       		tr := types.TagReference{

     

       492
       492
       -
       			Tag: tag.TagObject(),

     

       500
       500
       +
       			Tag: target,

     

       493
       501
        
       		}

     

       494
       502
        
       

     

       495
       503
        
       		tr.Reference = types.Reference{

     

       496
       496
       -
       			Name: tag.Name(),

     

       497
       497
       -
       			Hash: tag.Hash().String(),

     

       504
       504
       +
       			Name: tag.Name,

     

       505
       505
       +
       			Hash: tag.Hash.String(),

     

       498
       506
        
       		}

     

       499
       507
        
       

     

       500
       500
       -
       		if tag.Message() != "" {

     

       501
       501
       -
       			tr.Message = tag.Message()

     

       508
       508
       +
       		if tag.Message != "" {

     

       509
       509
       +
       			tr.Message = tag.Message

     

       502
       510
        
       		}

     

       503
       511
        
       

     

       504
       512
        
       		rtags = append(rtags, &tr)