Skip to content

Commit b995556

Browse files
ChrisPennerChrisPenner
committed
New contribution transcripts
1 parent 7342c56 commit b995556

File tree

7 files changed

+441
-35
lines changed

7 files changed

+441
-35
lines changed

‎transcripts/share-apis/contribution-diffs/contribution-diff.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@
453453
"newRefHash": "#1f9oqkrlfnkhnmfh29c9oiuvlbbta0j29nsmu4me709ber295aji2nuv2t8q7e6pfeji1ge1scdblb4qbg3uvlmcbuiesc8q88e0bqo",
454454
"oldRef": "diff-start",
455455
"oldRefHash": "#odojlhcu8m0iaajcjug8mkd84rqib8s273rf46rnn281trtqu56mgkogp2o71ajsmvpvamqo4lvotqj5kare46ci5t26m4oe2vpqjvo",
456-
"project": "@transcripts/namespace-diff"
456+
"project": "@transcripts/contribution-diff"
457457
},
458458
"status": [
459459
{

‎transcripts/share-apis/contribution-diffs/create-contribution-for-diff.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"id": "C-<UUID>",
1212
"numComments": 0,
1313
"number": 1,
14-
"projectRef": "@transcripts/namespace-diff",
14+
"projectRef": "@transcripts/contribution-diff",
1515
"sourceBranchRef": "diff-end",
1616
"status": "in_review",
1717
"targetBranchRef": "diff-start",

‎transcripts/share-apis/contribution-diffs/namespace-diff.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@
453453
"newRefHash": "#1f9oqkrlfnkhnmfh29c9oiuvlbbta0j29nsmu4me709ber295aji2nuv2t8q7e6pfeji1ge1scdblb4qbg3uvlmcbuiesc8q88e0bqo",
454454
"oldRef": "diff-start",
455455
"oldRefHash": "#odojlhcu8m0iaajcjug8mkd84rqib8s273rf46rnn281trtqu56mgkogp2o71ajsmvpvamqo4lvotqj5kare46ci5t26m4oe2vpqjvo",
456-
"project": "@transcripts/namespace-diff"
456+
"project": "@transcripts/contribution-diff"
457457
},
458458
"status": [
459459
{

‎transcripts/share-apis/contribution-diffs/prelude.md

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
```ucm:hide
2-
.> project.create-empty namespace-diff
3-
namespace-diff/main> branch /diff-start
4-
namespace-diff/diff-start> builtins.mergeio
2+
.> project.create-empty contribution-diff
3+
contribution-diff/main> branch /diff-start
4+
contribution-diff/diff-start> builtins.mergeio
55
```
66

77
```unison
@@ -48,22 +48,22 @@ deleteMeAfterFork = "delete me after fork"
4848
```
4949

5050
```ucm:hide
51-
namespace-diff/diff-start> add
52-
namespace-diff/diff-start> push @transcripts/namespace-diff/diff-start
53-
namespace-diff/diff-start> branch /diff-end
54-
namespace-diff/diff-end> alias.term termAliasMe aTermAlias
55-
namespace-diff/diff-end> delete.term termDeleteMe
56-
namespace-diff/diff-end> alias.type DataAliasMe ATypeAlias
57-
namespace-diff/diff-end> delete.type DataDeleteMe
58-
namespace-diff/diff-end> delete.namespace DataDeleteMe
59-
namespace-diff/diff-end> alias.type AbilityAliasMe AbilityAlias
60-
namespace-diff/diff-end> delete.type AbilityDeleteMe
61-
namespace-diff/diff-end> delete.namespace AbilityDeleteMe
62-
namespace-diff/diff-end> delete.term a.definition.at.path1
63-
namespace-diff/diff-end> delete.term a.definition.at.path2
64-
namespace-diff/diff-end> delete.term a.different.path
65-
namespace-diff/diff-end> delete.term aDoc
66-
namespace-diff/diff-end> delete.term aTest
51+
contribution-diff/diff-start> add
52+
contribution-diff/diff-start> push @transcripts/contribution-diff/diff-start
53+
contribution-diff/diff-start> branch /diff-end
54+
contribution-diff/diff-end> alias.term termAliasMe aTermAlias
55+
contribution-diff/diff-end> delete.term termDeleteMe
56+
contribution-diff/diff-end> alias.type DataAliasMe ATypeAlias
57+
contribution-diff/diff-end> delete.type DataDeleteMe
58+
contribution-diff/diff-end> delete.namespace DataDeleteMe
59+
contribution-diff/diff-end> alias.type AbilityAliasMe AbilityAlias
60+
contribution-diff/diff-end> delete.type AbilityDeleteMe
61+
contribution-diff/diff-end> delete.namespace AbilityDeleteMe
62+
contribution-diff/diff-end> delete.term a.definition.at.path1
63+
contribution-diff/diff-end> delete.term a.definition.at.path2
64+
contribution-diff/diff-end> delete.term a.different.path
65+
contribution-diff/diff-end> delete.term aDoc
66+
contribution-diff/diff-end> delete.term aTest
6767
```
6868

6969
```unison
@@ -83,13 +83,13 @@ ability AbilityNew where
8383
```
8484

8585
```ucm
86-
namespace-diff/diff-end> update
87-
namespace-diff/diff-end> rename.term termRenameMe renamedTerm
88-
namespace-diff/diff-end> rename.type DataRenameMe RenamedType
89-
namespace-diff/diff-end> rename.namespace DataRenameMe RenamedType
90-
namespace-diff/diff-end> rename.type AbilityRenameMe AbilityRenamed
91-
namespace-diff/diff-end> rename.namespace AbilityRenameMe AbilityRenamed
92-
namespace-diff/diff-end> push @transcripts/namespace-diff/diff-end
86+
contribution-diff/diff-end> update
87+
contribution-diff/diff-end> rename.term termRenameMe renamedTerm
88+
contribution-diff/diff-end> rename.type DataRenameMe RenamedType
89+
contribution-diff/diff-end> rename.namespace DataRenameMe RenamedType
90+
contribution-diff/diff-end> rename.type AbilityRenameMe AbilityRenamed
91+
contribution-diff/diff-end> rename.namespace AbilityRenameMe AbilityRenamed
92+
contribution-diff/diff-end> push @transcripts/contribution-diff/diff-end
9393
```
9494

9595
Now we go back to the `diff-start` branch and make some more commits to test that
@@ -103,7 +103,7 @@ termUpdateMe = "conflicted update"
103103
```
104104

105105
```ucm
106-
namespace-diff/diff-start> update
107-
namespace-diff/diff-start> delete.term deleteMeAfterFork
108-
namespace-diff/diff-start> push @transcripts/namespace-diff/diff-start
106+
contribution-diff/diff-start> update
107+
contribution-diff/diff-start> delete.term deleteMeAfterFork
108+
contribution-diff/diff-start> push @transcripts/contribution-diff/diff-start
109109
```

‎transcripts/share-apis/contribution-diffs/run.zsh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@ source "../../transcript_helpers.sh"
66

77
transcript_ucm transcript prelude.md
88

9-
fetch "$transcript_user" GET namespace-diff '/users/transcripts/projects/namespace-diff/diff/namespaces?old=diff-start&new=diff-end'
9+
fetch "$transcript_user" GET namespace-diff '/users/transcripts/projects/contribution-diff/diff/namespaces?old=diff-start&new=diff-end'
1010

11-
fetch "$transcript_user" POST create-contribution-for-diff '/users/transcripts/projects/namespace-diff/contributions' '{
11+
fetch "$transcript_user" POST create-contribution-for-diff '/users/transcripts/projects/contribution-diff/contributions' '{
1212
"title": "My contribution",
1313
"description": "My description",
1414
"status": "in_review",
1515
"sourceBranchRef": "diff-end",
1616
"targetBranchRef": "diff-start"
1717
}'
1818

19-
fetch "$transcript_user" GET contribution-diff '/users/transcripts/projects/namespace-diff/contributions/1/diff'
19+
fetch "$transcript_user" GET contribution-diff '/users/transcripts/projects/contribution-diff/contributions/1/diff'
20+
21+
# Diffing a user-defined term against a user-defined term.
22+
fetch "$transcript_user" GET standard-term-diff '/users/transcripts/projects/contribution-diff/contributions/1/diff/terms?oldTerm=termUpdateMe&newTerm=termUpdateMe'
23+
24+
# Diffing a user-defined type against a user-defined type.
25+
fetch "$transcript_user" GET standard-type-diff '/users/transcripts/projects/contribution-diff/contributions/1/diff/types?oldType=DataUpdateMe&newType=DataUpdateMe'

‎transcripts/share-apis/contribution-diffs/standard-term-diff.json

Lines changed: 222 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,222 @@
1+
{
2+
"body": {
3+
"diff": {
4+
"contents": [
5+
{
6+
"diffTag": "both",
7+
"elements": [
8+
{
9+
"annotation": {
10+
"contents": "termUpdateMe",
11+
"tag": "HashQualifier"
12+
},
13+
"segment": "termUpdateMe"
14+
},
15+
{
16+
"annotation": {
17+
"tag": "TypeAscriptionColon"
18+
},
19+
"segment": " :"
20+
},
21+
{
22+
"annotation": null,
23+
"segment": " "
24+
},
25+
{
26+
"annotation": {
27+
"contents": "##Text",
28+
"tag": "TypeReference"
29+
},
30+
"segment": "Text"
31+
},
32+
{
33+
"annotation": null,
34+
"segment": "\n"
35+
},
36+
{
37+
"annotation": {
38+
"contents": "termUpdateMe",
39+
"tag": "HashQualifier"
40+
},
41+
"segment": "termUpdateMe"
42+
},
43+
{
44+
"annotation": {
45+
"tag": "BindingEquals"
46+
},
47+
"segment": " ="
48+
},
49+
{
50+
"annotation": null,
51+
"segment": " "
52+
}
53+
]
54+
},
55+
{
56+
"annotation": {
57+
"tag": "TextLiteral"
58+
},
59+
"diffTag": "segmentChange",
60+
"fromSegment": "\"original\"",
61+
"toSegment": "\"updated\""
62+
}
63+
],
64+
"tag": "UserObject"
65+
},
66+
"diffKind": "diff",
67+
"newBranchRef": "diff-end",
68+
"newTerm": {
69+
"bestTermName": "termUpdateMe",
70+
"defnTermTag": "Plain",
71+
"signature": [
72+
{
73+
"annotation": {
74+
"contents": "##Text",
75+
"tag": "TypeReference"
76+
},
77+
"segment": "Text"
78+
}
79+
],
80+
"termDefinition": {
81+
"contents": [
82+
{
83+
"annotation": {
84+
"contents": "termUpdateMe",
85+
"tag": "HashQualifier"
86+
},
87+
"segment": "termUpdateMe"
88+
},
89+
{
90+
"annotation": {
91+
"tag": "TypeAscriptionColon"
92+
},
93+
"segment": " :"
94+
},
95+
{
96+
"annotation": null,
97+
"segment": " "
98+
},
99+
{
100+
"annotation": {
101+
"contents": "##Text",
102+
"tag": "TypeReference"
103+
},
104+
"segment": "Text"
105+
},
106+
{
107+
"annotation": null,
108+
"segment": "\n"
109+
},
110+
{
111+
"annotation": {
112+
"contents": "termUpdateMe",
113+
"tag": "HashQualifier"
114+
},
115+
"segment": "termUpdateMe"
116+
},
117+
{
118+
"annotation": {
119+
"tag": "BindingEquals"
120+
},
121+
"segment": " ="
122+
},
123+
{
124+
"annotation": null,
125+
"segment": " "
126+
},
127+
{
128+
"annotation": {
129+
"tag": "TextLiteral"
130+
},
131+
"segment": "\"updated\""
132+
}
133+
],
134+
"tag": "UserObject"
135+
},
136+
"termDocs": [],
137+
"termNames": [
138+
"termUpdateMe"
139+
]
140+
},
141+
"oldBranchRef": "diff-start",
142+
"oldTerm": {
143+
"bestTermName": "termUpdateMe",
144+
"defnTermTag": "Plain",
145+
"signature": [
146+
{
147+
"annotation": {
148+
"contents": "##Text",
149+
"tag": "TypeReference"
150+
},
151+
"segment": "Text"
152+
}
153+
],
154+
"termDefinition": {
155+
"contents": [
156+
{
157+
"annotation": {
158+
"contents": "termUpdateMe",
159+
"tag": "HashQualifier"
160+
},
161+
"segment": "termUpdateMe"
162+
},
163+
{
164+
"annotation": {
165+
"tag": "TypeAscriptionColon"
166+
},
167+
"segment": " :"
168+
},
169+
{
170+
"annotation": null,
171+
"segment": " "
172+
},
173+
{
174+
"annotation": {
175+
"contents": "##Text",
176+
"tag": "TypeReference"
177+
},
178+
"segment": "Text"
179+
},
180+
{
181+
"annotation": null,
182+
"segment": "\n"
183+
},
184+
{
185+
"annotation": {
186+
"contents": "termUpdateMe",
187+
"tag": "HashQualifier"
188+
},
189+
"segment": "termUpdateMe"
190+
},
191+
{
192+
"annotation": {
193+
"tag": "BindingEquals"
194+
},
195+
"segment": " ="
196+
},
197+
{
198+
"annotation": null,
199+
"segment": " "
200+
},
201+
{
202+
"annotation": {
203+
"tag": "TextLiteral"
204+
},
205+
"segment": "\"original\""
206+
}
207+
],
208+
"tag": "UserObject"
209+
},
210+
"termDocs": [],
211+
"termNames": [
212+
"termUpdateMe"
213+
]
214+
},
215+
"project": "@transcripts/contribution-diff"
216+
},
217+
"status": [
218+
{
219+
"status_code": 200
220+
}
221+
]
222+
}

0 commit comments

Comments
 (0)