add NewCommitPathIterFromIter that accepts pathFilter func(string) bool

keep NewCommitFileIterFromIter for compatibilty for now

Signed-off-by: Saeed Rasooli <[email protected]>

Author: ilius

plumbing/object/commit_walker_file.go renamed to plumbing/object/commit_walker_path.go

@@ -8,27 +8,39 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing/storer"
 )
 
-type commitFileIter struct {
-	fileName      string
+type commitPathIter struct {
+	pathFilter    func(string) bool
 	sourceIter    CommitIter
 	currentCommit *Commit
 	checkParent   bool
 }
 
-// NewCommitFileIterFromIter returns a commit iterator which performs diffTree between
+// NewCommitPathIterFromIter returns a commit iterator which performs diffTree between
 // successive trees returned from the commit iterator from the argument. The purpose of this is
 // to find the commits that explain how the files that match the path came to be.
 // If checkParent is true then the function double checks if potential parent (next commit in a path)
 // is one of the parents in the tree (it's used by `git log --all`).
-func NewCommitFileIterFromIter(fileName string, commitIter CommitIter, checkParent bool) CommitIter {
-	iterator := new(commitFileIter)
+// pathFilter is a function that takes path of file as argument and returns true if we want it
+func NewCommitPathIterFromIter(pathFilter func(string) bool, commitIter CommitIter, checkParent bool) CommitIter {
+	iterator := new(commitPathIter)
 	iterator.sourceIter = commitIter
-	iterator.fileName = fileName
+	iterator.pathFilter = pathFilter
 	iterator.checkParent = checkParent
 	return iterator
 }
 
-func (c *commitFileIter) Next() (*Commit, error) {
+// this function is kept for compatibilty, can be replaced with NewCommitPathIterFromIter
+func NewCommitFileIterFromIter(fileName string, commitIter CommitIter, checkParent bool) CommitIter {
+	return NewCommitPathIterFromIter(
+		func(path string) bool {
+			return path == fileName
+		},
+		commitIter,
+		checkParent,
+	)
+}
+
+func (c *commitPathIter) Next() (*Commit, error) {
 	if c.currentCommit == nil {
 		var err error
 		c.currentCommit, err = c.sourceIter.Next()
@@ -45,7 +57,7 @@ func (c *commitFileIter) Next() (*Commit, error) {
 	return commit, commitErr
 }
 
-func (c *commitFileIter) getNextFileCommit() (*Commit, error) {
+func (c *commitPathIter) getNextFileCommit() (*Commit, error) {
 	for {
 		// Parent-commit can be nil if the current-commit is the initial commit
 		parentCommit, parentCommitErr := c.sourceIter.Next()
@@ -96,9 +108,9 @@ func (c *commitFileIter) getNextFileCommit() (*Commit, error) {
 	}
 }
 
-func (c *commitFileIter) hasFileChange(changes Changes, parent *Commit) bool {
+func (c *commitPathIter) hasFileChange(changes Changes, parent *Commit) bool {
 	for _, change := range changes {
-		if change.name() != c.fileName {
+		if !c.pathFilter(change.name()) {
 			continue
 		}
 
@@ -125,7 +137,7 @@ func isParentHash(hash plumbing.Hash, commit *Commit) bool {
 	return false
 }
 
-func (c *commitFileIter) ForEach(cb func(*Commit) error) error {
+func (c *commitPathIter) ForEach(cb func(*Commit) error) error {
 	for {
 		commit, nextErr := c.Next()
 		if nextErr == io.EOF {
@@ -144,6 +156,6 @@ func (c *commitFileIter) ForEach(cb func(*Commit) error) error {
 	return nil
 }
 
-func (c *commitFileIter) Close() {
+func (c *commitPathIter) Close() {
 	c.sourceIter.Close()
 }

repository.go

@@ -1099,7 +1099,13 @@ func (r *Repository) logAll(commitIterFunc func(*object.Commit) object.CommitIte
 }
 
 func (*Repository) logWithFile(fileName string, commitIter object.CommitIter, checkParent bool) object.CommitIter {
-	return object.NewCommitFileIterFromIter(fileName, commitIter, checkParent)
+	return object.NewCommitPathIterFromIter(
+		func(path string) bool {
+			return path == fileName
+		},
+		commitIter,
+		checkParent,
+	)
 }
 
 func (*Repository) logWithLimit(commitIter object.CommitIter, limitOptions object.LogLimitOptions) object.CommitIter {

repository_test.go

@@ -1667,7 +1667,10 @@ func (m *mockErrCommitIter) Close() {}
 
 func (s *RepositorySuite) TestLogFileWithError(c *C) {
 	fileName := "README"
-	cIter := object.NewCommitFileIterFromIter(fileName, &mockErrCommitIter{}, false)
+	pathIter := func(path string) bool {
+		return path == fileName
+	}
+	cIter := object.NewCommitPathIterFromIter(pathIter, &mockErrCommitIter{}, false)
 	defer cIter.Close()
 
 	err := cIter.ForEach(func(commit *object.Commit) error {
@@ -2615,9 +2618,9 @@ func (s *RepositorySuite) TestResolveRevisionWithErrors(c *C) {
 	c.Assert(err, IsNil)
 
 	datas := map[string]string{
-		"efs/heads/master~": "reference not found",
-		"HEAD^3":            `Revision invalid : "3" found must be 0, 1 or 2 after "^"`,
-		"HEAD^{/whatever}":  `No commit message match regexp : "whatever"`,
+		"efs/heads/master~":                        "reference not found",
+		"HEAD^3":                                   `Revision invalid : "3" found must be 0, 1 or 2 after "^"`,
+		"HEAD^{/whatever}":                         `No commit message match regexp : "whatever"`,
 		"4e1243bd22c66e76c2ba9eddc1f91394e57f9f83": "reference not found",
 	}