Skip to content

Commit

Permalink
define resetHead function (#128)
Browse files Browse the repository at this point in the history
  • Loading branch information
JunNishimura committed Jun 18, 2023
1 parent 4762515 commit 1e58d12
Showing 1 changed file with 36 additions and 28 deletions.
64 changes: 36 additions & 28 deletions cmd/reset.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,40 @@ var (
resetRegexp = regexp.MustCompile(`HEAD@\{\d\}`)
)

func resetHead(arg, rootGoitPath string, head *store.Head, refs *store.Refs, conf *store.Config) error {
// get log record
reflog, err := store.NewReflog(rootGoitPath, head, refs)
if err != nil {
return fmt.Errorf("fail to initialize reflog: %w", err)
}
sp := strings.Split(arg, "HEAD@")[1]
headNum, err := strconv.Atoi(sp[1 : len(sp)-1])
if err != nil {
return fmt.Errorf("fail to convert number '%s': %w", arg, err)
}
logRecord, err := reflog.GetRecord(headNum)
if err != nil {
return fmt.Errorf("fail to get log record: %w", err)
}

// reset Head
prevHeadHash := head.Commit.Hash
if err := head.Reset(rootGoitPath, refs, logRecord.Hash); err != nil {
return fmt.Errorf("fail to reset HEAD: %w", err)
}

// log
newRecord := log.NewRecord(log.ResetRecord, prevHeadHash, logRecord.Hash, conf.GetUserName(), conf.GetEmail(), time.Now(), fmt.Sprintf("moving to %s", arg))
if err := gLogger.WriteHEAD(newRecord); err != nil {
return fmt.Errorf("log error: %w", err)
}
if err := gLogger.WriteBranch(newRecord, head.Reference); err != nil {
return fmt.Errorf("log error: %w", err)
}

return nil
}

// resetCmd represents the reset command
var resetCmd = &cobra.Command{
Use: "reset",
Expand Down Expand Up @@ -50,36 +84,10 @@ var resetCmd = &cobra.Command{
return errors.New("only one argument is acceptible. argument format is 'HEAD@{number}'")
}

if isSoft {
// get log record
reflog, err := store.NewReflog(client.RootGoitPath, client.Head, client.Refs)
if err != nil {
return fmt.Errorf("fail to initialize reflog: %w", err)
}
sp := strings.Split(args[0], "HEAD@")[1]
headNum, err := strconv.Atoi(sp[1 : len(sp)-1])
if err != nil {
return fmt.Errorf("fail to convert number '%s': %w", args[0], err)
}
logRecord, err := reflog.GetRecord(headNum)
if err != nil {
return fmt.Errorf("fail to get log record: %w", err)
}

// reset Head
prevHeadHash := client.Head.Commit.Hash
if err := client.Head.Reset(client.RootGoitPath, client.Refs, logRecord.Hash); err != nil {
if isSoft || isMixed || isHard {
if err := resetHead(args[0], client.RootGoitPath, client.Head, client.Refs, client.Conf); err != nil {
return fmt.Errorf("fail to reset HEAD: %w", err)
}

// log
newRecord := log.NewRecord(log.ResetRecord, prevHeadHash, logRecord.Hash, client.Conf.GetUserName(), client.Conf.GetEmail(), time.Now(), fmt.Sprintf("moving to %s", args[0]))
if err := gLogger.WriteHEAD(newRecord); err != nil {
return fmt.Errorf("log error: %w", err)
}
if err := gLogger.WriteBranch(newRecord, client.Head.Reference); err != nil {
return fmt.Errorf("log error: %w", err)
}
}

return nil
Expand Down

0 comments on commit 1e58d12

Please sign in to comment.