Merge endpoints

Author: qwerty287

routers/api/v1/api.go

@@ -937,10 +937,7 @@ func Routes(sessioner func(http.Handler) http.Handler) *web.Route {
 				m.Group("/git", func() {
 					m.Group("/commits", func() {
 						m.Get("/{sha}", repo.GetSingleCommit)
-						m.Get("/{sha}.diff",
-							repo.DownloadCommitDiff)
-						m.Get("/{sha}.patch",
-							repo.DownloadCommitPatch)
+						m.Get("/{sha}.{diffType:diff|patch}", repo.DownloadCommitDiffOrPatch)
 					})
 					m.Get("/refs", repo.GetGitAllRefs)
 					m.Get("/refs/*", repo.GetGitRefs)

routers/api/v1/repo/commits.go

@@ -214,11 +214,11 @@ func GetAllCommits(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, &apiCommits)
 }
 
-// DownloadCommitDiff render a commit's raw diff
-func DownloadCommitDiff(ctx *context.APIContext) {
-	// swagger:operation GET /repos/{owner}/{repo}/git/commits/{sha}.diff repository repoDownloadCommitDiff
+// DownloadCommitDiffOrPatch render a commit's raw diff or patch
+func DownloadCommitDiffOrPatch(ctx *context.APIContext) {
+	// swagger:operation GET /repos/{owner}/{repo}/git/commits/{sha}.{diffType} repository repoDownloadCommitDiffOrPatch
 	// ---
-	// summary: Get a commit diff
+	// summary: Get a commit's diff or patch
 	// produces:
 	// - text/plain
 	// parameters:
@@ -237,52 +237,22 @@ func DownloadCommitDiff(ctx *context.APIContext) {
 	//   description: SHA of the commit to get
 	//   type: string
 	//   required: true
+	// - name: diffType
+	//	 in: path
+	//	 description: whether the output is diff or patch
+	//	 type: string
+	//	 enum: [diff, patch]
+	//	 required: true
 	// responses:
 	//   "200":
 	//     "$ref": "#/responses/string"
 	//   "404":
 	//     "$ref": "#/responses/notFound"
-	DownloadCommitDiffOrPatch(ctx, "diff")
-}
-
-// DownloadCommitPatch render a commit's raw patch
-func DownloadCommitPatch(ctx *context.APIContext) {
-	// swagger:operation GET /repos/{owner}/{repo}/git/commits/{sha}.patch repository repoDownloadCommitPatch
-	// ---
-	// summary: Get a commit patch
-	// produces:
-	// - text/plain
-	// parameters:
-	// - name: owner
-	//   in: path
-	//   description: owner of the repo
-	//   type: string
-	//   required: true
-	// - name: repo
-	//   in: path
-	//   description: name of the repo
-	//   type: string
-	//   required: true
-	// - name: sha
-	//   in: path
-	//   description: SHA of the commit to get
-	//   type: string
-	//   required: true
-	// responses:
-	//   "200":
-	//     "$ref": "#/responses/string"
-	//   "404":
-	//     "$ref": "#/responses/notFound"
-	DownloadCommitDiffOrPatch(ctx, "patch")
-}
-
-// DownloadCommitDiffOrPatch render a commit's raw diff
-func DownloadCommitDiffOrPatch(ctx *context.APIContext, diffType string) {
 	repoPath := models.RepoPath(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
 	if err := git.GetRawDiff(
 		repoPath,
 		ctx.Params(":sha"),
-		git.RawDiffType(diffType),
+		git.RawDiffType(ctx.Params(":type")),
 		ctx.Resp,
 	); err != nil {
 		if git.IsErrNotExist(err) {

templates/swagger/v1_json.tmpl

@@ -3581,59 +3581,16 @@
         }
       }
     },
-    "/repos/{owner}/{repo}/git/commits/{sha}.diff": {
+    "/repos/{owner}/{repo}/git/commits/{sha}.{diffType}": {
       "get": {
         "produces": [
           "text/plain"
         ],
         "tags": [
           "repository"
         ],
-        "summary": "Get a commit diff",
-        "operationId": "repoDownloadCommitDiff",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "owner of the repo",
-            "name": "owner",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the repo",
-            "name": "repo",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "SHA of the commit to get",
-            "name": "sha",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/string"
-          },
-          "404": {
-            "$ref": "#/responses/notFound"
-          }
-        }
-      }
-    },
-    "/repos/{owner}/{repo}/git/commits/{sha}.patch": {
-      "get": {
-        "produces": [
-          "text/plain"
-        ],
-        "tags": [
-          "repository"
-        ],
-        "summary": "Get a commit patch",
-        "operationId": "repoDownloadCommitPatch",
+        "summary": "Get a commit's diff or patch",
+        "operationId": "repoDownloadCommitDiffOrPatch",
         "parameters": [
           {
             "type": "string",