revList: order fix

Author: fcharlie

pkg/zeta/fetch.go

@@ -187,7 +187,7 @@ func (r *Repository) prepareFetch(ctx context.Context, current *plumbing.Referen
 	var err error
 	if current != nil {
 		// Full history check
-		if commits, err = r.revList(ctx, current.Hash(), nil, nil); err != nil {
+		if commits, err = r.revList(ctx, current.Hash(), nil, LogOrderBFS, nil); err != nil {
 			die_error("log commits error: %v", err)
 			return nil, err
 		}

pkg/zeta/log.go

@@ -203,12 +203,12 @@ func (r *Repository) revList0(ctx context.Context, want plumbing.Hash, ignore []
 	return nil
 }
 
-func (r *Repository) revList(ctx context.Context, want plumbing.Hash, ignore []plumbing.Hash, paths []string) ([]*object.Commit, error) {
+func (r *Repository) revList(ctx context.Context, want plumbing.Hash, ignore []plumbing.Hash, order LogOrder, paths []string) ([]*object.Commit, error) {
 	cg := &commitsGroup{
 		commits: make([]*object.Commit, 0, 100),
 		seen:    make(map[plumbing.Hash]bool),
 	}
-	if err := r.revList0(ctx, want, ignore, LogOrderBFS, paths, cg); err != nil {
+	if err := r.revList0(ctx, want, ignore, order, paths, cg); err != nil {
 		return nil, err
 	}
 	return cg.commits, nil

pkg/zeta/log_test.go

@@ -23,7 +23,7 @@ func TestLog(t *testing.T) {
 		plumbing.NewHash("dffa478d973aed6d6af1d9a32c3e07bc61fdc98eddc76f5f36aa69d004d3aad4"),
 		[]plumbing.Hash{
 			plumbing.NewHash("0efd923d06041c04de8034195821efdc02a26eb6633d7651d8df1b0e70362c65"),
-		}, nil)
+		}, LogOrderBFS, nil)
 	if err != nil {
 		die_error("log range base error: %v", err)
 		return

pkg/zeta/worktree_merge.go

@@ -229,7 +229,7 @@ func (w *Worktree) Merge(ctx context.Context, opts *MergeOptions) error {
 const maxSizeForSquashedCommitMessage = 4 << 10
 
 func (w *Worktree) makeSquashMessage(ctx context.Context, from plumbing.Hash, ignore []plumbing.Hash, messagePrefix string) (string, error) {
-	commits, err := w.revList(ctx, from, ignore, nil)
+	commits, err := w.revList(ctx, from, ignore, LogOrderCommitterTime, nil)
 	if err != nil {
 		die_error("log range base error: %v", err)
 		return "", err

pkg/zeta/worktree_rebase.go

@@ -107,7 +107,8 @@ func (w *Worktree) rebaseInternal(ctx context.Context, our, onto plumbing.Hash,
 		die_error("resolve onto tree: %v", err)
 		return plumbing.ZeroHash, err
 	}
-	commits, err := w.revList(ctx, our, ignore, nil)
+	// TODO: rebase: merge commits should be avoided as much as possible
+	commits, err := w.revList(ctx, our, ignore, LogOrderDFS, nil)
 	if err != nil {
 		die_error("log range base error: %v", err)
 		return plumbing.ZeroHash, err
@@ -311,7 +312,8 @@ func (w *Worktree) rebaseContinue(ctx context.Context) error {
 		return err
 	}
 	mergeDriver := w.resolveMergeDriver()
-	commits, err := w.revList(ctx, md.REBASE_HEAD, []plumbing.Hash{md.STOPPED}, nil)
+	// TODO: rebase: merge commits should be avoided as much as possible
+	commits, err := w.revList(ctx, md.REBASE_HEAD, []plumbing.Hash{md.STOPPED}, LogOrderDFS, nil)
 	if err != nil {
 		die_error("log range base error: %v", err)
 		return err