knotserver: count commits from initial push #312

merged
opened by
oppi.li 4 months ago targeting master from push-llqkvunvvzyv
commit-count calculation for initial ref-creation pushes failed silently because the underlying call to rev-list would fail.
Signed-off-by: oppiliappan me@oppi.li
options
unified split
Changed files
+27 -18
knotserver
git
post_receive.go
+27 -18
knotserver/git/post_receive.go
···

       77
       77
        
       		ByEmail: byEmail,

     

       78
       78
        
       	}

     

       79
       79
        
       

     

       80
       80
       -
       	if !line.NewSha.IsZero() {

     

       81
       81
       -
       		output, err := g.revList(

     

       82
       82
       -
       			fmt.Sprintf("--max-count=%d", 100),

     

       83
       83
       -
       			fmt.Sprintf("%s..%s", line.OldSha.String(), line.NewSha.String()),

     

       84
       84
       -
       		)

     

       85
       85
       -
       		if err != nil {

     

       86
       86
       -
       			return commitCount, fmt.Errorf("failed to run rev-list: %w", err)

     

       87
       87
       -
       		}

     

       80
       80
       +
       	if line.NewSha.IsZero() {

     

       81
       81
       +
       		return commitCount, nil

     

       82
       82
       +
       	}

     

       88
       83
        
       

     

       89
       89
       -
       		lines := strings.Split(strings.TrimSpace(string(output)), "\n")

     

       90
       90
       -
       		if len(lines) == 1 && lines[0] == "" {

     

       91
       91
       -
       			return commitCount, nil

     

       92
       92
       -
       		}

     

       84
       84
       +
       	args := []string{fmt.Sprintf("--max-count=%d", 100)}

     

       93
       85
        
       

     

       94
       94
       -
       		for _, item := range lines {

     

       95
       95
       -
       			obj, err := g.r.CommitObject(plumbing.NewHash(item))

     

       96
       96
       -
       			if err != nil {

     

       97
       97
       -
       				continue

     

       98
       98
       -
       			}

     

       99
       99
       -
       			commitCount.ByEmail[obj.Author.Email] += 1

     

       86
       86
       +
       	if line.OldSha.IsZero() {

     

       87
       87
       +
       		// just git rev-list <newsha>

     

       88
       88
       +
       		args = append(args, line.NewSha.String())

     

       89
       89
       +
       	} else {

     

       90
       90
       +
       		// git rev-list <oldsha>..<newsha>

     

       91
       91
       +
       		args = append(args, fmt.Sprintf("%s..%s", line.OldSha.String(), line.NewSha.String()))

     

       92
       92
       +
       	}

     

       93
       93
       +
       

     

       94
       94
       +
       	output, err := g.revList(args...)

     

       95
       95
       +
       	if err != nil {

     

       96
       96
       +
       		return commitCount, fmt.Errorf("failed to run rev-list: %w", err)

     

       97
       97
       +
       	}

     

       98
       98
       +
       

     

       99
       99
       +
       	lines := strings.Split(strings.TrimSpace(string(output)), "\n")

     

       100
       100
       +
       	if len(lines) == 1 && lines[0] == "" {

     

       101
       101
       +
       		return commitCount, nil

     

       102
       102
       +
       	}

     

       103
       103
       +
       

     

       104
       104
       +
       	for _, item := range lines {

     

       105
       105
       +
       		obj, err := g.r.CommitObject(plumbing.NewHash(item))

     

       106
       106
       +
       		if err != nil {

     

       107
       107
       +
       			continue

     

       100
       108
        
       		}

     

       109
       109
       +
       		commitCount.ByEmail[obj.Author.Email] += 1

     

       101
       110
        
       	}

     

       102
       111
        
       

     

       103
       112
        
       	return commitCount, nil