feat: impl mergerequest api

Author: hunjixin

api/swagger.yml

@@ -164,6 +164,19 @@ components:
           type: string
         description:
           type: string
+    MergeMergeRequest:
+      type: object
+      required:
+        - msg
+        - conflict_resolve
+      properties:
+        msg:
+          type: string
+        conflict_resolve:
+          description: use to record the resolution of the conflict, example({"b/a.txt":"base"})
+          type: object
+          additionalProperties:
+            type: string
     MergeRequest:
       type: object
       required:
@@ -209,6 +222,56 @@ components:
         updated_at:
           type: string
           format: date-time
+    MergeRequestFullState:
+      type: object
+      required:
+        - id
+        - target_branch
+        - source_branch
+        - source_repo_id
+        - target_repo_id
+        - title
+        - changes
+        - merge_status
+        - author_id
+        - created_at
+        - updated_at
+      properties:
+        id:
+          type: integer
+          format: uint64
+        target_branch:
+          type: string
+          format: uuid
+        source_branch:
+          type: string
+          format: uuid
+        source_repo_id:
+          type: string
+          format: uuid
+        target_repo_id:
+          type: string
+          format: uuid
+        title:
+          type: string
+        merge_status:
+          type: integer
+          format: int
+        description:
+          type: string
+        author_id:
+          type: string
+          format: uuid
+        changes:
+          type: array
+          items:
+            $ref: "#/components/schemas/ChangePair"
+        created_at:
+          type: string
+          format: date-time
+        updated_at:
+          type: string
+          format: date-time
     MergeRequestList:
       type: object
       required:
@@ -534,6 +597,13 @@ components:
         updated_at:
           type: string
           format: date-time
+    UpdateWip:
+      type: object
+      properties:
+        base_commit:
+          type: string
+        current_tree:
+          type: string
     Change:
       type: object
       required:
@@ -549,6 +619,20 @@ components:
           type: string
         to_hash:
           type: string
+    ChangePair:
+      type: object
+      required:
+        - path
+        - is_conflict
+      properties:
+        path:
+          type: string
+        left:
+          $ref: "#/components/schemas/Change"
+        right:
+          $ref: "#/components/schemas/Change"
+        is_conflict:
+          type: boolean
     UserUpdate:
       type: object
       required:
@@ -1099,6 +1183,26 @@ paths:
           description: Unauthorized
         403:
           description: Forbidden
+    post:
+      tags:
+        - wip
+      operationId: updateWip
+      summary: update wip
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/UpdateWip"
+      responses:
+        200:
+          description: update working in process success
+        400:
+          description: ValidationError
+        401:
+          description: Unauthorized
+        403:
+          description: Forbidden
     delete:
       tags:
         - wip
@@ -1592,7 +1696,53 @@ paths:
         500:
           description: Internal Server Error
 
-  /mergequest/{owner}/{repository}/mr/{mrId}:
+  /mergequest/{owner}/{repository}/{mrId}/merge:
+    parameters:
+      - in: path
+        name: owner
+        required: true
+        schema:
+          type: string
+      - in: path
+        name: repository
+        required: true
+        schema:
+          type: string
+      - in: path
+        name: mrId
+        required: true
+        schema:
+          type: integer
+          format: uint64
+    post:
+      tags:
+        - mergerequest
+      operationId: merge
+      summary: merge a mergerequest
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/MergeMergeRequest"
+      responses:
+        200:
+          description: merge mergerequest success
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/Commit"
+        401:
+          description: Unauthorized
+        404:
+          description: Resource Not Found
+        420:
+          description: Too many requests
+        500:
+          description: Internal Server Error
+  /mergequest/{owner}/{repository}/{mrId}:
     parameters:
       - in: path
         name: owner
@@ -1621,7 +1771,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/MergeRequest"
+                $ref: "#/components/schemas/MergeRequestFullState"
         401:
           description: Unauthorized
         404:
@@ -1669,7 +1819,6 @@ paths:
         500:
           description: Internal Server Error
 
-
   /users/{owner}/repos:
     parameters:
       - in: path

controller/commit_ctl.go

@@ -48,7 +48,7 @@ func (commitCtl CommitController) GetEntriesInRef(ctx context.Context, w *api.Ji
 		return
 	}
 
-	treeHash := hash.EmptyHash
+	treeHash := hash.Empty
 	if params.Type == api.RefTypeWip {
 		refName := repository.HEAD
 		if params.Ref != nil {