diff options
| -rw-r--r-- | repository_test.go | 4 | ||||
| -rw-r--r-- | submodule.go | 8 | ||||
| -rw-r--r-- | worktree.go | 58 | ||||
| -rw-r--r-- | worktree_test.go | 2 |
4 files changed, 58 insertions, 14 deletions
diff --git a/repository_test.go b/repository_test.go index 9fd48fc..84a7221 100644 --- a/repository_test.go +++ b/repository_test.go @@ -306,7 +306,7 @@ func (s *RepositorySuite) TestCloneDeep(c *C) { fi, err := fs.ReadDir("") c.Assert(err, IsNil) - c.Assert(fi, HasLen, 8) + c.Assert(fi, HasLen, 9) } func (s *RepositorySuite) TestCloneConfig(c *C) { @@ -431,7 +431,7 @@ func (s *RepositorySuite) TestPullCheckout(c *C) { fi, err := fs.ReadDir("") c.Assert(err, IsNil) - c.Assert(fi, HasLen, 8) + c.Assert(fi, HasLen, 9) } func (s *RepositorySuite) TestCloneWithProgress(c *C) { diff --git a/submodule.go b/submodule.go index 32f730b..ea099f0 100644 --- a/submodule.go +++ b/submodule.go @@ -1,6 +1,10 @@ package git -import "srcd.works/go-git.v4/plumbing" +import ( + "fmt" + + "srcd.works/go-git.v4/plumbing" +) type Submodule struct { Name string @@ -21,7 +25,9 @@ type Submodules []*Submodule func (s Submodules) Init() error { for _, sub := range s { + fmt.Println("clone", sub.URL) if err := sub.Init(); err != nil { + fmt.Println(err) return err } } diff --git a/worktree.go b/worktree.go index 8aee0dc..473f933 100644 --- a/worktree.go +++ b/worktree.go @@ -37,29 +37,57 @@ func (w *Worktree) Checkout(commit plumbing.Hash) error { return err } - files, err := c.Files() + t, err := c.Tree() if err != nil { return err } idx := &index.Index{Version: 2} - if err := files.ForEach(func(f *object.File) error { - return w.checkoutFile(f, idx) - }); err != nil { - return err + walker := object.NewTreeWalker(t, true) + + for { + _, entry, err := walker.Next() + if err == io.EOF { + break + } + + if err != nil { + return err + } + + if err := w.checkoutEntry(&entry, idx); err != nil { + return err + } } return w.r.Storer.SetIndex(idx) } -func (w *Worktree) checkoutFile(f *object.File, idx *index.Index) error { - from, err := f.Reader() +func (w *Worktree) checkoutEntry(e *object.TreeEntry, idx *index.Index) error { + if e.Mode == object.SubmoduleMode { + return w.indexEntry(e, idx) + } + + if e.Mode.IsDir() { + return nil + } + + return w.checkoutFile(e, idx) +} + +func (w *Worktree) checkoutFile(e *object.TreeEntry, idx *index.Index) error { + blob, err := object.GetBlob(w.r.Storer, e.Hash) + if err != nil { + return err + } + + from, err := blob.Reader() if err != nil { return err } defer from.Close() - to, err := w.fs.OpenFile(f.Name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode.Perm()) + to, err := w.fs.OpenFile(e.Name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, e.Mode.Perm()) if err != nil { return err } @@ -69,12 +97,22 @@ func (w *Worktree) checkoutFile(f *object.File, idx *index.Index) error { } defer to.Close() - return w.indexFile(f, idx) + return w.indexFile(e, idx) } var fillSystemInfo func(e *index.Entry, sys interface{}) -func (w *Worktree) indexFile(f *object.File, idx *index.Index) error { +func (w *Worktree) indexEntry(f *object.TreeEntry, idx *index.Index) error { + idx.Entries = append(idx.Entries, index.Entry{ + Hash: f.Hash, + Name: f.Name, + Mode: object.SubmoduleMode, + }) + + return nil +} + +func (w *Worktree) indexFile(f *object.TreeEntry, idx *index.Index) error { fi, err := w.fs.Stat(f.Name) if err != nil { return err diff --git a/worktree_test.go b/worktree_test.go index 8ca3d4f..306b56d 100644 --- a/worktree_test.go +++ b/worktree_test.go @@ -40,7 +40,7 @@ func (s *WorktreeSuite) TestCheckout(c *C) { entries, err := fs.ReadDir("/") c.Assert(err, IsNil) - c.Assert(entries, HasLen, 8) + c.Assert(entries, HasLen, 9) ch, err := fs.Open("CHANGELOG") c.Assert(err, IsNil) |