Async Commit/Merge Infrastructure

api/swagger.yml

@@ -1581,6 +1581,50 @@ components:
         - completed
         - update_time
 
+    MergeAsyncStatus:
+      type: object
+      properties:
+        task_id:
+          type: string
+          description: the id of the async merge task
+        completed:
+          type: boolean
+          description: true if the task has completed (either successfully or with an error)
+        update_time:
+          type: string
+          format: date-time
+          description: last time the task status was updated
+        result:
+          $ref: "#/components/schemas/MergeResult"
+        error:
+          $ref: "#/components/schemas/Error"
+      required:
+        - task_id
+        - completed
+        - update_time
+
+    CommitAsyncStatus:
+      type: object
+      properties:
+        task_id:
+          type: string
+          description: the id of the async commit task
+        completed:
+          type: boolean
+          description: true if the task has completed (either successfully or with an error)
+        update_time:
+          type: string
+          format: date-time
+          description: last time the task status was updated
+        result:
+          $ref: "#/components/schemas/Commit"
+        error:
+          $ref: "#/components/schemas/Error"
+      required:
+        - task_id
+        - completed
+        - update_time
+
     PrepareGCUncommittedRequest:
       type: object
       properties:
@@ -4247,6 +4291,112 @@ paths:
         default:
           $ref: "#/components/responses/ServerError"
 
+  /repositories/{repository}/branches/{branch}/commits/async:
+    parameters:
+      - in: path
+        name: repository
+        required: true
+        schema:
+          type: string
+      - in: path
+        name: branch
+        required: true
+        schema:
+          type: string
+    post:
+      parameters:
+        - in: query
+          name: source_metarange
+          required: false
+          description: The source metarange to commit. Branch must not have uncommitted changes.
+          schema:
+            type: string
+      tags:
+        - commits
+      operationId: commitAsync
+      summary: create commit asynchronously
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/CommitCreation"
+      responses:
+        202:
+          description: commit task started
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/TaskCreation"
+        400:
+          $ref: "#/components/responses/ValidationError"
+        401:
+          $ref: "#/components/responses/Unauthorized"
+        403:
+          $ref: "#/components/responses/Forbidden"
+        404:
+          $ref: "#/components/responses/NotFound"
+        429:
+          description: too many requests
+        501:
+          $ref: "#/components/responses/NotImplemented"
+        default:
+          $ref: "#/components/responses/ServerError"
+
+  /repositories/{repository}/branches/{branch}/commits/status:
+    parameters:
+      - in: path
+        name: repository
+        required: true
+        schema:
+          type: string
+      - in: path
+        name: branch
+        required: true
+        schema:
+          type: string
+    get:
+      tags:
+        - commits
+      operationId: commitAsyncStatus
+      summary: get status of async commit operation
+      parameters:
+        - in: query
+          name: id
+          description: Unique identifier of the commit task
+          schema:
+            type: string
+          required: true
+      responses:
+        200:
+          description: commit task status
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/CommitAsyncStatus"
+        400:
+          $ref: "#/components/responses/ValidationError"
+        401:
+          $ref: "#/components/responses/Unauthorized"
+        403:
+          $ref: "#/components/responses/Forbidden"
+        404:
+          $ref: "#/components/responses/NotFound"
+        409:
+          $ref: "#/components/responses/Conflict"
+        412:
+          description: Precondition Failed (e.g. a pre-commit hook returned a failure)
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        429:
+          description: too many requests
+        501:
+          $ref: "#/components/responses/NotImplemented"
+        default:
+          $ref: "#/components/responses/ServerError"
+
   /repositories/{repository}/commits:
     parameters:
       - in: path
@@ -4596,6 +4746,122 @@ paths:
         default:
           $ref: "#/components/responses/ServerError"
 
+  /repositories/{repository}/refs/{sourceRef}/merge/{destinationBranch}/async:
+    parameters:
+      - in: path
+        name: repository
+        required: true
+        schema:
+          type: string
+      - in: path
+        name: sourceRef
+        required: true
+        schema:
+          type: string
+        description: source ref
+      - in: path
+        name: destinationBranch
+        required: true
+        schema:
+          type: string
+        description: destination branch name
+    post:
+      tags:
+        - refs
+      operationId: mergeIntoBranchAsync
+      summary: merge references asynchronously
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/Merge"
+      responses:
+        202:
+          description: merge task started
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/TaskCreation"
+        400:
+          $ref: "#/components/responses/ValidationError"
+        401:
+          $ref: "#/components/responses/Unauthorized"
+        403:
+          $ref: "#/components/responses/Forbidden"
+        404:
+          $ref: "#/components/responses/NotFound"
+        429:
+          description: too many requests
+        501:
+          $ref: "#/components/responses/NotImplemented"
+        default:
+          $ref: "#/components/responses/ServerError"
+
+  /repositories/{repository}/refs/{sourceRef}/merge/{destinationBranch}/status:
+    parameters:
+      - in: path
+        name: repository
+        required: true
+        schema:
+          type: string
+      - in: path
+        name: sourceRef
+        required: true
+        schema:
+          type: string
+        description: source ref
+      - in: path
+        name: destinationBranch
+        required: true
+        schema:
+          type: string
+        description: destination branch name
+    get:
+      tags:
+        - refs
+      operationId: mergeIntoBranchAsyncStatus
+      summary: get status of async merge operation
+      parameters:
+        - in: query
+          name: id
+          description: Unique identifier of the merge task
+          schema:
+            type: string
+          required: true
+      responses:
+        200:
+          description: merge task status
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/MergeAsyncStatus"
+        400:
+          $ref: "#/components/responses/ValidationError"
+        401:
+          $ref: "#/components/responses/Unauthorized"
+        403:
+          $ref: "#/components/responses/Forbidden"
+        404:
+          $ref: "#/components/responses/NotFound"
+        409:
+          description: Conflict
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        412:
+          description: precondition failed (e.g. a pre-merge hook returned a failure)
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        429:
+          description: too many requests
+        501:
+          $ref: "#/components/responses/NotImplemented"
+        default:
+          $ref: "#/components/responses/ServerError"
+
   /repositories/{repository}/branches/{branch}/diff:
     parameters:
       - $ref: "#/components/parameters/PaginationAfter"