deblan-mirror/dive
1
0
Fork 0
mirror of https://github.com/wagoodman/dive synced 2024-06-02 20:22:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

formatting + makefile

Browse source
This commit is contained in:
Alex Goodman 2018-06-03 23:44:58 -04:00
parent db1fb9452c
commit ed62646bac
No known key found for this signature in database
GPG key ID: 05328C611D8A520E
6 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile Normal file
View file

@ -0,0 +1,12 @@
SHELL := /bin/bash
.DEFAULT_GOAL := run
.PHONY: run
run:
go run main.go \
filechangeinfo.go \
filenode.go \
filetree.go \
tar_read.go \
filetreeview.go \
layerview.go

4
filechangeinfo.go
View file

@ -1,8 +1,8 @@
package main
import (
"fmt"
"bytes"
"fmt"
)
type FileChangeInfo struct {
@ -58,5 +58,3 @@ func (a *FileChangeInfo) getDiffType(b *FileChangeInfo) DiffType {
}
return Changed
}

2
filechangeinfo_test.go
View file

@ -1,8 +1,8 @@
package main
import (
"testing"
"fmt"
"testing"
)
func TestAssignDiffType(t *testing.T) {

5
filenode.go
View file

@ -10,7 +10,7 @@ type FileNode struct {
parent *FileNode
name string
collapsed bool
data *FileChangeInfo
data *FileChangeInfo
children map[string]*FileNode
}
@ -40,7 +40,6 @@ func (node *FileNode) Copy() *FileNode {
return newNode
}
func (node *FileNode) AddChild(name string, data *FileChangeInfo) (child *FileNode) {
child = NewNode(node, name, data)
if node.children[name] != nil {
@ -82,7 +81,6 @@ func (node *FileNode) Visit(visiter Visiter) error {
return visiter(node)
}
func (node *FileNode) VisitDepthParentFirst(visiter Visiter, evaluator VisitEvaluator) error {
err := visiter(node)
if err != nil {
@ -131,7 +129,6 @@ func (node *FileNode) Path() string {
return "/" + strings.Join(path, "/")
}
func (node *FileNode) IsLeaf() bool {
return len(node.children) == 0
}

3
filenode_test.go
View file

@ -2,7 +2,6 @@ package main
import "testing"
func TestAddChild(t *testing.T) {
var expected, actual int
tree := NewTree()
@ -106,4 +105,4 @@ func TestIsWhiteout(t *testing.T) {
if p2.IsWhiteout() != true {
t.Errorf("Expected path '%s' to be a whiteout file", p2.name)
}
}
}

5
filetree.go
View file

@ -18,7 +18,6 @@ const (
collapsedItem = "⊕ "
)
type FileTree struct {
root *FileNode
size int
@ -88,7 +87,6 @@ func (tree *FileTree) String() string {
return "." + newLine + walkTree(tree.Root(), []bool{}, 0)
}
func (tree *FileTree) Copy() *FileTree {
newTree := NewTree()
*newTree = *tree
@ -178,7 +176,6 @@ func (tree *FileTree) RemovePath(path string) error {
return node.Remove()
}
func (tree *FileTree) compare(upper *FileTree) error {
graft := func(node *FileNode) error {
if node.IsWhiteout() {
@ -220,4 +217,4 @@ func StackRange(trees []*FileTree, index uint) *FileTree {
tree.Stack(trees[idx])
}
return tree
}
}