Skip to content

Side by side diffs #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 16, 2025
Merged

Side by side diffs #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04cb05d
Switch unison to side-by-side diffs
ChrisPenner Oct 14, 2025
14cfa95
Update transcripts for side-by-side diffs
ChrisPenner Oct 14, 2025
6a239ed
Bump unison dep
ChrisPenner Oct 15, 2025
061a7a1
Bump transcripts
ChrisPenner Oct 15, 2025
6f4107d
Bump unison again
ChrisPenner Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
736 changes: 488 additions & 248 deletions transcripts/share-apis/contribution-diffs/contribution-diff.json
View file
Open in desktop

Large diffs are not rendered by default.

736 changes: 488 additions & 248 deletions transcripts/share-apis/contribution-diffs/namespace-diff.json
View file
Open in desktop

Large diffs are not rendered by default.

220 changes: 148 additions & 72 deletions transcripts/share-apis/contribution-diffs/standard-term-diff.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,156 @@
{
"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": " "
}
]
},
{
"diffTag": "old",
"elements": [
{
"annotation": {
"tag": "TextLiteral"
"contents": {
"left": [
{
"kind": "unchanged",
"value": [
{
"diffTag": "both",
"elements": [
{
"annotation": {
"contents": "termUpdateMe",
"tag": "HashQualifier"
},
"segment": "termUpdateMe"
},
{
"annotation": {
"tag": "TypeAscriptionColon"
},
"segment": " :"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Text",
"tag": "TypeReference"
},
"segment": "Text"
}
]
}
]
},
{
"kind": "changed",
"value": [
{
"diffTag": "both",
"elements": [
{
"annotation": {
"contents": "termUpdateMe",
"tag": "HashQualifier"
},
"segment": "termUpdateMe"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": " "
}
]
},
"segment": "\"original\""
}
]
},
{
"diffTag": "new",
"elements": [
{
"annotation": {
"tag": "TextLiteral"
{
"diffTag": "oneSided",
"elements": [
{
"annotation": {
"tag": "TextLiteral"
},
"segment": "\"original\""
}
]
}
]
}
],
"right": [
{
"kind": "unchanged",
"value": [
{
"diffTag": "both",
"elements": [
{
"annotation": {
"contents": "termUpdateMe",
"tag": "HashQualifier"
},
"segment": "termUpdateMe"
},
{
"annotation": {
"tag": "TypeAscriptionColon"
},
"segment": " :"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Text",
"tag": "TypeReference"
},
"segment": "Text"
}
]
}
]
},
{
"kind": "changed",
"value": [
{
"diffTag": "both",
"elements": [
{
"annotation": {
"contents": "termUpdateMe",
"tag": "HashQualifier"
},
"segment": "termUpdateMe"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": " "
}
]
},
"segment": "\"updated\""
}
]
}
],
{
"diffTag": "oneSided",
"elements": [
{
"annotation": {
"tag": "TextLiteral"
},
"segment": "\"updated\""
}
]
}
]
}
]
},
"tag": "UserObject"
},
"diffKind": "diff",
Expand Down
Loading
Loading