diff options
author | Joshua Sjoding <joshua.sjoding@scjalliance.com> | 2016-02-24 22:40:30 -0800 |
---|---|---|
committer | Joshua Sjoding <joshua.sjoding@scjalliance.com> | 2016-02-25 00:38:51 -0800 |
commit | 0d999e1db6cd8736ab697de8ce848fa3a5274b9f (patch) | |
tree | 6107f49405bb605793f1bcd7ef4961ceadcb11e9 /tree.go | |
parent | 07ca1ac7f3058ea6d3274a01973541fb84782f5e (diff) | |
download | go-git-0d999e1db6cd8736ab697de8ce848fa3a5274b9f.tar.gz |
Refactor to use core.ObjectReader and core.ObjectWriter
* New function signatures provide the necessary interface to stream data from disk when using filesystem-based storage in the future
* New function signatures provide proper error handling
* ObjectReader and ObjectWriter interfaces added to avoid future refactoring, currently are type aliases for io.ReadCloser and io.WriteCloser respectively
* Object.Reader now returns (ObjectReader, error)
* Object.Writer now returns (ObjectWriter, error)
* File.Contents now returns (string, error)
* File.Lines now returns ([]string, error)
* Blob.Reader now returns (core.ObjectReader, error)
* Added internal close helper function for deferred calls to Close that need to check the return value
Diffstat (limited to 'tree.go')
-rw-r--r-- | tree.go | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -128,7 +128,7 @@ func (t *Tree) Files() *FileIter { } // Decode transform an core.Object into a Tree struct -func (t *Tree) Decode(o core.Object) error { +func (t *Tree) Decode(o core.Object) (err error) { if o.Type() != core.TreeObject { return ErrUnsupportedObject } @@ -141,7 +141,13 @@ func (t *Tree) Decode(o core.Object) error { t.Entries = nil t.m = nil - r := bufio.NewReader(o.Reader()) + reader, err := o.Reader() + if err != nil { + return err + } + defer close(reader, &err) + + r := bufio.NewReader(reader) for { mode, err := r.ReadString(' ') if err != nil { |