feat: add api to get commit changes

Author: hunjixin

README.md

@@ -15,6 +15,3 @@ init and running
 
 ./jzfs daemon
 ```
-
-
-revert object只revert一个对象

api/jiaozifs.gen.go

@@ -1265,8 +1265,8 @@ paths:
     get:
       tags:
         - commit
-      operationId: getCommitDiff
-      summary: get commit differences
+      operationId: compareCommit
+      summary: compare two commit
       parameters:
         - in: query
           name: path
@@ -1290,6 +1290,50 @@ paths:
         503:
           description: server internal error
 
+  /repos/{owner}/{repository}/changes/{commit_id}:
+    parameters:
+      - in: path
+        name: owner
+        required: true
+        schema:
+          type: string
+      - in: path
+        name: repository
+        required: true
+        schema:
+          type: string
+      - in: path
+        name: commit_id
+        required: true
+        schema:
+          type: string
+    get:
+      tags:
+        - commit
+      operationId: getCommitChanges
+      summary: get changes in commit
+      parameters:
+        - in: query
+          name: path
+          description: specific path, if not specific return entries in root
+          required: false
+          schema:
+            type: string
+      responses:
+        200:
+          description: commit diff
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/Change"
+        400:
+          description: ValidationError
+        401:
+          description: Unauthorized
+        503:
+          description: server internal error
   /repos/{owner}/{repository}/commits:
     parameters:
       - in: path

api/swagger.yml

@@ -7,13 +7,15 @@ import (
 	"net/http"
 	"regexp"
 	"strings"
-	"time"
+
+	"github.com/jiaozifs/jiaozifs/block/params"
+
+	"github.com/jiaozifs/jiaozifs/versionmgr"
 
 	"github.com/jiaozifs/jiaozifs/api"
 	"github.com/jiaozifs/jiaozifs/auth"
 	"github.com/jiaozifs/jiaozifs/models"
 	"github.com/jiaozifs/jiaozifs/utils"
-	"github.com/jiaozifs/jiaozifs/utils/hash"
 	"go.uber.org/fx"
 )
 
@@ -50,7 +52,8 @@ func CheckBranchName(name string) error {
 type BranchController struct {
 	fx.In
 
-	Repo models.IRepo
+	Repo                models.IRepo
+	PublicStorageConfig params.AdapterConfig
 }
 
 func (bct BranchController) ListBranches(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, ownerName string, repositoryName string, params api.ListBranchesParams) {
@@ -153,42 +156,31 @@ func (bct BranchController) CreateBranch(ctx context.Context, w *api.JiaozifsRes
 		return
 	}
 
-	//check exit
-	_, err = bct.Repo.BranchRepo().Get(ctx, models.NewGetBranchParams().SetName(body.Name).SetRepositoryID(repository.ID))
-	if err == nil {
-		w.BadRequest(fmt.Sprintf("%s already exit", body.Name))
-		return
-	}
-	if err != nil && !errors.Is(err, models.ErrNotFound) {
-		w.Error(err)
-		return
-	}
 	//get source branch
 	sourceBranch, err := bct.Repo.BranchRepo().Get(ctx, models.NewGetBranchParams().SetName(body.Source).SetRepositoryID(repository.ID))
 	if err != nil && !errors.Is(err, models.ErrNotFound) {
 		w.Error(err)
 		return
 	}
 
-	commitHash := hash.EmptyHash
-	if sourceBranch != nil {
-		commitHash = sourceBranch.CommitHash
+	workRepo, err := versionmgr.NewWorkRepositoryFromConfig(ctx, operator, repository, bct.Repo, bct.PublicStorageConfig)
+	if err != nil {
+		w.Error(err)
+		return
 	}
 
-	// Create branch
-	newBranch := &models.Branch{
-		RepositoryID: repository.ID,
-		CommitHash:   commitHash,
-		Name:         body.Name,
-		CreatorID:    operator.ID,
-		CreatedAt:    time.Now(),
-		UpdatedAt:    time.Now(),
+	err = workRepo.CheckOut(ctx, versionmgr.InCommit, sourceBranch.CommitHash.Hex())
+	if err != nil {
+		w.Error(err)
+		return
 	}
-	newBranch, err = bct.Repo.BranchRepo().Insert(ctx, newBranch)
+
+	newBranch, err := workRepo.CreateBranch(ctx, body.Name)
 	if err != nil {
 		w.Error(err)
 		return
 	}
+
 	w.JSON(api.Branch{
 		CommitHash:   newBranch.CommitHash.Hex(),
 		CreatedAt:    newBranch.CreatedAt,
@@ -226,14 +218,21 @@ func (bct BranchController) DeleteBranch(ctx context.Context, w *api.JiaozifsRes
 		return
 	}
 
-	// Delete branch
-	affectedRows, err := bct.Repo.BranchRepo().Delete(ctx, models.NewDeleteBranchParams().SetName(params.RefName).SetRepositoryID(repository.ID))
+	workRepo, err := versionmgr.NewWorkRepositoryFromConfig(ctx, operator, repository, bct.Repo, bct.PublicStorageConfig)
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	err = workRepo.CheckOut(ctx, versionmgr.InBranch, params.RefName)
 	if err != nil {
 		w.Error(err)
 		return
 	}
-	if affectedRows == 0 {
-		w.NotFound()
+
+	err = workRepo.DeleteBranch(ctx)
+	if err != nil {
+		w.Error(err)
 		return
 	}
 	w.OK()

controller/branch_ctl.go

@@ -106,7 +106,7 @@ func (commitCtl CommitController) GetEntriesInRef(ctx context.Context, w *api.Ji
 	w.JSON(treeEntry)
 }
 
-func (commitCtl CommitController) GetCommitDiff(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, ownerName string, repositoryName string, basehead string, params api.GetCommitDiffParams) {
+func (commitCtl CommitController) CompareCommit(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, ownerName string, repositoryName string, basehead string, params api.CompareCommitParams) {
 	operator, err := auth.GetOperator(ctx)
 	if err != nil {
 		w.Error(err)
@@ -189,3 +189,75 @@ func (commitCtl CommitController) GetCommitDiff(ctx context.Context, w *api.Jiao
 	}
 	w.JSON(changesResp)
 }
+
+func (commitCtl CommitController) GetCommitChanges(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, ownerName string, repositoryName string, commitID string, params api.GetCommitChangesParams) {
+	operator, err := auth.GetOperator(ctx)
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	owner, err := commitCtl.Repo.UserRepo().Get(ctx, models.NewGetUserParams().SetName(ownerName))
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	repository, err := commitCtl.Repo.RepositoryRepo().Get(ctx, models.NewGetRepoParams().SetName(repositoryName).SetOwnerID(owner.ID))
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	if operator.ID != owner.ID { //todo check permission
+		w.Forbidden()
+		return
+	}
+
+	workRepo, err := versionmgr.NewWorkRepositoryFromConfig(ctx, operator, repository, commitCtl.Repo, commitCtl.PublicStorageConfig)
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	err = workRepo.CheckOut(ctx, versionmgr.InCommit, commitID)
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	changes, err := workRepo.GetCommitChanges(ctx)
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	path := versionmgr.CleanPath(utils.StringValue(params.Path))
+	var changesResp []api.Change
+	err = changes.ForEach(func(change versionmgr.IChange) error {
+		action, err := change.Action()
+		if err != nil {
+			return err
+		}
+		fullPath := change.Path()
+		if strings.HasPrefix(fullPath, path) {
+			apiChange := api.Change{
+				Action: api.ChangeAction(action),
+				Path:   fullPath,
+			}
+			if change.From() != nil {
+				apiChange.BaseHash = utils.String(hex.EncodeToString(change.From().Hash()))
+			}
+			if change.To() != nil {
+				apiChange.ToHash = utils.String(hex.EncodeToString(change.To().Hash()))
+			}
+			changesResp = append(changesResp, apiChange)
+		}
+		return nil
+	})
+	if err != nil {
+		w.Error(err)
+		return
+	}
+	w.JSON(changesResp)
+}

controller/commit_ctl.go

@@ -4,10 +4,8 @@ import (
 	"bytes"
 	"context"
 	"encoding/hex"
-	"errors"
 	"net/http"
 	"strings"
-	"time"
 
 	"github.com/jiaozifs/jiaozifs/api"
 	"github.com/jiaozifs/jiaozifs/auth"
@@ -51,50 +49,27 @@ func (wipCtl WipController) GetWip(ctx context.Context, w *api.JiaozifsResponse,
 		return
 	}
 
-	ref, err := wipCtl.Repo.BranchRepo().Get(ctx, models.NewGetBranchParams().SetRepositoryID(repository.ID).SetName(params.RefName))
+	workRepo, err := versionmgr.NewWorkRepositoryFromConfig(ctx, operator, repository, wipCtl.Repo, wipCtl.PublicStorageConfig)
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
-	wip, err := wipCtl.Repo.WipRepo().Get(ctx, models.NewGetWipParams().SetRefID(ref.ID).SetCreatorID(operator.ID).SetRepositoryID(repository.ID))
-	if err == nil {
-		w.JSON(wip)
-		return
-	}
-
-	if err != nil && !errors.Is(err, models.ErrNotFound) {
+	err = workRepo.CheckOut(ctx, versionmgr.InBranch, params.RefName)
+	if err != nil {
 		w.Error(err)
 		return
 	}
 
-	// if not found create a wip
-	currentTreeHash := hash.EmptyHash
-	if !ref.CommitHash.IsEmpty() {
-		baseCommit, err := wipCtl.Repo.CommitRepo(repository.ID).Commit(ctx, ref.CommitHash)
-		if err != nil {
-			w.Error(err)
-			return
-		}
-		currentTreeHash = baseCommit.TreeHash
-	}
-
-	wip = &models.WorkingInProcess{
-		CurrentTree:  currentTreeHash,
-		BaseCommit:   ref.CommitHash,
-		RepositoryID: repository.ID,
-		RefID:        ref.ID,
-		State:        0,
-		CreatorID:    operator.ID,
-		CreatedAt:    time.Now(),
-		UpdatedAt:    time.Now(),
-	}
-	wip, err = wipCtl.Repo.WipRepo().Insert(ctx, wip)
+	wip, isNew, err := workRepo.GetOrCreateWip(ctx)
 	if err != nil {
 		w.Error(err)
 		return
 	}
-	w.JSON(wip, http.StatusCreated)
+	if isNew {
+		w.JSON(wip, http.StatusCreated)
+	}
+	w.JSON(wip)
 }
 
 // ListWip return wips of branches, operator only see himself wips in specific repository
@@ -202,28 +177,23 @@ func (wipCtl WipController) DeleteWip(ctx context.Context, w *api.JiaozifsRespon
 		return
 	}
 
-	ref, err := wipCtl.Repo.BranchRepo().Get(ctx, models.NewGetBranchParams().SetRepositoryID(repository.ID).SetName(params.RefName))
+	workRepo, err := versionmgr.NewWorkRepositoryFromConfig(ctx, operator, repository, wipCtl.Repo, wipCtl.PublicStorageConfig)
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
-	deleteWipParams := models.NewDeleteWipParams().
-		SetCreatorID(operator.ID). //todo admin delete
-		SetRepositoryID(repository.ID).
-		SetRefID(ref.ID)
-
-	affectedRaw, err := wipCtl.Repo.WipRepo().Delete(ctx, deleteWipParams)
+	err = workRepo.CheckOut(ctx, versionmgr.InBranch, params.RefName)
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
-	if affectedRaw == 0 {
-		w.NotFound()
+	err = workRepo.DeleteWip(ctx)
+	if err != nil {
+		w.Error(err)
 		return
 	}
-
 	w.OK()
 }
 
@@ -323,8 +293,8 @@ func (wipCtl WipController) GetWipChanges(ctx context.Context, w *api.JiaozifsRe
 	w.JSON(changesResp)
 }
 
-// RevertWip
-func (wipCtl WipController) RevertWip(ctx context.Context, w *api.JiaozifsResponse, r *http.Request, ownerName string, repositoryName string, params api.RevertWipParams) {
+// RevertWip revert wip changes to base commit
+func (wipCtl WipController) RevertWip(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, ownerName string, repositoryName string, params api.RevertWipParams) {
 	operator, err := auth.GetOperator(ctx)
 	if err != nil {
 		w.Error(err)