Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

plumbing/object: add WalkCommitHistoryPost func #305

Merged
merged 1 commit into from
Mar 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions plumbing/object/commit_walker.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,28 @@ func (w *commitWalker) walk() error {

return w.walk()
}

// WalkCommitHistoryPost walks the commit history like WalkCommitHistory
// but in post-order. This means that after walking a merge commit, the
// merged commit will be walked before the base it was merged on. This
// can be useful if you wish to see the history in chronological order.
func WalkCommitHistoryPost(c *Commit, cb func(*Commit) error) error {
stack := []*Commit{c}
seen := make(map[plumbing.Hash]bool)
for len(stack) > 0 {
c := stack[len(stack)-1]
stack = stack[:len(stack)-1]
if seen[c.Hash] {
continue
}
seen[c.Hash] = true
if err := cb(c); err != nil {
return err
}
c.Parents().ForEach(func(pcm *Commit) error {
stack = append(stack, pcm)
return nil
})
}
return nil
}
41 changes: 34 additions & 7 deletions plumbing/object/commit_walker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,53 @@ type CommitWalkerSuite struct {

var _ = Suite(&CommitWalkerSuite{})

func (s *CommitWalkerSuite) TestWalkerNext(c *C) {
func (s *CommitWalkerSuite) TestWalkHistory(c *C) {
commit := s.commit(c, s.Fixture.Head)

var commits []*Commit

WalkCommitHistory(commit, func(c *Commit) error {
commits = append(commits, c)
return nil
})

SortCommits(commits)
c.Assert(commits, HasLen, 8)

expected := []string{
"b029517f6300c2da0f4b651b8642506cd6aaf45d", "b8e471f58bcbca63b07bda20e428190409c2db47",
"35e85108805c84807bc66a02d91535e1e24b38b9", "a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69",
"1669dce138d9b841a518c64b10914d88f5e488ea", "af2d6a6954d532f8ffb47615169c8fdf9d383a1a",
"918c48b83bd081e863dbe1b80f8998f058cd8294", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5",
"6ecf0ef2c2dffb796033e5a02219af86ec6584e5",
"918c48b83bd081e863dbe1b80f8998f058cd8294",
"af2d6a6954d532f8ffb47615169c8fdf9d383a1a",
"1669dce138d9b841a518c64b10914d88f5e488ea",
"35e85108805c84807bc66a02d91535e1e24b38b9",
"b029517f6300c2da0f4b651b8642506cd6aaf45d",
"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69",
"b8e471f58bcbca63b07bda20e428190409c2db47",
}
for i, commit := range commits {
c.Assert(commit.Hash.String(), Equals, expected[i])
}
}

func (s *CommitWalkerSuite) TestWalkHistoryPost(c *C) {
commit := s.commit(c, s.Fixture.Head)

var commits []*Commit
WalkCommitHistoryPost(commit, func(c *Commit) error {
commits = append(commits, c)
return nil
})

c.Assert(commits, HasLen, 8)

expected := []string{
"6ecf0ef2c2dffb796033e5a02219af86ec6584e5",
"918c48b83bd081e863dbe1b80f8998f058cd8294",
"af2d6a6954d532f8ffb47615169c8fdf9d383a1a",
"1669dce138d9b841a518c64b10914d88f5e488ea",
"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69",
"b8e471f58bcbca63b07bda20e428190409c2db47",
"b029517f6300c2da0f4b651b8642506cd6aaf45d",
"35e85108805c84807bc66a02d91535e1e24b38b9",
}
for i, commit := range commits {
c.Assert(commit.Hash.String(), Equals, expected[i])
}
Expand Down