aboutsummaryrefslogtreecommitdiffstats
path: root/plumbing/revlist
diff options
context:
space:
mode:
Diffstat (limited to 'plumbing/revlist')
-rw-r--r--plumbing/revlist/revlist.go113
-rw-r--r--plumbing/revlist/revlist_test.go87
2 files changed, 136 insertions, 64 deletions
diff --git a/plumbing/revlist/revlist.go b/plumbing/revlist/revlist.go
index f1d66b4..5731474 100644
--- a/plumbing/revlist/revlist.go
+++ b/plumbing/revlist/revlist.go
@@ -3,6 +3,7 @@
package revlist
import (
+ "fmt"
"io"
"srcd.works/go-git.v4/plumbing"
@@ -11,29 +12,26 @@ import (
)
// Objects applies a complementary set. It gets all the hashes from all
-// the reachable objects from the given commits. Ignore param are object hashes
-// that we want to ignore on the result. It is a list because is
-// easier to interact with other porcelain elements, but internally it is
-// converted to a map. All that objects must be accessible from the object
-// storer.
+// the reachable objects from the given objects. Ignore param are object hashes
+// that we want to ignore on the result. All that objects must be accessible
+// from the object storer.
func Objects(
s storer.EncodedObjectStorer,
- commits []*object.Commit,
+ objects []plumbing.Hash,
ignore []plumbing.Hash) ([]plumbing.Hash, error) {
seen := hashListToSet(ignore)
result := make(map[plumbing.Hash]bool)
- for _, c := range commits {
- err := reachableObjects(s, c, seen, func(h plumbing.Hash) error {
- if !seen[h] {
- result[h] = true
- seen[h] = true
- }
- return nil
- })
+ walkerFunc := func(h plumbing.Hash) {
+ if !seen[h] {
+ result[h] = true
+ seen[h] = true
+ }
+ }
- if err != nil {
+ for _, h := range objects {
+ if err := processObject(s, h, seen, walkerFunc); err != nil {
return nil, err
}
}
@@ -41,56 +39,76 @@ func Objects(
return hashSetToList(result), nil
}
+// processObject obtains the object using the hash an process it depending of its type
+func processObject(
+ s storer.EncodedObjectStorer,
+ h plumbing.Hash,
+ seen map[plumbing.Hash]bool,
+ walkerFunc func(h plumbing.Hash),
+) error {
+ o, err := s.EncodedObject(plumbing.AnyObject, h)
+ if err != nil {
+ return err
+ }
+
+ do, err := object.DecodeObject(s, o)
+ if err != nil {
+ return err
+ }
+
+ switch do := do.(type) {
+ case *object.Commit:
+ return reachableObjects(do, seen, walkerFunc)
+ case *object.Tree:
+ return iterateCommitTrees(seen, do, walkerFunc)
+ case *object.Tag:
+ walkerFunc(do.Hash)
+ return processObject(s, do.Target, seen, walkerFunc)
+ case *object.Blob:
+ walkerFunc(do.Hash)
+ default:
+ return fmt.Errorf("object type not valid: %s. "+
+ "Object reference: %s", o.Type(), o.Hash())
+ }
+
+ return nil
+}
+
// reachableObjects returns, using the callback function, all the reachable
// objects from the specified commit. To avoid to iterate over seen commits,
// if a commit hash is into the 'seen' set, we will not iterate all his trees
// and blobs objects.
func reachableObjects(
- s storer.EncodedObjectStorer,
commit *object.Commit,
seen map[plumbing.Hash]bool,
- cb func(h plumbing.Hash) error) error {
-
- return iterateCommits(commit, func(commit *object.Commit) error {
+ cb func(h plumbing.Hash)) error {
+ return object.WalkCommitHistory(commit, func(commit *object.Commit) error {
if seen[commit.Hash] {
return nil
}
- if err := cb(commit.Hash); err != nil {
+ cb(commit.Hash)
+
+ tree, err := commit.Tree()
+ if err != nil {
return err
}
- return iterateCommitTrees(s, commit, func(h plumbing.Hash) error {
- return cb(h)
- })
- })
-}
-
-// iterateCommits iterate all reachable commits from the given one
-func iterateCommits(commit *object.Commit, cb func(c *object.Commit) error) error {
- if err := cb(commit); err != nil {
- return err
- }
-
- return object.WalkCommitHistory(commit, func(c *object.Commit) error {
- return cb(c)
+ return iterateCommitTrees(seen, tree, cb)
})
}
// iterateCommitTrees iterate all reachable trees from the given commit
func iterateCommitTrees(
- s storer.EncodedObjectStorer,
- commit *object.Commit,
- cb func(h plumbing.Hash) error) error {
-
- tree, err := commit.Tree()
- if err != nil {
- return err
- }
- if err := cb(tree.Hash); err != nil {
- return err
+ seen map[plumbing.Hash]bool,
+ tree *object.Tree,
+ cb func(h plumbing.Hash)) error {
+ if seen[tree.Hash] {
+ return nil
}
+ cb(tree.Hash)
+
treeWalker := object.NewTreeWalker(tree, true)
for {
@@ -101,9 +119,12 @@ func iterateCommitTrees(
if err != nil {
return err
}
- if err := cb(e.Hash); err != nil {
- return err
+
+ if seen[e.Hash] {
+ continue
}
+
+ cb(e.Hash)
}
return nil
diff --git a/plumbing/revlist/revlist_test.go b/plumbing/revlist/revlist_test.go
index d7361d9..ca69975 100644
--- a/plumbing/revlist/revlist_test.go
+++ b/plumbing/revlist/revlist_test.go
@@ -76,13 +76,65 @@ func (s *RevListSuite) TestRevListObjects(c *C) {
"d3ff53e0564a9f87d8e84b6e28e5060e517008aa": true, // CHANGELOG
}
- initCommit := s.commit(c, plumbing.NewHash(initialCommit))
- secondCommit := s.commit(c, plumbing.NewHash(secondCommit))
+ localHist, err := Objects(s.Storer,
+ []plumbing.Hash{plumbing.NewHash(initialCommit)}, nil)
+ c.Assert(err, IsNil)
+
+ remoteHist, err := Objects(s.Storer,
+ []plumbing.Hash{plumbing.NewHash(secondCommit)}, localHist)
+ c.Assert(err, IsNil)
+
+ for _, h := range remoteHist {
+ c.Assert(revList[h.String()], Equals, true)
+ }
+ c.Assert(len(remoteHist), Equals, len(revList))
+}
+
+func (s *RevListSuite) TestRevListObjectsTagObject(c *C) {
+ sto, err := filesystem.NewStorage(
+ fixtures.ByTag("tags").
+ ByURL("https://github.com/git-fixtures/tags.git").One().DotGit())
+ c.Assert(err, IsNil)
+
+ expected := map[string]bool{
+ "70846e9a10ef7b41064b40f07713d5b8b9a8fc73": true,
+ "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391": true,
+ "ad7897c0fb8e7d9a9ba41fa66072cf06095a6cfc": true,
+ "f7b877701fbf855b44c0a9e86f3fdce2c298b07f": true,
+ }
+
+ hist, err := Objects(sto, []plumbing.Hash{plumbing.NewHash("ad7897c0fb8e7d9a9ba41fa66072cf06095a6cfc")}, nil)
+ c.Assert(err, IsNil)
+
+ for _, h := range hist {
+ c.Assert(expected[h.String()], Equals, true)
+ }
+
+ c.Assert(len(hist), Equals, len(expected))
+}
+
+// ---
+// | |\
+// | | * b8e471f Creating changelog
+// | |/
+// * | 35e8510 binary file
+// |/
+// * b029517 Initial commit
+func (s *RevListSuite) TestRevListObjectsWithBlobsAndTrees(c *C) {
+ revList := map[string]bool{
+ "b8e471f58bcbca63b07bda20e428190409c2db47": true, // second commit
+ }
- localHist, err := Objects(s.Storer, []*object.Commit{initCommit}, nil)
+ localHist, err := Objects(s.Storer,
+ []plumbing.Hash{
+ plumbing.NewHash(initialCommit),
+ plumbing.NewHash("c2d30fa8ef288618f65f6eed6e168e0d514886f4"),
+ plumbing.NewHash("d3ff53e0564a9f87d8e84b6e28e5060e517008aa"),
+ }, nil)
c.Assert(err, IsNil)
- remoteHist, err := Objects(s.Storer, []*object.Commit{secondCommit}, localHist)
+ remoteHist, err := Objects(s.Storer,
+ []plumbing.Hash{plumbing.NewHash(secondCommit)}, localHist)
c.Assert(err, IsNil)
for _, h := range remoteHist {
@@ -92,25 +144,25 @@ func (s *RevListSuite) TestRevListObjects(c *C) {
}
func (s *RevListSuite) TestRevListObjectsReverse(c *C) {
- initCommit := s.commit(c, plumbing.NewHash(initialCommit))
- secondCommit := s.commit(c, plumbing.NewHash(secondCommit))
- localHist, err := Objects(s.Storer, []*object.Commit{secondCommit}, nil)
+ localHist, err := Objects(s.Storer,
+ []plumbing.Hash{plumbing.NewHash(secondCommit)}, nil)
c.Assert(err, IsNil)
- remoteHist, err := Objects(s.Storer, []*object.Commit{initCommit}, localHist)
+ remoteHist, err := Objects(s.Storer,
+ []plumbing.Hash{plumbing.NewHash(initialCommit)}, localHist)
c.Assert(err, IsNil)
c.Assert(len(remoteHist), Equals, 0)
}
func (s *RevListSuite) TestRevListObjectsSameCommit(c *C) {
- commit := s.commit(c, plumbing.NewHash(secondCommit))
-
- localHist, err := Objects(s.Storer, []*object.Commit{commit}, nil)
+ localHist, err := Objects(s.Storer,
+ []plumbing.Hash{plumbing.NewHash(secondCommit)}, nil)
c.Assert(err, IsNil)
- remoteHist, err := Objects(s.Storer, []*object.Commit{commit}, localHist)
+ remoteHist, err := Objects(s.Storer,
+ []plumbing.Hash{plumbing.NewHash(secondCommit)}, localHist)
c.Assert(err, IsNil)
c.Assert(len(remoteHist), Equals, 0)
@@ -122,15 +174,14 @@ func (s *RevListSuite) TestRevListObjectsSameCommit(c *C) {
// * 918c48b some code
// -----
func (s *RevListSuite) TestRevListObjectsNewBranch(c *C) {
- someCommit := s.commit(c, plumbing.NewHash(someCommit))
- someCommitBranch := s.commit(c, plumbing.NewHash(someCommitBranch))
- someCommitOtherBranch := s.commit(c, plumbing.NewHash(someCommitOtherBranch))
-
- localHist, err := Objects(s.Storer, []*object.Commit{someCommit}, nil)
+ localHist, err := Objects(s.Storer,
+ []plumbing.Hash{plumbing.NewHash(someCommit)}, nil)
c.Assert(err, IsNil)
remoteHist, err := Objects(
- s.Storer, []*object.Commit{someCommitBranch, someCommitOtherBranch}, localHist)
+ s.Storer, []plumbing.Hash{
+ plumbing.NewHash(someCommitBranch),
+ plumbing.NewHash(someCommitOtherBranch)}, localHist)
c.Assert(err, IsNil)
revList := map[string]bool{
generated by cgit (git 2.34.1) at 2024-09-20 09:27:20 +0000