add logging for rename branch (#108)

JunNishimura · Jun 12, 2023 · 4fe5aea · 4fe5aea
1 parent e410005
commit 4fe5aea
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/cmd/branch.go b/cmd/branch.go
@@ -62,13 +62,30 @@ var branchCmd = &cobra.Command{
 
 		// rename current branch
 		if renameOption != "" {
+			prevBranch := client.Head.Reference
 			if err := client.Refs.RenameBranch(client.RootGoitPath, client.Head.Reference, renameOption); err != nil {
 				return fmt.Errorf("fail to rename branch: %w", err)
 			}
 			// update HEAD
 			if err := client.Head.Update(client.Refs, client.RootGoitPath, renameOption); err != nil {
 				return fmt.Errorf("fail to update HEAD: %w", err)
 			}
+			// log
+			if err := gLogger.WriteHEAD(log.NewRecord(log.BranchRecord, client.Head.Commit.Hash, nil, client.Conf.GetUserName(), client.Conf.GetEmail(), time.Now(), fmt.Sprintf("renamed refs/heads/%s to refs/heads/%s", prevBranch, client.Head.Reference))); err != nil {
+				return fmt.Errorf("log error: %w", err)
+			}
+			if err := gLogger.WriteHEAD(log.NewRecord(log.BranchRecord, nil, client.Head.Commit.Hash, client.Conf.GetUserName(), client.Conf.GetEmail(), time.Now(), fmt.Sprintf("renamed refs/heads/%s to refs/heads/%s", prevBranch, client.Head.Reference))); err != nil {
+				return fmt.Errorf("log error: %w", err)
+			}
+			if err := gLogger.DeleteBranch(prevBranch); err != nil {
+				return fmt.Errorf("log error: %w", err)
+			}
+			if err := gLogger.WriteBranch(log.NewRecord(log.BranchRecord, nil, client.Head.Commit.Hash, client.Conf.GetUserName(), client.Conf.GetEmail(), time.Now(), fmt.Sprintf("Created from %s", prevBranch)), client.Head.Reference); err != nil {
+				return fmt.Errorf("log error: %w", err)
+			}
+			if err := gLogger.WriteBranch(log.NewRecord(log.BranchRecord, client.Head.Commit.Hash, client.Head.Commit.Hash, client.Conf.GetUserName(), client.Conf.GetEmail(), time.Now(), fmt.Sprintf("renamed refs/heads/%s refs/heads/%s", prevBranch, client.Head.Reference)), client.Head.Reference); err != nil {
+				return fmt.Errorf("log error: %w", err)
+			}
 		}
 
 		if deleteOption != "" {

diff --git a/internal/log/logger.go b/internal/log/logger.go
@@ -61,13 +61,18 @@ func NewRecord(recType recordType, from, to sha.SHA1, name, email string, t time
 }
 
 func (r *record) String() string {
-	var fromStr string
+	var fromStr, toStr string
 	if r.from == nil {
 		fromStr = strings.Repeat("0", 40)
 	} else {
 		fromStr = r.from.String()
 	}
-	return fmt.Sprintf("%s %s %s <%s> %s %s\t%s: %s\n", fromStr, r.to, r.name, r.email, r.unixtime, r.timeDiff, r.recType, r.message)
+	if r.to == nil {
+		toStr = strings.Repeat("0", 40)
+	} else {
+		toStr = r.to.String()
+	}
+	return fmt.Sprintf("%s %s %s <%s> %s %s\t%s: %s\n", fromStr, toStr, r.name, r.email, r.unixtime, r.timeDiff, r.recType, r.message)
 }
 
 type GoitLogger struct {
@@ -137,3 +142,11 @@ func (l *GoitLogger) WriteBranch(r *record, branchName string) error {
 
 	return nil
 }
+
+func (l *GoitLogger) DeleteBranch(branchName string) error {
+	branchPath := filepath.Join(l.rootGoitPath, "logs", "refs", "heads", branchName)
+	if err := os.Remove(branchPath); err != nil {
+		return fmt.Errorf("fail to delete %s: %w", branchPath, err)
+	}
+	return nil
+}