Skip to content

Commit

Permalink
New contribution transcripts
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisPenner committed Jul 29, 2024
1 parent 7342c56 commit b995556
Show file tree
Hide file tree
Showing 7 changed files with 441 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
"newRefHash": "#1f9oqkrlfnkhnmfh29c9oiuvlbbta0j29nsmu4me709ber295aji2nuv2t8q7e6pfeji1ge1scdblb4qbg3uvlmcbuiesc8q88e0bqo",
"oldRef": "diff-start",
"oldRefHash": "#odojlhcu8m0iaajcjug8mkd84rqib8s273rf46rnn281trtqu56mgkogp2o71ajsmvpvamqo4lvotqj5kare46ci5t26m4oe2vpqjvo",
"project": "@transcripts/namespace-diff"
"project": "@transcripts/contribution-diff"
},
"status": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"id": "C-<UUID>",
"numComments": 0,
"number": 1,
"projectRef": "@transcripts/namespace-diff",
"projectRef": "@transcripts/contribution-diff",
"sourceBranchRef": "diff-end",
"status": "in_review",
"targetBranchRef": "diff-start",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
"newRefHash": "#1f9oqkrlfnkhnmfh29c9oiuvlbbta0j29nsmu4me709ber295aji2nuv2t8q7e6pfeji1ge1scdblb4qbg3uvlmcbuiesc8q88e0bqo",
"oldRef": "diff-start",
"oldRefHash": "#odojlhcu8m0iaajcjug8mkd84rqib8s273rf46rnn281trtqu56mgkogp2o71ajsmvpvamqo4lvotqj5kare46ci5t26m4oe2vpqjvo",
"project": "@transcripts/namespace-diff"
"project": "@transcripts/contribution-diff"
},
"status": [
{
Expand Down
58 changes: 29 additions & 29 deletions transcripts/share-apis/contribution-diffs/prelude.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
```ucm:hide
.> project.create-empty namespace-diff
namespace-diff/main> branch /diff-start
namespace-diff/diff-start> builtins.mergeio
.> project.create-empty contribution-diff
contribution-diff/main> branch /diff-start
contribution-diff/diff-start> builtins.mergeio
```

```unison
Expand Down Expand Up @@ -48,22 +48,22 @@ deleteMeAfterFork = "delete me after fork"
```

```ucm:hide
namespace-diff/diff-start> add
namespace-diff/diff-start> push @transcripts/namespace-diff/diff-start
namespace-diff/diff-start> branch /diff-end
namespace-diff/diff-end> alias.term termAliasMe aTermAlias
namespace-diff/diff-end> delete.term termDeleteMe
namespace-diff/diff-end> alias.type DataAliasMe ATypeAlias
namespace-diff/diff-end> delete.type DataDeleteMe
namespace-diff/diff-end> delete.namespace DataDeleteMe
namespace-diff/diff-end> alias.type AbilityAliasMe AbilityAlias
namespace-diff/diff-end> delete.type AbilityDeleteMe
namespace-diff/diff-end> delete.namespace AbilityDeleteMe
namespace-diff/diff-end> delete.term a.definition.at.path1
namespace-diff/diff-end> delete.term a.definition.at.path2
namespace-diff/diff-end> delete.term a.different.path
namespace-diff/diff-end> delete.term aDoc
namespace-diff/diff-end> delete.term aTest
contribution-diff/diff-start> add
contribution-diff/diff-start> push @transcripts/contribution-diff/diff-start
contribution-diff/diff-start> branch /diff-end
contribution-diff/diff-end> alias.term termAliasMe aTermAlias
contribution-diff/diff-end> delete.term termDeleteMe
contribution-diff/diff-end> alias.type DataAliasMe ATypeAlias
contribution-diff/diff-end> delete.type DataDeleteMe
contribution-diff/diff-end> delete.namespace DataDeleteMe
contribution-diff/diff-end> alias.type AbilityAliasMe AbilityAlias
contribution-diff/diff-end> delete.type AbilityDeleteMe
contribution-diff/diff-end> delete.namespace AbilityDeleteMe
contribution-diff/diff-end> delete.term a.definition.at.path1
contribution-diff/diff-end> delete.term a.definition.at.path2
contribution-diff/diff-end> delete.term a.different.path
contribution-diff/diff-end> delete.term aDoc
contribution-diff/diff-end> delete.term aTest
```

```unison
Expand All @@ -83,13 +83,13 @@ ability AbilityNew where
```

```ucm
namespace-diff/diff-end> update
namespace-diff/diff-end> rename.term termRenameMe renamedTerm
namespace-diff/diff-end> rename.type DataRenameMe RenamedType
namespace-diff/diff-end> rename.namespace DataRenameMe RenamedType
namespace-diff/diff-end> rename.type AbilityRenameMe AbilityRenamed
namespace-diff/diff-end> rename.namespace AbilityRenameMe AbilityRenamed
namespace-diff/diff-end> push @transcripts/namespace-diff/diff-end
contribution-diff/diff-end> update
contribution-diff/diff-end> rename.term termRenameMe renamedTerm
contribution-diff/diff-end> rename.type DataRenameMe RenamedType
contribution-diff/diff-end> rename.namespace DataRenameMe RenamedType
contribution-diff/diff-end> rename.type AbilityRenameMe AbilityRenamed
contribution-diff/diff-end> rename.namespace AbilityRenameMe AbilityRenamed
contribution-diff/diff-end> push @transcripts/contribution-diff/diff-end
```

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

```ucm
namespace-diff/diff-start> update
namespace-diff/diff-start> delete.term deleteMeAfterFork
namespace-diff/diff-start> push @transcripts/namespace-diff/diff-start
contribution-diff/diff-start> update
contribution-diff/diff-start> delete.term deleteMeAfterFork
contribution-diff/diff-start> push @transcripts/contribution-diff/diff-start
```
12 changes: 9 additions & 3 deletions transcripts/share-apis/contribution-diffs/run.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,20 @@ source "../../transcript_helpers.sh"

transcript_ucm transcript prelude.md

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

fetch "$transcript_user" POST create-contribution-for-diff '/users/transcripts/projects/namespace-diff/contributions' '{
fetch "$transcript_user" POST create-contribution-for-diff '/users/transcripts/projects/contribution-diff/contributions' '{
"title": "My contribution",
"description": "My description",
"status": "in_review",
"sourceBranchRef": "diff-end",
"targetBranchRef": "diff-start"
}'

fetch "$transcript_user" GET contribution-diff '/users/transcripts/projects/namespace-diff/contributions/1/diff'
fetch "$transcript_user" GET contribution-diff '/users/transcripts/projects/contribution-diff/contributions/1/diff'

# Diffing a user-defined term against a user-defined term.
fetch "$transcript_user" GET standard-term-diff '/users/transcripts/projects/contribution-diff/contributions/1/diff/terms?oldTerm=termUpdateMe&newTerm=termUpdateMe'

# Diffing a user-defined type against a user-defined type.
fetch "$transcript_user" GET standard-type-diff '/users/transcripts/projects/contribution-diff/contributions/1/diff/types?oldType=DataUpdateMe&newType=DataUpdateMe'
222 changes: 222 additions & 0 deletions transcripts/share-apis/contribution-diffs/standard-term-diff.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
{
"body": {
"diff": {
"contents": [
{
"diffTag": "both",
"elements": [
{
"annotation": {
"contents": "termUpdateMe",
"tag": "HashQualifier"
},
"segment": "termUpdateMe"
},
{
"annotation": {
"tag": "TypeAscriptionColon"
},
"segment": " :"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Text",
"tag": "TypeReference"
},
"segment": "Text"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": {
"contents": "termUpdateMe",
"tag": "HashQualifier"
},
"segment": "termUpdateMe"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": " "
}
]
},
{
"annotation": {
"tag": "TextLiteral"
},
"diffTag": "segmentChange",
"fromSegment": "\"original\"",
"toSegment": "\"updated\""
}
],
"tag": "UserObject"
},
"diffKind": "diff",
"newBranchRef": "diff-end",
"newTerm": {
"bestTermName": "termUpdateMe",
"defnTermTag": "Plain",
"signature": [
{
"annotation": {
"contents": "##Text",
"tag": "TypeReference"
},
"segment": "Text"
}
],
"termDefinition": {
"contents": [
{
"annotation": {
"contents": "termUpdateMe",
"tag": "HashQualifier"
},
"segment": "termUpdateMe"
},
{
"annotation": {
"tag": "TypeAscriptionColon"
},
"segment": " :"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Text",
"tag": "TypeReference"
},
"segment": "Text"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": {
"contents": "termUpdateMe",
"tag": "HashQualifier"
},
"segment": "termUpdateMe"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TextLiteral"
},
"segment": "\"updated\""
}
],
"tag": "UserObject"
},
"termDocs": [],
"termNames": [
"termUpdateMe"
]
},
"oldBranchRef": "diff-start",
"oldTerm": {
"bestTermName": "termUpdateMe",
"defnTermTag": "Plain",
"signature": [
{
"annotation": {
"contents": "##Text",
"tag": "TypeReference"
},
"segment": "Text"
}
],
"termDefinition": {
"contents": [
{
"annotation": {
"contents": "termUpdateMe",
"tag": "HashQualifier"
},
"segment": "termUpdateMe"
},
{
"annotation": {
"tag": "TypeAscriptionColon"
},
"segment": " :"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Text",
"tag": "TypeReference"
},
"segment": "Text"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": {
"contents": "termUpdateMe",
"tag": "HashQualifier"
},
"segment": "termUpdateMe"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TextLiteral"
},
"segment": "\"original\""
}
],
"tag": "UserObject"
},
"termDocs": [],
"termNames": [
"termUpdateMe"
]
},
"project": "@transcripts/contribution-diff"
},
"status": [
{
"status_code": 200
}
]
}
Loading

0 comments on commit b995556

Please sign in to comment.