diff --git a/lexicons/git/mergeCommit.json b/lexicons/git/mergeCommit.json index bd5f39335..2cdb56142 100644 --- a/lexicons/git/mergeCommit.json +++ b/lexicons/git/mergeCommit.json @@ -4,7 +4,7 @@ "defs": { "main": { "type": "procedure", - "description": "Merge a commit into repository's branch", + "description": "DEPRECATED: use `org.tangled.temp.git.mergeCommit`", "input": { "encoding": "application/json", "schema": { diff --git a/lexicons/org/tangled/temp/git/deleteBranch.json b/lexicons/org/tangled/temp/git/deleteBranch.json new file mode 100644 index 000000000..958909906 --- /dev/null +++ b/lexicons/org/tangled/temp/git/deleteBranch.json @@ -0,0 +1,30 @@ +{ + "lexicon": 1, + "id": "org.tangled.temp.git.deleteBranch", + "defs": { + "main": { + "type": "procedure", + "description": "Delete a branch on this repository", + "input": { + "encoding": "application/json", + "schema": { + "type": "object", + "required": [ + "repo", + "branch" + ], + "properties": { + "repo": { + "type": "string", + "format": "did", + "description": "DID of the repository" + }, + "branch": { + "type": "string" + } + } + } + } + } + } +} diff --git a/lexicons/org/tangled/temp/git/mergeCommit.json b/lexicons/org/tangled/temp/git/mergeCommit.json new file mode 100644 index 000000000..5fa031c00 --- /dev/null +++ b/lexicons/org/tangled/temp/git/mergeCommit.json @@ -0,0 +1,85 @@ +{ + "lexicon": 1, + "id": "org.tangled.temp.git.mergeCommit", + "defs": { + "main": { + "type": "procedure", + "description": "Merge a commit into repository's branch", + "input": { + "encoding": "application/json", + "schema": { + "type": "object", + "required": ["target", "source", "style"], + "properties": { + "target": { + "type": "ref", + "ref": "#target" + }, + "source": { + "type": "ref", + "ref": "#source" + }, + "style": { + "type": "string", + "enum": [ + "rebase", + "merge", + "rebase-merge", + "squash-rebase", + "squash-rebase-merge", + "fast-forward-only" + ] + }, + "mergeCommit": { + "type": "ref", + "ref": "#mergeCommitContent", + "description": "Merge commit content. Used when merge commit is created." + } + } + } + } + }, + "target": { + "type": "object", + "required": ["repo", "branch", "commit"], + "properties": { + "repo": { + "type": "string", + "format": "did", + "description": "DID of target git repository" + }, + "branch": { + "type": "string", + "description": "Target branch to merge into" + }, + "commit": { + "type": "string", + "description": "Head commit ID of target branch" + } + } + }, + "source": { + "type": "object", + "required": ["repo", "commit"], + "properties": { + "repo": { + "type": "string", + "format": "did", + "description": "DID of source git repository" + }, + "commit": { + "type": "string", + "description": "Head commit ID to merge" + } + } + }, + "mergeCommitContent": { + "type": "object", + "description": "Merge commit content. Used when merge commit is created.", + "properties": { + "author": { "type": "ref", "ref": "sh.tangled.git.defs#signature" }, + "message": { "type": "string", "maxLength": 1000000 } + } + } + } +} diff --git a/lexicons/repo/deleteBranch.json b/lexicons/repo/deleteBranch.json index 1fd9d1e79..f5740e102 100644 --- a/lexicons/repo/deleteBranch.json +++ b/lexicons/repo/deleteBranch.json @@ -4,7 +4,7 @@ "defs": { "main": { "type": "procedure", - "description": "Delete a branch on this repository", + "description": "DEPRECATED: use `org.tangled.temp.git.deleteBranch`", "input": { "encoding": "application/json", "schema": {