feat: add api for revert changes

Author: hunjixin

api/jiaozifs.gen.go

@@ -1051,11 +1051,16 @@ paths:
         required: true
         schema:
           type: string
+      - in: query
+        name: pathPrefix
+        description: prefix of path
+        schema:
+          type: string
     post:
       tags:
         - wip
-      operationId: revertWip
-      summary: revert working in process
+      operationId: revertWipChanges
+      summary: revert changes in working in process, empty path will revert all
       responses:
         200:
           description: success to revert wip

api/swagger.yml

@@ -154,35 +154,13 @@ func (commitCtl CommitController) CompareCommit(ctx context.Context, w *api.Jiao
 		return
 	}
 
-	changes, err := workRepo.DiffCommit(ctx, toCommitHash)
+	changes, err := workRepo.DiffCommit(ctx, toCommitHash, utils.StringValue(params.Path))
 	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
-	})
+	changesResp, err := changesToDTO(changes)
 	if err != nil {
 		w.Error(err)
 		return
@@ -226,35 +204,13 @@ func (commitCtl CommitController) GetCommitChanges(ctx context.Context, w *api.J
 		return
 	}
 
-	changes, err := workRepo.GetCommitChanges(ctx)
+	changes, err := workRepo.GetCommitChanges(ctx, utils.StringValue(params.Path))
 	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
-	})
+	changesResp, err := changesToDTO(changes)
 	if err != nil {
 		w.Error(err)
 		return

controller/commit_ctl.go

@@ -0,0 +1,36 @@
+package controller
+
+import (
+	"encoding/hex"
+
+	"github.com/jiaozifs/jiaozifs/api"
+	"github.com/jiaozifs/jiaozifs/utils"
+	"github.com/jiaozifs/jiaozifs/versionmgr"
+)
+
+func changesToDTO(changes *versionmgr.Changes) ([]api.Change, error) {
+	changesResp := make([]api.Change, 0)
+	err := changes.ForEach(func(change versionmgr.IChange) error {
+		action, err := change.Action()
+		if err != nil {
+			return err
+		}
+		fullPath := change.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 {
+		return nil, err
+	}
+	return changesResp, nil
+}

controller/helper.go

@@ -3,9 +3,7 @@ package controller
 import (
 	"bytes"
 	"context"
-	"encoding/hex"
 	"net/http"
-	"strings"
 
 	"github.com/jiaozifs/jiaozifs/api"
 	"github.com/jiaozifs/jiaozifs/auth"
@@ -255,46 +253,22 @@ func (wipCtl WipController) GetWipChanges(ctx context.Context, w *api.JiaozifsRe
 		return
 	}
 
-	changes, err := workTree.Diff(ctx, wip.CurrentTree)
+	changes, err := workTree.Diff(ctx, wip.CurrentTree, utils.StringValue(params.Path))
 	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
-	})
+	changesResp, err := changesToDTO(changes)
 	if err != nil {
 		w.Error(err)
 		return
 	}
-
 	w.JSON(changesResp)
 }
 
-// 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) {
+// RevertWipChanges revert wip changes, if path is empty, revert all
+func (wipCtl WipController) RevertWipChanges(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, ownerName string, repositoryName string, params api.RevertWipChangesParams) {
 	operator, err := auth.GetOperator(ctx)
 	if err != nil {
 		w.Error(err)
@@ -330,7 +304,7 @@ func (wipCtl WipController) RevertWip(ctx context.Context, w *api.JiaozifsRespon
 		return
 	}
 
-	err = workRepo.RevertWip(ctx)
+	err = workRepo.Revert(ctx, utils.StringValue(params.PathPrefix))
 	if err != nil {
 		w.Error(err)
 		return

controller/wip_ctl.go

@@ -23,5 +23,7 @@ SWAGGER_ARG=
 swagger-srv:
 	 swagger serve $(SWAGGER_ARG) -F swagger  ./api/swagger.yml
 
+test: gen-api
+	go test -timeout=30m -parallel=4  -v ./...
 build:gen-api
 	go build $(GOFLAGS) -o jzfs

makefile

@@ -44,19 +44,7 @@ func (c *Change) To() noder.Path {
 
 // Path return change path
 func (c *Change) Path() string {
-	action, err := c.Action()
-	if err != nil {
-		panic(err)
-	}
-
-	var path string
-	if action == merkletrie.Delete {
-		path = c.Change.From.String()
-	} else {
-		path = c.Change.To.String()
-	}
-
-	return path
+	return c.Change.Path()
 }
 
 // Changes used to recored changes between commit, also provider iter function

versionmgr/changes.go

@@ -56,6 +56,14 @@ func (c *Change) Action() (Action, error) {
 	return Modify, nil
 }
 
+// Path returns the path of the change.
+func (c *Change) Path() string {
+	if c.From != nil {
+		return c.From.String()
+	}
+	return c.To.String()
+}
+
 // NewInsert returns a new Change representing the insertion of n.
 func NewInsert(n noder.Path) Change { return Change{To: n} }