Skip to content
This repository has been archived by the owner on Apr 12, 2019. It is now read-only.

Fixed a bug where TreeEntries were getting cached, (thanks @filipnavara) #139

Merged
merged 1 commit into from
Jan 16, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 17 additions & 5 deletions tree.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ type Tree struct {

entries Entries
entriesParsed bool

entriesRecursive Entries
entriesRecursiveParsed bool
}

// NewTree create a new tree according the repository and commit id
Expand Down Expand Up @@ -67,20 +70,29 @@ func (t *Tree) ListEntries() (Entries, error) {
if err != nil {
return nil, err
}

t.entries, err = parseTreeEntries(stdout, t)
if err == nil {
t.entriesParsed = true
}

return t.entries, err
}

// ListEntriesRecursive returns all entries of current tree recursively including all subtrees
func (t *Tree) ListEntriesRecursive() (Entries, error) {
if t.entriesParsed {
return t.entries, nil
if t.entriesRecursiveParsed {
return t.entriesRecursive, nil
}
stdout, err := NewCommand("ls-tree", "-t", "-r", t.ID.String()).RunInDirBytes(t.repo.Path)

if err != nil {
return nil, err
}
t.entries, err = parseTreeEntries(stdout, t)
return t.entries, err

t.entriesRecursive, err = parseTreeEntries(stdout, t)
if err == nil {
t.entriesRecursiveParsed = true
}

return t.entriesRecursive, err
}