hjvt.dev
+4
-2
appview/db/pulls.go
+4
-2
appview/db/pulls.go
···
590
590
return err
591
591
}
592
592
593
-
func ResubmitPull(e Execer, pull *models.Pull, newPatch, sourceRev string) error {
593
+
func ResubmitPull(e Execer, pull *models.Pull) error {
594
+
newPatch := pull.LatestPatch()
595
+
newSourceRev := pull.LatestSha()
594
596
newRoundNumber := len(pull.Submissions)
595
597
_, err := e.Exec(`
596
598
insert into pull_submissions (pull_at, round_number, patch, source_rev)
597
599
values (?, ?, ?, ?)
598
-
`, pull.PullAt(), newRoundNumber, newPatch, sourceRev)
600
+
`, pull.PullAt(), newRoundNumber, newPatch, newSourceRev)
599
601
600
602
return err
601
603
}
+6
-15
appview/models/pull.go
+6
-15
appview/models/pull.go
···
84
84
func (p Pull) AsRecord() tangled.RepoPull {
85
85
var source *tangled.RepoPull_Source
86
86
if p.PullSource != nil {
87
-
s := p.PullSource.AsRecord()
88
-
source = &s
87
+
source = &tangled.RepoPull_Source{}
88
+
source.Branch = p.PullSource.Branch
89
89
source.Sha = p.LatestSha()
90
+
if p.PullSource.RepoAt != nil {
91
+
s := p.PullSource.Repo.RepoAt().String()
92
+
source.Repo = &s
93
+
}
90
94
}
91
95
92
96
record := tangled.RepoPull{
···
111
115
Repo *Repo
112
116
}
113
117
114
-
func (p PullSource) AsRecord() tangled.RepoPull_Source {
115
-
var repoAt *string
116
-
if p.RepoAt != nil {
117
-
s := p.RepoAt.String()
118
-
repoAt = &s
119
-
}
120
-
record := tangled.RepoPull_Source{
121
-
Branch: p.Branch,
122
-
Repo: repoAt,
123
-
}
124
-
return record
125
-
}
126
-
127
118
type PullSubmission struct {
128
119
// ids
129
120
ID int