forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
lexicons: pulls: put target repo and branch together in their own object
Signed-off-by: nelind <nel.n.lindberg@gmail.com>
+33
-14
api/tangled/cbor_gen.go
api/tangled/cbor_gen.go
This is a binary file and will not be displayed.
api/tangled/repopull.go
api/tangled/repopull.go
This is a binary file and will not be displayed.
+4
-2
appview/db/pulls.go
+4
-2
appview/db/pulls.go
···
94
94
Title: p.Title,
95
95
Body: &p.Body,
96
96
CreatedAt: p.Created.Format(time.RFC3339),
97
-
TargetRepo: p.RepoAt.String(),
98
-
TargetBranch: p.TargetBranch,
97
+
Target: &tangled.RepoPull_Target{
98
+
Repo: p.RepoAt.String(),
99
+
Branch: p.TargetBranch,
100
+
},
99
101
Patch: p.LatestPatch(),
100
102
Source: source,
101
103
}
+8
-4
appview/pulls/pulls.go
+8
-4
appview/pulls/pulls.go
···
1035
1035
Record: &lexutil.LexiconTypeDecoder{
1036
1036
Val: &tangled.RepoPull{
1037
1037
Title: title,
1038
-
TargetRepo: string(f.RepoAt()),
1039
-
TargetBranch: targetBranch,
1038
+
Target: &tangled.RepoPull_Target{
1039
+
Repo: string(f.RepoAt()),
1040
+
Branch: targetBranch,
1041
+
},
1040
1042
Patch: patch,
1041
1043
Source: recordPullSource,
1042
1044
},
···
1607
1605
Record: &lexutil.LexiconTypeDecoder{
1608
1606
Val: &tangled.RepoPull{
1609
1607
Title: pull.Title,
1610
-
TargetRepo: string(f.RepoAt()),
1611
-
TargetBranch: pull.TargetBranch,
1608
+
Target: &tangled.RepoPull_Target{
1609
+
Repo: string(f.RepoAt()),
1610
+
Branch: pull.TargetBranch,
1611
+
},
1612
1612
Patch: patch, // new patch
1613
1613
Source: recordPullSource,
1614
1614
},
+1
cmd/gen.go
+1
cmd/gen.go
+20
-8
lexicons/pulls/pull.json
+20
-8
lexicons/pulls/pull.json
···
10
10
"record": {
11
11
"type": "object",
12
12
"required": [
13
-
"targetRepo",
14
-
"targetBranch",
13
+
"target",
15
14
"title",
16
15
"patch",
17
16
"createdAt"
18
17
],
19
18
"properties": {
20
-
"targetRepo": {
21
-
"type": "string",
22
-
"format": "at-uri"
23
-
},
24
-
"targetBranch": {
25
-
"type": "string"
19
+
"target": {
20
+
"type": "ref",
21
+
"ref": "#target"
26
22
},
27
23
"title": {
28
24
"type": "string"
···
37
41
"type": "string",
38
42
"format": "datetime"
39
43
}
44
+
}
45
+
}
46
+
},
47
+
"target": {
48
+
"type": "object",
49
+
"required": [
50
+
"repo",
51
+
"branch"
52
+
],
53
+
"properties": {
54
+
"repo": {
55
+
"type": "string",
56
+
"format": "at-uri"
57
+
},
58
+
"branch": {
59
+
"type": "string"
40
60
}
41
61
}
42
62
},